summaryrefslogtreecommitdiffstats
path: root/src/encoder
diff options
context:
space:
mode:
authorDaniel Schürmann <daschuer@mixxx.org>2019-12-29 11:47:27 +0100
committerDaniel Schürmann <daschuer@mixxx.org>2019-12-29 11:49:45 +0100
commite1c8b45b64181481546d4497a43212ff72e3d017 (patch)
tree8dc599ebab8510aca3cece44959b6c2bf92d8506 /src/encoder
parent3d6a0692cb013194aa55672bb6e2e3b68e4e7fed (diff)
Removed unused functions
Diffstat (limited to 'src/encoder')
-rw-r--r--src/encoder/encoderbroadcastsettings.cpp15
-rw-r--r--src/encoder/encoderbroadcastsettings.h3
-rw-r--r--src/encoder/encodermp3settings.cpp12
-rw-r--r--src/encoder/encodermp3settings.h2
-rw-r--r--src/encoder/encoderopussettings.cpp14
-rw-r--r--src/encoder/encoderopussettings.h2
-rw-r--r--src/encoder/encodersettings.h7
-rw-r--r--src/encoder/encodervorbissettings.cpp14
-rw-r--r--src/encoder/encodervorbissettings.h2
9 files changed, 4 insertions, 67 deletions
diff --git a/src/encoder/encoderbroadcastsettings.cpp b/src/encoder/encoderbroadcastsettings.cpp
index f255eff5e0..b3529c692e 100644
--- a/src/encoder/encoderbroadcastsettings.cpp
+++ b/src/encoder/encoderbroadcastsettings.cpp
@@ -33,16 +33,6 @@ QList<int> EncoderBroadcastSettings::getQualityValues() const {
return m_qualList;
}
-// Sets the value
-void EncoderBroadcastSettings::setQualityByValue(int qualityValue) {
- if (m_qualList.contains(qualityValue)) {
- m_pProfile->setBitrate(qualityValue);
- } else {
- qWarning() << "Invalid qualityValue given to EncoderBroadcastSettings: "
- << qualityValue << ". Ignoring it";
- }
-}
-
void EncoderBroadcastSettings::setQualityByIndex(int qualityIndex) {
if (qualityIndex >= 0 && qualityIndex < m_qualList.size()) {
m_pProfile->setBitrate(m_qualList.at(qualityIndex));
@@ -68,11 +58,6 @@ int EncoderBroadcastSettings::getQualityIndex() const {
return m_qualList.indexOf(getQuality());
}
-void EncoderBroadcastSettings::setChannelMode(EncoderSettings::ChannelMode mode)
-{
- m_pProfile->setChannels(static_cast<int>(mode));
-}
-
EncoderSettings::ChannelMode EncoderBroadcastSettings::getChannelMode() const {
switch(m_pProfile->getChannels()) {
case 1: return EncoderSettings::ChannelMode::MONO;
diff --git a/src/encoder/encoderbroadcastsettings.h b/src/encoder/encoderbroadcastsettings.h
index 15bdb4bfd3..955e314245 100644
--- a/src/encoder/encoderbroadcastsettings.h
+++ b/src/encoder/encoderbroadcastsettings.h
@@ -27,14 +27,11 @@ class EncoderBroadcastSettings : public EncoderSettings {
// 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 value
- void setQualityByValue(int qualityValue) 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;
- void setChannelMode(ChannelMode mode) override;
ChannelMode getChannelMode() const override;
private:
diff --git a/src/encoder/encodermp3settings.cpp b/src/encoder/encodermp3settings.cpp
index c89c7f7d10..5db8b231ce 100644
--- a/src/encoder/encodermp3settings.cpp
+++ b/src/encoder/encodermp3settings.cpp
@@ -63,18 +63,6 @@ QList<int> EncoderMp3Settings::getVBRQualityValues() const
return m_qualVBRList;
}
-// Sets the value
-void EncoderMp3Settings::setQualityByValue(int qualityValue)
-{
- if (m_qualList.contains(qualityValue)) {
- m_pConfig->set(ConfigKey(RECORDING_PREF_KEY, "MP3_Quality"),
- ConfigValue(m_qualList.indexOf(qualityValue)));
- } else {
- qWarning() << "Invalid qualityValue given to EncoderMp3Settings: "
- << qualityValue << ". Ignoring it";
- }
-}
-
void EncoderMp3Settings::setQualityByIndex(int qualityIndex)
{
if (qualityIndex >= 0 && qualityIndex < m_qualList.size()) {
diff --git a/src/encoder/encodermp3settings.h b/src/encoder/encodermp3settings.h
index aaa8168160..01af4c0036 100644
--- a/src/encoder/encodermp3settings.h
+++ b/src/encoder/encodermp3settings.h
@@ -26,8 +26,6 @@ class EncoderMp3Settings : public EncoderSettings {
// Returns the list of quality values that it supports, to assign them to the slider
QList<int> getQualityValues() const override;
QList<int> getVBRQualityValues() const;
- // Sets the quality value by its value
- void setQualityByValue(int qualityValue) override;
// Sets the quality value by its index
void setQualityByIndex(int qualityIndex) override;
// Returns the current quality value
diff --git a/src/encoder/encoderopussettings.cpp b/src/encoder/encoderopussettings.cpp
index 4e82361dbc..586d72e995 100644
--- a/src/encoder/encoderopussettings.cpp
+++ b/src/encoder/encoderopussettings.cpp
@@ -50,20 +50,6 @@ QList<int> EncoderOpusSettings::getQualityValues() const {
return m_qualList;
}
-void EncoderOpusSettings::setQualityByValue(int qualityValue) {
- // Same behavior as Vorbis: Opus does not have a fixed set of
- // bitrates, so we can accept any value.
- int indexValue;
- if (m_qualList.contains(qualityValue)) {
- indexValue = m_qualList.indexOf(qualityValue);
- } else {
- // If we let the user write a bitrate value, this would allow to save such value.
- indexValue = qualityValue;
- }
-
- m_pConfig->setValue<int>(ConfigKey(RECORDING_PREF_KEY, kQualityKey), indexValue);
-}
-
void EncoderOpusSettings::setQualityByIndex(int qualityIndex) {
if (qualityIndex >= 0 && qualityIndex < m_qualList.size()) {
m_pConfig->setValue<int>(ConfigKey(RECORDING_PREF_KEY, kQualityKey), qualityIndex);
diff --git a/src/encoder/encoderopussettings.h b/src/encoder/encoderopussettings.h
index adc4210ae9..6b351c76fd 100644
--- a/src/encoder/encoderopussettings.h
+++ b/src/encoder/encoderopussettings.h
@@ -32,8 +32,6 @@ class EncoderOpusSettings: public EncoderSettings {
// 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 value
- void setQualityByValue(int qualityValue) override;
// Sets the quality value by its index
void setQualityByIndex(int qualityIndex) override;
// Returns the current quality value
diff --git a/src/encoder/encodersettings.h b/src/encoder/encodersettings.h
index ce97d71b82..f44f343852 100644
--- a/src/encoder/encodersettings.h
+++ b/src/encoder/encodersettings.h
@@ -41,7 +41,6 @@ class EncoderSettings {
// Returns the list of quality values supported, to assign them to the slider
virtual QList<int> getQualityValues() const { return QList<int>(); }
// Sets the quality value by its value
- virtual void setQualityByValue(int qualityValue) { Q_UNUSED(qualityValue); }
// Sets the quality value by its index
virtual void setQualityByIndex(int qualityIndex) { Q_UNUSED(qualityIndex); }
virtual int getQuality() const { return 0; }
@@ -55,13 +54,13 @@ class EncoderSettings {
virtual QList<OptionsGroup> getOptionGroups() const { return QList<OptionsGroup>(); }
// Selects the option by its index. If it is a single-element option,
// index 0 means disabled and 1 enabled.
- virtual void setGroupOption(QString groupCode, int optionIndex) {
- Q_UNUSED(groupCode); Q_UNUSED(optionIndex); }
+ virtual void setGroupOption(QString groupCode, int optionIndex) {
+ Q_UNUSED(groupCode);
+ Q_UNUSED(optionIndex); }
// Return the selected option of the group. If it is a single-element option,
// 0 means disabled and 1 enabled.
virtual int getSelectedOption(QString groupCode) const { Q_UNUSED(groupCode); return 0; }
- virtual void setChannelMode(ChannelMode mode) { Q_UNUSED(mode); }
virtual ChannelMode getChannelMode() const { return ChannelMode::AUTOMATIC; }
};
diff --git a/src/encoder/encodervorbissettings.cpp b/src/encoder/encodervorbissettings.cpp
index 2885124c7c..32aa479416 100644
--- a/src/encoder/encodervorbissettings.cpp
+++ b/src/encoder/encodervorbissettings.cpp
@@ -37,19 +37,6 @@ QList<int> EncoderVorbisSettings::getQualityValues() const
{
return m_qualList;
}
-// Sets the value
-void EncoderVorbisSettings::setQualityByValue(int qualityValue)
-{
- // Vorbis does not have a fixed set of bitrates, so we can accept any value.
- int indexValue;
- if (m_qualList.contains(qualityValue)) {
- indexValue = m_qualList.indexOf(qualityValue);
- } else {
- // If we let the user write a bitrate value, this would allow to save such value.
- indexValue = qualityValue;
- }
- m_pConfig->setValue<int>(ConfigKey(RECORDING_PREF_KEY, "OGG_Quality"), indexValue);
-}
void EncoderVorbisSettings::setQualityByIndex(int qualityIndex)
{
@@ -60,6 +47,7 @@ void EncoderVorbisSettings::setQualityByIndex(int qualityIndex)
<< qualityIndex << ". Ignoring it";
}
}
+
int EncoderVorbisSettings::getQuality() const
{
int qualityIndex = m_pConfig->getValue(
diff --git a/src/encoder/encodervorbissettings.h b/src/encoder/encodervorbissettings.h
index 92e8f423fe..5ab9f558af 100644
--- a/src/encoder/encodervorbissettings.h
+++ b/src/encoder/encodervorbissettings.h
@@ -25,8 +25,6 @@ class EncoderVorbisSettings : public EncoderSettings {
// 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 value
- void setQualityByValue(int qualityValue) override;
// Sets the quality value by its index
void setQualityByIndex(int qualityIndex) override;
// Returns the current quality value