Use QString instead of Encoder::Format

4 files changed, 27 insertions, 31 deletions

diff --git a/src/encoder/encoder.cpp b/src/encoder/encoder.cpp
index 7e37d725e7..9e727c1ade 100644
--- a/src/encoder/encoder.cpp
+++ b/src/encoder/encoder.cpp
@@ -88,10 +88,10 @@ EncoderPointer EncoderFactory::getNewEncoder(Encoder::Format format,
     EncoderPointer pEncoder;
     if (format.internalName == ENCODING_WAVE) {
         pEncoder = std::make_shared<EncoderWave>(pCallback);
-        pEncoder->setEncoderSettings(EncoderWaveSettings(pConfig, format));
+        pEncoder->setEncoderSettings(EncoderWaveSettings(pConfig, format.internalName));
     } else if (format.internalName == ENCODING_AIFF) {
         pEncoder = std::make_shared<EncoderWave>(pCallback);
-        pEncoder->setEncoderSettings(EncoderWaveSettings(pConfig, format));
+        pEncoder->setEncoderSettings(EncoderWaveSettings(pConfig, format.internalName));
     } else if (format.internalName == ENCODING_FLAC) {
         pEncoder = std::make_shared<EncoderSndfileFlac>(pCallback);
         pEncoder->setEncoderSettings(EncoderFlacSettings(pConfig));
@@ -120,7 +120,7 @@ EncoderPointer EncoderFactory::getNewEncoder(Encoder::Format format,
         qWarning() << "Unsupported format requested! " << format.internalName;
         DEBUG_ASSERT(false);
         pEncoder = std::make_shared<EncoderWave>(pCallback);
-        pEncoder->setEncoderSettings(EncoderWaveSettings(pConfig, format));
+        pEncoder->setEncoderSettings(EncoderWaveSettings(pConfig, ENCODING_WAVE));
     }
     return pEncoder;
 }
@@ -129,9 +129,9 @@ EncoderSettingsPointer EncoderFactory::getEncoderSettings(Encoder::Format format
     UserSettingsPointer pConfig) const
 {
     if (format.internalName == ENCODING_WAVE) {
-        return std::make_shared<EncoderWaveSettings>(pConfig, format);
+        return std::make_shared<EncoderWaveSettings>(pConfig, format.internalName);
     } else if (format.internalName == ENCODING_AIFF) {
-        return std::make_shared<EncoderWaveSettings>(pConfig, format);
+        return std::make_shared<EncoderWaveSettings>(pConfig, format.internalName);
     } else if (format.internalName == ENCODING_FLAC) {
         return std::make_shared<EncoderFlacSettings>(pConfig);
     } else if (format.internalName == ENCODING_MP3) {
@@ -143,6 +143,6 @@ EncoderSettingsPointer EncoderFactory::getEncoderSettings(Encoder::Format format
     } else {
         qWarning() << "Unsupported format requested! " << format.internalName;
         DEBUG_ASSERT(false);
-        return std::make_shared<EncoderWaveSettings>(pConfig, format);
+        return std::make_shared<EncoderWaveSettings>(pConfig, ENCODING_WAVE);
     }
 }
diff --git a/src/encoder/encoderwave.cpp b/src/encoder/encoderwave.cpp
index 73d2533906..6054ea2451 100644
--- a/src/encoder/encoderwave.cpp
+++ b/src/encoder/encoderwave.cpp
@@ -98,18 +98,15 @@ EncoderWave::~EncoderWave() {
     }
 }
 
-void EncoderWave::setEncoderSettings(const EncoderSettings& settings)
-{
+void EncoderWave::setEncoderSettings(const EncoderSettings& settings) {
     const EncoderWaveSettings& wavesettings = reinterpret_cast<const EncoderWaveSettings&>(settings);
-    Encoder::Format format = wavesettings.getFormat();
-    if (format.internalName == ENCODING_WAVE) {
+    QString format = wavesettings.getFormat();
+    if (format == ENCODING_WAVE) {
         m_sfInfo.format = SF_FORMAT_WAV;
-    }
-    else if (format.internalName == ENCODING_AIFF) {
+    } else if (format == ENCODING_AIFF) {
         m_sfInfo.format = SF_FORMAT_AIFF;
-    }
-    else {
-        qWarning() << "Unexpected Format when setting EncoderWave: " << format.internalName << ". Reverting to wav";
+    } else {
+        qWarning() << "Unexpected Format when setting EncoderWave: " << format << ". Reverting to wav";
         // Other possibly interesting formats
         // There is a n option for RF64 to automatically downgrade to RIFF WAV if less than 4GB using an
         // sf_command, so it could be interesting to use it in place of FORMAT_WAVE.
diff --git a/src/encoder/encoderwavesettings.cpp b/src/encoder/encoderwavesettings.cpp
index f347a6573b..535b4e1601 100644
--- a/src/encoder/encoderwavesettings.cpp
+++ b/src/encoder/encoderwavesettings.cpp
@@ -9,17 +9,15 @@
  #include "recording/defs_recording.h"
  
 const QString EncoderWaveSettings::BITS_GROUP = "BITS";
- 
+
 EncoderWaveSettings::EncoderWaveSettings(UserSettingsPointer pConfig,
-        Encoder::Format format) :
-    m_pConfig(pConfig),
-    m_format(format)
-{
-    VERIFY_OR_DEBUG_ASSERT(m_format.internalName == ENCODING_WAVE
-            || m_format.internalName == ENCODING_AIFF) {
-        m_format = EncoderFactory::getFactory().getFormatFor(ENCODING_WAVE);
-        qWarning() << "EncoderWaveSettings setup with " << format.internalName
-        << ". This is an error! Changing it to " << m_format.internalName;
+        QString format)
+        : m_pConfig(pConfig),
+          m_format(std::move(format)) {
+    VERIFY_OR_DEBUG_ASSERT(m_format == ENCODING_WAVE || m_format == ENCODING_AIFF) {
+        m_format = ENCODING_WAVE;
+        qWarning() << "EncoderWaveSettings setup with " << m_format
+                   << ". This is an error! Changing it to " << m_format;
     }
     QList<QString> names;
     names.append(QObject::tr("16 bits"));
@@ -27,6 +25,7 @@ EncoderWaveSettings::EncoderWaveSettings(UserSettingsPointer pConfig,
     names.append(QObject::tr("32 bits float"));
     m_radioList.append(OptionsGroup(QObject::tr("Bit depth"), BITS_GROUP, names));
 }
+
 EncoderWaveSettings::~EncoderWaveSettings()
 {
     
@@ -49,8 +48,8 @@ void EncoderWaveSettings::setGroupOption(QString groupCode, int optionIndex)
             found=true;
             if (optionIndex < group.controlNames.size() || optionIndex == 1) {
                 m_pConfig->set(
-                    ConfigKey(RECORDING_PREF_KEY, m_format.internalName + "_" + groupCode),
-                    ConfigValue(optionIndex));
+                        ConfigKey(RECORDING_PREF_KEY, m_format + "_" + groupCode),
+                        ConfigValue(optionIndex));
             } else {
                 qWarning() << "Received an index out of range for: " 
                     << groupCode << ", index: " << optionIndex;
@@ -67,7 +66,7 @@ int EncoderWaveSettings::getSelectedOption(QString groupCode) const
 {
     bool found=false;
     int value = m_pConfig->getValue(
-        ConfigKey(RECORDING_PREF_KEY, m_format.internalName + "_" + groupCode), 0);
+            ConfigKey(RECORDING_PREF_KEY, m_format + "_" + groupCode), 0);
     for (const auto& group : m_radioList) {
         if (groupCode == group.groupCode) {
             found=true;
diff --git a/src/encoder/encoderwavesettings.h b/src/encoder/encoderwavesettings.h
index 011797d02f..1519c6926c 100644
--- a/src/encoder/encoderwavesettings.h
+++ b/src/encoder/encoderwavesettings.h
@@ -14,7 +14,7 @@
 
 class EncoderWaveSettings : public EncoderSettings {
   public:
-    EncoderWaveSettings(UserSettingsPointer pConfig, Encoder::Format format);
+    EncoderWaveSettings(UserSettingsPointer pConfig, QString format);
     virtual ~EncoderWaveSettings();
 
     // Indicates that it uses the quality slider section of the preferences
@@ -42,7 +42,7 @@ class EncoderWaveSettings : public EncoderSettings {
     int getSelectedOption(QString groupCode) const override;
 
     // Returns the format subtype of this encoder settings.
-    Encoder::Format getFormat() const {
+    QString getFormat() const {
         return m_format;
     }
     
@@ -50,7 +50,7 @@ class EncoderWaveSettings : public EncoderSettings {
   private:
     QList<OptionsGroup> m_radioList;
     UserSettingsPointer m_pConfig;
-    Encoder::Format m_format;
+    QString m_format;
 };