move getFormat to EncoderSettings interface

8 files changed, 33 insertions, 1 deletions

diff --git a/src/encoder/encoderbroadcastsettings.cpp b/src/encoder/encoderbroadcastsettings.cpp
index 5cadc9c4e0..56a45569cb 100644
--- a/src/encoder/encoderbroadcastsettings.cpp
+++ b/src/encoder/encoderbroadcastsettings.cpp
@@ -56,3 +56,7 @@ EncoderSettings::ChannelMode EncoderBroadcastSettings::getChannelMode() const {
     }
 }
 
+QString EncoderBroadcastSettings::getFormat() const {
+    return m_pProfile->getFormat();
+}
+
diff --git a/src/encoder/encoderbroadcastsettings.h b/src/encoder/encoderbroadcastsettings.h
index 42795b7f4b..875639eb99 100644
--- a/src/encoder/encoderbroadcastsettings.h
+++ b/src/encoder/encoderbroadcastsettings.h
@@ -24,6 +24,7 @@ class EncoderBroadcastSettings : public EncoderSettings {
     int getQuality() const override;
     int getQualityIndex() const override;
     ChannelMode getChannelMode() const override;
+    QString getFormat() const override;
 
   private:
     QList<int> m_qualList;
diff --git a/src/encoder/encoderflacsettings.h b/src/encoder/encoderflacsettings.h
index f102159bfd..978d7e3fed 100644
--- a/src/encoder/encoderflacsettings.h
+++ b/src/encoder/encoderflacsettings.h
@@ -10,6 +10,7 @@
 
 #include "encoder/encoderrecordingsettings.h"
 #include "encoder/encoder.h"
+#include "recording/defs_recording.h"
 
 class EncoderFlacSettings : public EncoderRecordingSettings {
   public:
@@ -37,6 +38,11 @@ class EncoderFlacSettings : public EncoderRecordingSettings {
     // 0 means disabled and 1 enabled.
     int getSelectedOption(QString groupCode) const override;
 
+    // Returns the format of this encoder settings.
+    QString getFormat() const override {
+        return ENCODING_FLAC;
+    }
+
     static const int DEFAULT_QUALITY_VALUE;
     static const QString BITS_GROUP;
     static const QString GROUP_COMPRESSION;
diff --git a/src/encoder/encodermp3settings.h b/src/encoder/encodermp3settings.h
index e476f7fe5c..b50fe37f0c 100644
--- a/src/encoder/encodermp3settings.h
+++ b/src/encoder/encodermp3settings.h
@@ -10,6 +10,7 @@
 
 #include "encoder/encoderrecordingsettings.h"
 #include "encoder/encoder.h"
+#include "recording/defs_recording.h"
 
 class EncoderMp3Settings : public EncoderRecordingSettings {
   public:
@@ -40,6 +41,11 @@ class EncoderMp3Settings : public EncoderRecordingSettings {
     // 0 means disabled and 1 enabled.
     int getSelectedOption(QString groupCode) const override;
 
+    // Returns the format of this encoder settings.
+    QString getFormat() const override {
+        return ENCODING_MP3;
+    }
+
     static const int DEFAULT_BITRATE_INDEX;
     static const QString ENCODING_MODE_GROUP;
   private:
diff --git a/src/encoder/encoderopussettings.h b/src/encoder/encoderopussettings.h
index 398210da58..92efa71b5c 100644
--- a/src/encoder/encoderopussettings.h
+++ b/src/encoder/encoderopussettings.h
@@ -6,6 +6,7 @@
 
 #include "encoder/encoderrecordingsettings.h"
 #include "encoder/encoder.h"
+#include "recording/defs_recording.h"
 
 #define OPUS_BITRATE_MODES_COUNT 3
 #define OPUS_BITRATE_CONSTRAINED_VBR 0
@@ -47,6 +48,11 @@ class EncoderOpusSettings: public EncoderRecordingSettings {
     // 0 means disabled and 1 enabled.
     int getSelectedOption(QString groupCode) const override;
 
+    // Returns the format of this encoder settings.
+    QString getFormat() const override {
+        return ENCODING_OPUS;
+    }
+
     static const QString BITRATE_MODE_GROUP;
 
   private:
diff --git a/src/encoder/encodersettings.h b/src/encoder/encodersettings.h
index 05d8366b80..a12908f70f 100644
--- a/src/encoder/encodersettings.h
+++ b/src/encoder/encodersettings.h
@@ -48,6 +48,9 @@ class EncoderSettings {
     virtual int getSelectedOption(QString groupCode) const { Q_UNUSED(groupCode); return 0; }
     
     virtual ChannelMode getChannelMode() const { return ChannelMode::AUTOMATIC; }
+
+    // Returns the format subtype of this encoder settings.
+    virtual QString getFormat() const = 0;
 };
 
 typedef std::shared_ptr<EncoderSettings> EncoderSettingsPointer;
diff --git a/src/encoder/encodervorbissettings.h b/src/encoder/encodervorbissettings.h
index d4d22739a3..310cf55aba 100644
--- a/src/encoder/encodervorbissettings.h
+++ b/src/encoder/encodervorbissettings.h
@@ -10,6 +10,7 @@
 
 #include "encoder/encoderrecordingsettings.h"
 #include "encoder/encoder.h"
+#include "recording/defs_recording.h"
 
 class EncoderVorbisSettings : public EncoderRecordingSettings {
     public:
@@ -31,6 +32,11 @@ class EncoderVorbisSettings : public EncoderRecordingSettings {
     int getQuality() const override;
     int getQualityIndex() const override;
 
+    // Returns the format of this encoder settings.
+    QString getFormat() const override {
+        return ENCODING_OGG;
+    }
+
   private:
     QList<int> m_qualList;
     UserSettingsPointer m_pConfig;
diff --git a/src/encoder/encoderwavesettings.h b/src/encoder/encoderwavesettings.h
index eba1dab046..7380c04747 100644
--- a/src/encoder/encoderwavesettings.h
+++ b/src/encoder/encoderwavesettings.h
@@ -42,7 +42,7 @@ class EncoderWaveSettings : public EncoderRecordingSettings {
     int getSelectedOption(QString groupCode) const override;
 
     // Returns the format subtype of this encoder settings.
-    QString getFormat() const {
+    QString getFormat() const override{
         return m_format;
     }