Reimplementation of the recording preferences page, converted wav/aiff recording to an encoder, implemented a flac encoder using libsndfile and made a factory class to get the correct encoder and encoder settings

2 files changed, 11 insertions, 7 deletions

diff --git a/src/recording/recordingmanager.cpp b/src/recording/recordingmanager.cpp
index 417cc2e6ee..e915d43c5b 100644
--- a/src/recording/recordingmanager.cpp
+++ b/src/recording/recordingmanager.cpp
@@ -171,6 +171,8 @@ QString& RecordingManager::getRecordingDir() {
     return m_recordingDir;
 }
 
+
+
 // Only called when recording is active.
 void RecordingManager::slotDurationRecorded(quint64 duration)
 {
@@ -231,18 +233,19 @@ void RecordingManager::slotIsRecording(bool isRecordingActive, bool error) {
     }
 }
 
-bool RecordingManager::isRecordingActive() {
+bool RecordingManager::isRecordingActive() const {
     return m_bRecording;
 }
 
-QString& RecordingManager::getRecordingFile() {
+const QString& RecordingManager::getRecordingFile() const {
     return m_recordingFile;
 }
 
-QString& RecordingManager::getRecordingLocation() {
+const QString& RecordingManager::getRecordingLocation() const {
     return m_recordingLocation;
 }
 
+
 quint64 RecordingManager::getFileSplitSize()
 {
      QString fileSizeStr = m_pConfig->getValueString(ConfigKey(RECORDING_PREF_KEY, "FileSize"));
diff --git a/src/recording/recordingmanager.h b/src/recording/recordingmanager.h
index ac7d3ed1f7..c106f15c10 100644
--- a/src/recording/recordingmanager.h
+++ b/src/recording/recordingmanager.h
@@ -4,11 +4,12 @@
 #include <QDateTime>
 #include <QObject>
 #include <QString>
+#include <QList>
 
 #include "preferences/usersettings.h"
 #include "control/controlobject.h"
 #include "recording/defs_recording.h"
-
+#include "encoder/encoder.h"
 //
 // The RecordingManager is a central class and manages
 // the recording feature of Mixxx.
@@ -37,12 +38,12 @@ class RecordingManager : public QObject
     // The method computes the filename based on date/time information.
     void startRecording();
     void stopRecording();
-    bool isRecordingActive();
+    bool isRecordingActive() const;
     void setRecordingDir();
     QString& getRecordingDir();
     // Returns the currently recording file
-    QString& getRecordingFile();
-    QString& getRecordingLocation();
+    const QString& getRecordingFile() const;
+    const QString& getRecordingLocation() const;
 
   signals:
     // Emits the cumulative number of bytes currently recorded.