diff options
| author | RJ Ryan <rryan@mixxx.org> | 2016-04-28 23:01:13 -0700 |
|---|---|---|
| committer | RJ Ryan <rryan@mixxx.org> | 2016-04-28 23:05:33 -0700 |
| commit | b8788bde0b234feda983b52e3c79963be6f6b834 (patch) | |
| tree | 218db1055192b8ed17f99e39929dc20212328a42 /src/recording | |
| parent | e14f8c5a18b425f5a94128f6615606e056311786 (diff) | |
Move ErrorDialogHandler usage out of EngineRecord.
Diffstat (limited to 'src/recording')
| -rw-r--r-- | src/recording/recordingmanager.cpp | 31 | ||||
| -rw-r--r-- | src/recording/recordingmanager.h | 2 |
2 files changed, 22 insertions, 11 deletions
diff --git a/src/recording/recordingmanager.cpp b/src/recording/recordingmanager.cpp index 61227cfe3c..33b758b59a 100644 --- a/src/recording/recordingmanager.cpp +++ b/src/recording/recordingmanager.cpp @@ -4,13 +4,14 @@ #include <QDir> #include <QtDebug> -#include "recording/recordingmanager.h" -#include "recording/defs_recording.h" -#include "engine/sidechain/enginesidechain.h" -#include "engine/sidechain/enginerecord.h" -#include "control/controlpushbutton.h" #include "control/controlproxy.h" +#include "control/controlpushbutton.h" #include "engine/enginemaster.h" +#include "engine/sidechain/enginerecord.h" +#include "engine/sidechain/enginesidechain.h" +#include "errordialoghandler.h" +#include "recording/defs_recording.h" +#include "recording/recordingmanager.h" RecordingManager::RecordingManager(UserSettingsPointer pConfig, EngineMaster* pEngine) : m_pConfig(pConfig), @@ -36,8 +37,8 @@ RecordingManager::RecordingManager(UserSettingsPointer pConfig, EngineMaster* pE EngineSideChain* pSidechain = pEngine->getSideChain(); if (pSidechain) { EngineRecord* pEngineRecord = new EngineRecord(m_pConfig); - connect(pEngineRecord, SIGNAL(isRecording(bool)), - this, SLOT(slotIsRecording(bool))); + connect(pEngineRecord, SIGNAL(isRecording(bool, bool)), + this, SLOT(slotIsRecording(bool, bool))); connect(pEngineRecord, SIGNAL(bytesRecorded(int)), this, SLOT(slotBytesRecorded(int))); connect(pEngineRecord, SIGNAL(durationRecorded(QString)), @@ -168,13 +169,23 @@ void RecordingManager::slotBytesRecorded(int bytes) emit(bytesRecorded(m_iNumberOfBytesRecorded)); } -void RecordingManager::slotIsRecording(bool isRecordingActive) -{ - //qDebug() << "SlotIsRecording " << isRecording; +void RecordingManager::slotIsRecording(bool isRecordingActive, bool error) { + //qDebug() << "SlotIsRecording " << isRecording << error; // Notify the GUI controls, see dlgrecording.cpp. m_bRecording = isRecordingActive; emit(isRecording(isRecordingActive)); + + if (error) { + ErrorDialogProperties* props = ErrorDialogHandler::instance()->newDialogProperties(); + props->setType(DLG_WARNING); + props->setTitle(tr("Recording")); + props->setText("<html>"+tr("Could not create audio file for recording!") + +"<p>"+tr("Ensure there is enough free disk space and you have write permission for the Recordings folder.") + +"<p>"+tr("You can change the location of the Recordings folder in Preferences > Recording.") + +"</p></html>"); + ErrorDialogHandler::instance()->requestErrorDialog(props); + } } bool RecordingManager::isRecordingActive() { diff --git a/src/recording/recordingmanager.h b/src/recording/recordingmanager.h index f0b0f5b785..6a2f48b224 100644 --- a/src/recording/recordingmanager.h +++ b/src/recording/recordingmanager.h @@ -55,7 +55,7 @@ class RecordingManager : public QObject void durationRecorded(QString); public slots: - void slotIsRecording(bool); + void slotIsRecording(bool recording, bool error); void slotBytesRecorded(int); void slotDurationRecorded(QString); |