summaryrefslogtreecommitdiffstats
path: root/src/encoder
diff options
context:
space:
mode:
Diffstat (limited to 'src/encoder')
-rw-r--r--src/encoder/encoder.cpp7
-rw-r--r--src/encoder/encoder.h11
-rw-r--r--src/encoder/encoderflacsettings.cpp4
-rw-r--r--src/encoder/encoderflacsettings.h4
-rw-r--r--src/encoder/encodermp3.cpp2
-rw-r--r--src/encoder/encodermp3.h2
-rw-r--r--src/encoder/encodermp3settings.cpp6
-rw-r--r--src/encoder/encodermp3settings.h4
-rw-r--r--src/encoder/encoderopus.cpp2
-rw-r--r--src/encoder/encoderopus.h2
-rw-r--r--src/encoder/encoderopussettings.cpp4
-rw-r--r--src/encoder/encoderopussettings.h4
-rw-r--r--src/encoder/encoderrecordingsettings.h2
-rw-r--r--src/encoder/encodersettings.h16
-rw-r--r--src/encoder/encodervorbis.cpp2
-rw-r--r--src/encoder/encodervorbis.h2
-rw-r--r--src/encoder/encoderwave.cpp3
-rw-r--r--src/encoder/encoderwave.h2
-rw-r--r--src/encoder/encoderwavesettings.cpp4
-rw-r--r--src/encoder/encoderwavesettings.h4
20 files changed, 46 insertions, 41 deletions
diff --git a/src/encoder/encoder.cpp b/src/encoder/encoder.cpp
index 7bbef1c4c0..3a1dc159a5 100644
--- a/src/encoder/encoder.cpp
+++ b/src/encoder/encoder.cpp
@@ -64,8 +64,7 @@ Encoder::Format EncoderFactory::getSelectedFormat(UserSettingsPointer pConfig) c
{
return getFormatFor(pConfig->getValueString(ConfigKey(RECORDING_PREF_KEY, "Encoding")));
}
-Encoder::Format EncoderFactory::getFormatFor(QString formatText) const
-{
+Encoder::Format EncoderFactory::getFormatFor(const QString& formatText) const {
for (const auto& format : m_formats) {
if (format.internalName == formatText) {
return format;
@@ -77,8 +76,8 @@ Encoder::Format EncoderFactory::getFormatFor(QString formatText) const
}
EncoderPointer EncoderFactory::createRecordingEncoder(
- Encoder::Format format,
- UserSettingsPointer pConfig,
+ const Encoder::Format& format,
+ UserSettingsPointer pConfig,
EncoderCallback* pCallback) const {
EncoderRecordingSettingsPointer pSettings =
getEncoderRecordingSettings(format, pConfig);
diff --git a/src/encoder/encoder.h b/src/encoder/encoder.h
index 7e02757b49..5f918085a0 100644
--- a/src/encoder/encoder.h
+++ b/src/encoder/encoder.h
@@ -21,8 +21,9 @@ class Encoder {
public:
class Format {
public:
- Format(QString labelIn, QString nameIn, bool losslessIn) :
- label(labelIn), internalName(nameIn), lossless(losslessIn) {}
+ Format(const QString& labelIn, const QString& nameIn, bool losslessIn)
+ : label(labelIn), internalName(nameIn), lossless(losslessIn) {
+ }
QString label;
QString internalName;
bool lossless;
@@ -31,7 +32,7 @@ class Encoder {
Encoder() {}
virtual ~Encoder() = default;
- virtual int initEncoder(int samplerate, QString errorMessage) = 0;
+ virtual int initEncoder(int samplerate, QString& errorMessage) = 0;
// encodes the provided buffer of audio.
virtual void encodeBuffer(const CSAMPLE *samples, const int size) = 0;
// Adds metadata to the encoded audio, i.e., the ID3 tag. Currently only used
@@ -53,9 +54,9 @@ class EncoderFactory {
const QList<Encoder::Format> getFormats() const;
Encoder::Format getSelectedFormat(UserSettingsPointer pConfig) const;
- Encoder::Format getFormatFor(QString format) const;
+ Encoder::Format getFormatFor(const QString& format) const;
EncoderPointer createRecordingEncoder(
- Encoder::Format format,
+ const Encoder::Format& format,
UserSettingsPointer pConfig,
EncoderCallback* pCallback) const;
EncoderPointer createEncoder(
diff --git a/src/encoder/encoderflacsettings.cpp b/src/encoder/encoderflacsettings.cpp
index 8e31a429bd..3900d6cd13 100644
--- a/src/encoder/encoderflacsettings.cpp
+++ b/src/encoder/encoderflacsettings.cpp
@@ -78,7 +78,7 @@ QList<EncoderSettings::OptionsGroup> EncoderFlacSettings::getOptionGroups() cons
// Selects the option by its index. If it is a single-element option,
// index 0 means disabled and 1 enabled.
-void EncoderFlacSettings::setGroupOption(QString groupCode, int optionIndex) {
+void EncoderFlacSettings::setGroupOption(const QString& groupCode, int optionIndex) {
bool found=false;
for (const auto& group : qAsConst(m_radioList)) {
if (groupCode == group.groupCode) {
@@ -98,7 +98,7 @@ void EncoderFlacSettings::setGroupOption(QString groupCode, int optionIndex) {
}
// Return the selected option of the group. If it is a single-element option,
// 0 means disabled and 1 enabled.
-int EncoderFlacSettings::getSelectedOption(QString groupCode) const {
+int EncoderFlacSettings::getSelectedOption(const QString& groupCode) const {
bool found=false;
int value = m_pConfig->getValue(ConfigKey(RECORDING_PREF_KEY, groupCode), 0);
for (const auto& group : m_radioList) {
diff --git a/src/encoder/encoderflacsettings.h b/src/encoder/encoderflacsettings.h
index 0e95cc34d3..da2918e97d 100644
--- a/src/encoder/encoderflacsettings.h
+++ b/src/encoder/encoderflacsettings.h
@@ -29,10 +29,10 @@ class EncoderFlacSettings : public EncoderRecordingSettings {
QList<OptionsGroup> getOptionGroups() const override;
// Selects the option by its index. If it is a single-element option,
// index 0 means disabled and 1 enabled.
- void setGroupOption(QString groupCode, int optionIndex) override;
+ void setGroupOption(const QString& groupCode, int optionIndex) override;
// Return the selected option of the group. If it is a single-element option,
// 0 means disabled and 1 enabled.
- int getSelectedOption(QString groupCode) const override;
+ int getSelectedOption(const QString& groupCode) const override;
// Returns the format of this encoder settings.
QString getFormat() const override {
diff --git a/src/encoder/encodermp3.cpp b/src/encoder/encodermp3.cpp
index ba4b9c212e..f938bb3411 100644
--- a/src/encoder/encodermp3.cpp
+++ b/src/encoder/encodermp3.cpp
@@ -164,7 +164,7 @@ void EncoderMp3::initStream() {
m_bufferIn[1] = (float *)malloc(m_bufferOutSize * sizeof(float));
}
-int EncoderMp3::initEncoder(int samplerate, QString errorMessage) {
+int EncoderMp3::initEncoder(int samplerate, QString& errorMessage) {
unsigned long samplerate_in = samplerate;
// samplerate_out 0 means "let LAME pick the appropriate one"
unsigned long samplerate_out = (samplerate_in > 48000 ? 48000 : 0);
diff --git a/src/encoder/encodermp3.h b/src/encoder/encodermp3.h
index c36a92d5ca..901eadb5b1 100644
--- a/src/encoder/encodermp3.h
+++ b/src/encoder/encodermp3.h
@@ -15,7 +15,7 @@ class EncoderMp3 final : public Encoder {
EncoderMp3(EncoderCallback* callback=nullptr);
~EncoderMp3() override;
- int initEncoder(int samplerate, QString errorMessage) override;
+ int initEncoder(int samplerate, QString& errorMessage) override;
void encodeBuffer(const CSAMPLE *samples, const int size) override;
void updateMetaData(const QString& artist, const QString& title, const QString& album) override;
void flush() override;
diff --git a/src/encoder/encodermp3settings.cpp b/src/encoder/encodermp3settings.cpp
index 6c4178d7b6..b5fef2c15b 100644
--- a/src/encoder/encodermp3settings.cpp
+++ b/src/encoder/encodermp3settings.cpp
@@ -94,8 +94,7 @@ QList<EncoderSettings::OptionsGroup> EncoderMp3Settings::getOptionGroups() const
}
// Selects the option by its index. If it is a single-element option,
// index 0 means disabled and 1 enabled.
-void EncoderMp3Settings::setGroupOption(QString groupCode, int optionIndex)
-{
+void EncoderMp3Settings::setGroupOption(const QString& groupCode, int optionIndex) {
bool found=false;
for (const auto& group : qAsConst(m_radioList)) {
if (groupCode == group.groupCode) {
@@ -115,8 +114,7 @@ void EncoderMp3Settings::setGroupOption(QString groupCode, int optionIndex)
}
// Return the selected option of the group. If it is a single-element option,
// 0 means disabled and 1 enabled.
-int EncoderMp3Settings::getSelectedOption(QString groupCode) const
-{
+int EncoderMp3Settings::getSelectedOption(const QString& groupCode) const {
bool found=false;
int value = m_pConfig->getValue(
ConfigKey(RECORDING_PREF_KEY, ENCODING_MODE_GROUP), 0);
diff --git a/src/encoder/encodermp3settings.h b/src/encoder/encodermp3settings.h
index 518b1fd569..d32245fd14 100644
--- a/src/encoder/encodermp3settings.h
+++ b/src/encoder/encodermp3settings.h
@@ -33,10 +33,10 @@ class EncoderMp3Settings : public EncoderRecordingSettings {
QList<OptionsGroup> getOptionGroups() const override;
// Selects the option by its index. If it is a single-element option,
// index 0 means disabled and 1 enabled.
- void setGroupOption(QString groupCode, int optionIndex) override;
+ void setGroupOption(const QString& groupCode, int optionIndex) override;
// Return the selected option of the group. If it is a single-element option,
// 0 means disabled and 1 enabled.
- int getSelectedOption(QString groupCode) const override;
+ int getSelectedOption(const QString& groupCode) const override;
// Returns the format of this encoder settings.
QString getFormat() const override {
diff --git a/src/encoder/encoderopus.cpp b/src/encoder/encoderopus.cpp
index d0b6a9d029..b2551dd635 100644
--- a/src/encoder/encoderopus.cpp
+++ b/src/encoder/encoderopus.cpp
@@ -151,7 +151,7 @@ void EncoderOpus::setEncoderSettings(const EncoderSettings& settings) {
}
}
-int EncoderOpus::initEncoder(int samplerate, QString errorMessage) {
+int EncoderOpus::initEncoder(int samplerate, QString& errorMessage) {
Q_UNUSED(errorMessage);
if (samplerate != kMasterSamplerate) {
diff --git a/src/encoder/encoderopus.h b/src/encoder/encoderopus.h
index 652269ba11..66bd42e788 100644
--- a/src/encoder/encoderopus.h
+++ b/src/encoder/encoderopus.h
@@ -26,7 +26,7 @@ class EncoderOpus: public Encoder {
explicit EncoderOpus(EncoderCallback* pCallback = nullptr);
~EncoderOpus() override;
- int initEncoder(int samplerate, QString errorMessage) override;
+ int initEncoder(int samplerate, QString& errorMessage) override;
void encodeBuffer(const CSAMPLE *samples, const int size) override;
void updateMetaData(const QString& artist, const QString& title, const QString& album) override;
void flush() override;
diff --git a/src/encoder/encoderopussettings.cpp b/src/encoder/encoderopussettings.cpp
index 31e6991c7e..29fe02c60c 100644
--- a/src/encoder/encoderopussettings.cpp
+++ b/src/encoder/encoderopussettings.cpp
@@ -90,7 +90,7 @@ QList<EncoderSettings::OptionsGroup> EncoderOpusSettings::getOptionGroups() cons
return m_radioList;
}
-void EncoderOpusSettings::setGroupOption(QString groupCode, int optionIndex) {
+void EncoderOpusSettings::setGroupOption(const QString& groupCode, int optionIndex) {
bool found = false;
for (const OptionsGroup& group : qAsConst(m_radioList)) {
if (groupCode == group.groupCode) {
@@ -113,7 +113,7 @@ void EncoderOpusSettings::setGroupOption(QString groupCode, int optionIndex) {
}
}
-int EncoderOpusSettings::getSelectedOption(QString groupCode) const {
+int EncoderOpusSettings::getSelectedOption(const QString& groupCode) const {
int value = m_pConfig->getValue(
ConfigKey(RECORDING_PREF_KEY, BITRATE_MODE_GROUP), 0);
diff --git a/src/encoder/encoderopussettings.h b/src/encoder/encoderopussettings.h
index 0d6e46041b..0b03d90963 100644
--- a/src/encoder/encoderopussettings.h
+++ b/src/encoder/encoderopussettings.h
@@ -34,10 +34,10 @@ class EncoderOpusSettings: public EncoderRecordingSettings {
QList<OptionsGroup> getOptionGroups() const override;
// Selects the option by its index. If it is a single-element option,
// index 0 means disabled and 1 enabled.
- void setGroupOption(QString groupCode, int optionIndex) override;
+ void setGroupOption(const QString& groupCode, int optionIndex) override;
// Return the selected option of the group. If it is a single-element option,
// 0 means disabled and 1 enabled.
- int getSelectedOption(QString groupCode) const override;
+ int getSelectedOption(const QString& groupCode) const override;
// Returns the format of this encoder settings.
QString getFormat() const override {
diff --git a/src/encoder/encoderrecordingsettings.h b/src/encoder/encoderrecordingsettings.h
index 6038d9e00c..47e1c38e1f 100644
--- a/src/encoder/encoderrecordingsettings.h
+++ b/src/encoder/encoderrecordingsettings.h
@@ -28,7 +28,7 @@ class EncoderRecordingSettings : public EncoderSettings {
// 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) {
+ virtual void setGroupOption(const QString& groupCode, int optionIndex) {
Q_UNUSED(groupCode);
Q_UNUSED(optionIndex);
DEBUG_ASSERT(!"unimplemented");
diff --git a/src/encoder/encodersettings.h b/src/encoder/encodersettings.h
index a12908f70f..1559743dbe 100644
--- a/src/encoder/encodersettings.h
+++ b/src/encoder/encodersettings.h
@@ -16,8 +16,13 @@ class EncoderSettings {
public:
class OptionsGroup {
public:
- OptionsGroup(QString gName, QString gCode, QList<QString> conNames) :
- groupName(gName), groupCode(gCode), controlNames(conNames) {}
+ OptionsGroup(const QString& gName,
+ const QString& gCode,
+ const QList<QString>& conNames)
+ : groupName(gName),
+ groupCode(gCode),
+ controlNames(conNames) {
+ }
QString groupName;
QString groupCode;
QList<QString> controlNames;
@@ -45,8 +50,11 @@ class EncoderSettings {
// index 0 means disabled and 1 enabled.
// 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 int getSelectedOption(const QString& groupCode) const {
+ Q_UNUSED(groupCode);
+ return 0;
+ }
+
virtual ChannelMode getChannelMode() const { return ChannelMode::AUTOMATIC; }
// Returns the format subtype of this encoder settings.
diff --git a/src/encoder/encodervorbis.cpp b/src/encoder/encodervorbis.cpp
index 3241fe29c5..595897e1b4 100644
--- a/src/encoder/encodervorbis.cpp
+++ b/src/encoder/encodervorbis.cpp
@@ -217,7 +217,7 @@ void EncoderVorbis::initStream() {
m_bStreamInitialized = true;
}
-int EncoderVorbis::initEncoder(int samplerate, QString errorMessage) {
+int EncoderVorbis::initEncoder(int samplerate, QString& errorMessage) {
vorbis_info_init(&m_vinfo);
// initialize VBR quality based mode
diff --git a/src/encoder/encodervorbis.h b/src/encoder/encodervorbis.h
index 112e96dce9..6b30068e27 100644
--- a/src/encoder/encodervorbis.h
+++ b/src/encoder/encodervorbis.h
@@ -28,7 +28,7 @@ class EncoderVorbis : public Encoder {
EncoderVorbis(EncoderCallback* pCallback = nullptr);
~EncoderVorbis() override;
- int initEncoder(int samplerate, QString errorMessage) override;
+ int initEncoder(int samplerate, QString& errorMessage) override;
void encodeBuffer(const CSAMPLE *samples, const int size) override;
void updateMetaData(const QString& artist, const QString& title, const QString& album) override;
void flush() override;
diff --git a/src/encoder/encoderwave.cpp b/src/encoder/encoderwave.cpp
index df30d3ed96..96682a467d 100644
--- a/src/encoder/encoderwave.cpp
+++ b/src/encoder/encoderwave.cpp
@@ -201,8 +201,7 @@ void EncoderWave::initStream() {
}
}
-int EncoderWave::initEncoder(int samplerate, QString errorMessage) {
-
+int EncoderWave::initEncoder(int samplerate, QString& errorMessage) {
// set sfInfo.
// m_sfInfo.format is setup on setEncoderSettings previous to calling initEncoder.
m_sfInfo.samplerate = samplerate;
diff --git a/src/encoder/encoderwave.h b/src/encoder/encoderwave.h
index 0691fd6b3e..6661662a96 100644
--- a/src/encoder/encoderwave.h
+++ b/src/encoder/encoderwave.h
@@ -29,7 +29,7 @@ class EncoderWave : public Encoder {
EncoderWave(EncoderCallback* pCallback = nullptr);
~EncoderWave() override;
- int initEncoder(int samplerate, QString errorMessage) override;
+ int initEncoder(int samplerate, QString& errorMessage) override;
void encodeBuffer(const CSAMPLE *samples, const int size) override;
void updateMetaData(const QString& artist, const QString& title, const QString& album) override;
void flush() override;
diff --git a/src/encoder/encoderwavesettings.cpp b/src/encoder/encoderwavesettings.cpp
index fcc0e915cf..fa0a96cd1a 100644
--- a/src/encoder/encoderwavesettings.cpp
+++ b/src/encoder/encoderwavesettings.cpp
@@ -34,7 +34,7 @@ QList<EncoderSettings::OptionsGroup> EncoderWaveSettings::getOptionGroups() cons
// Selects the option by its index. If it is a single-element option,
// index 0 means disabled and 1 enabled.
-void EncoderWaveSettings::setGroupOption(QString groupCode, int optionIndex) {
+void EncoderWaveSettings::setGroupOption(const QString& groupCode, int optionIndex) {
bool found=false;
for (const auto& group : qAsConst(m_radioList)) {
if (groupCode == group.groupCode) {
@@ -55,7 +55,7 @@ void EncoderWaveSettings::setGroupOption(QString groupCode, int optionIndex) {
}
// Return the selected option of the group. If it is a single-element option,
// 0 means disabled and 1 enabled.
-int EncoderWaveSettings::getSelectedOption(QString groupCode) const {
+int EncoderWaveSettings::getSelectedOption(const QString& groupCode) const {
bool found=false;
int value = m_pConfig->getValue(
ConfigKey(RECORDING_PREF_KEY, m_format + "_" + groupCode), 0);
diff --git a/src/encoder/encoderwavesettings.h b/src/encoder/encoderwavesettings.h
index 6c0d0a38f1..8a1cb56cbf 100644
--- a/src/encoder/encoderwavesettings.h
+++ b/src/encoder/encoderwavesettings.h
@@ -21,10 +21,10 @@ class EncoderWaveSettings : public EncoderRecordingSettings {
QList<OptionsGroup> getOptionGroups() const override;
// Selects the option by its index. If it is a single-element option,
// index 0 means disabled and 1 enabled.
- void setGroupOption(QString groupCode, int optionIndex) override;
+ void setGroupOption(const QString& groupCode, int optionIndex) override;
// Return the selected option of the group. If it is a single-element option,
// 0 means disabled and 1 enabled.
- int getSelectedOption(QString groupCode) const override;
+ int getSelectedOption(const QString& groupCode) const override;
// Returns the format subtype of this encoder settings.
QString getFormat() const override{
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-09 00:33:31 +0000