move sample counting logic from dlgrecording to enginerecord + cosmetic fixes

2 files changed, 17 insertions, 1 deletions

diff --git a/src/recording/recordingmanager.cpp b/src/recording/recordingmanager.cpp
index d5da62ab9f..8ac3715073 100644
--- a/src/recording/recordingmanager.cpp
+++ b/src/recording/recordingmanager.cpp
@@ -20,7 +20,8 @@ RecordingManager::RecordingManager(ConfigObject<ConfigValue>* pConfig, EngineMas
           m_bRecording(false),
           m_iNumberOfBytesRecored(0),
           m_split_size(0),
-          m_iNumberSplits(0) {
+          m_iNumberSplits(0),
+          m_durationRecorded("") {
     m_pToggleRecording = new ControlPushButton(ConfigKey(RECORDING_PREF_KEY, "toggle_recording"));
     connect(m_pToggleRecording, SIGNAL(valueChanged(double)),
             this, SLOT(slotToggleRecording(double)));
@@ -38,6 +39,8 @@ RecordingManager::RecordingManager(ConfigObject<ConfigValue>* pConfig, EngineMas
                 this, SLOT(slotIsRecording(bool)));
         connect(pEngineRecord, SIGNAL(bytesRecorded(int)),
                 this, SLOT(slotBytesRecorded(int)));
+        connect(pEngineRecord, SIGNAL(durationRecorded(QString)),
+                this, SLOT(slotDurationRecorded(QString)));
         pSidechain->addSideChainWorker(pEngineRecord);
     }
 }
@@ -142,6 +145,16 @@ QString& RecordingManager::getRecordingDir() {
 }
 
 // Only called when recording is active.
+void RecordingManager::slotDurationRecorded(QString durationStr)
+{
+    if(m_durationRecorded != durationStr)
+    {
+        m_durationRecorded = durationStr;
+        emit(durationRecorded(m_durationRecorded));
+    }
+}
+
+// Only called when recording is active.
 void RecordingManager::slotBytesRecorded(int bytes)
 {
     // auto conversion to long
diff --git a/src/recording/recordingmanager.h b/src/recording/recordingmanager.h
index 0d4de6ede4..c1b2df05e1 100644
--- a/src/recording/recordingmanager.h
+++ b/src/recording/recordingmanager.h
@@ -52,10 +52,12 @@ class RecordingManager : public QObject
     // Emits the cumulative number of bytes currently recorded.
     void bytesRecorded(long);
     void isRecording(bool);
+    void durationRecorded(QString);
 
   public slots:
     void slotIsRecording(bool);
     void slotBytesRecorded(int);
+    void slotDurationRecorded(QString);
 
   private slots:
     void slotSetRecording(bool recording);
@@ -83,6 +85,7 @@ class RecordingManager : public QObject
     quint64 m_iNumberOfBytesRecored;
     quint64 m_split_size;
     int m_iNumberSplits;
+    QString m_durationRecorded;
 };
 
 #endif // RECORDINGMANAGER_H