diff options
author | Daniel Schürmann <daschuer@mixxx.org> | 2019-12-29 13:24:37 +0100 |
---|---|---|
committer | Daniel Schürmann <daschuer@mixxx.org> | 2019-12-29 13:24:37 +0100 |
commit | b826998b8edea2fba9d4403d081678d2e744784b (patch) | |
tree | 9424ec866472dd6ffb087965d60b3e57df00a8f6 /src/encoder | |
parent | 6998d9d8238f4dfd52ab1327dbe944bb50ab29a5 (diff) |
EncoderBroadcastSettings inherits EncoderSettings directly
Diffstat (limited to 'src/encoder')
-rw-r--r-- | src/encoder/encoderbroadcastsettings.cpp | 11 | ||||
-rw-r--r-- | src/encoder/encoderbroadcastsettings.h | 30 |
2 files changed, 4 insertions, 37 deletions
diff --git a/src/encoder/encoderbroadcastsettings.cpp b/src/encoder/encoderbroadcastsettings.cpp index b3529c692e..5cadc9c4e0 100644 --- a/src/encoder/encoderbroadcastsettings.cpp +++ b/src/encoder/encoderbroadcastsettings.cpp @@ -26,22 +26,11 @@ EncoderBroadcastSettings::EncoderBroadcastSettings( m_qualList.append(256); m_qualList.append(320); } -EncoderBroadcastSettings::~EncoderBroadcastSettings() { -} QList<int> EncoderBroadcastSettings::getQualityValues() const { return m_qualList; } -void EncoderBroadcastSettings::setQualityByIndex(int qualityIndex) { - if (qualityIndex >= 0 && qualityIndex < m_qualList.size()) { - m_pProfile->setBitrate(m_qualList.at(qualityIndex)); - } else { - qWarning() << "Invalid qualityIndex given to EncoderBroadcastSettings: " - << qualityIndex << ". Ignoring it"; - } -} - int EncoderBroadcastSettings::getQuality() const { int bitrate = m_pProfile->getBitrate(); if (m_qualList.contains(bitrate)) { diff --git a/src/encoder/encoderbroadcastsettings.h b/src/encoder/encoderbroadcastsettings.h index 0953c1eef5..42795b7f4b 100644 --- a/src/encoder/encoderbroadcastsettings.h +++ b/src/encoder/encoderbroadcastsettings.h @@ -9,26 +9,17 @@ #ifndef ENCODERBROADCASTSETTINGS_H #define ENCODERBROADCASTSETTINGS_H -#include "encoder/encoderrecordingsettings.h" +#include "encoder/encodersettings.h" #include "encoder/encoder.h" #include "preferences/broadcastsettings.h" -class EncoderBroadcastSettings : public EncoderRecordingSettings { +class EncoderBroadcastSettings : public EncoderSettings { public: - EncoderBroadcastSettings(BroadcastProfilePtr profile); - virtual ~EncoderBroadcastSettings(); - - // Indicates that it uses the quality slider section of the preferences - bool usesQualitySlider() const override; - // Indicates that it uses the compression slider section of the preferences - bool usesCompressionSlider() const override; - // Indicates that it uses the radio button section of the preferences. - bool usesOptionGroups() const override; + explicit EncoderBroadcastSettings(BroadcastProfilePtr profile); + ~EncoderBroadcastSettings() override = default; // Returns the list of quality values that it supports, to assign them to the slider QList<int> getQualityValues() const override; - // Sets the quality value by its index - void setQualityByIndex(int qualityIndex) override; // Returns the current quality value int getQuality() const override; int getQualityIndex() const override; @@ -39,17 +30,4 @@ class EncoderBroadcastSettings : public EncoderRecordingSettings { BroadcastProfilePtr m_pProfile; }; -inline bool EncoderBroadcastSettings::usesQualitySlider() const -{ - return true; -} -inline bool EncoderBroadcastSettings::usesCompressionSlider() const -{ - return false; -} -inline bool EncoderBroadcastSettings::usesOptionGroups() const -{ - return false; -} - #endif // ENCODERBROADCASTSETTINGS_H |