diff options
author | Daniel Schürmann <daschuer@mixxx.org> | 2021-01-21 00:19:13 +0100 |
---|---|---|
committer | Daniel Schürmann <daschuer@mixxx.org> | 2021-01-21 00:19:13 +0100 |
commit | 1387cbc1372eaae0c2d4309d4afd5e810419b149 (patch) | |
tree | 4a6cc9485c870a79cbcf10b887e99dc1d538698e /src | |
parent | 88192411a8ce948937ff7c7915abfdeca8573a73 (diff) |
Fix file extensions during recording.
Diffstat (limited to 'src')
-rw-r--r-- | src/encoder/encoder.cpp | 18 | ||||
-rw-r--r-- | src/encoder/encoder.h | 5 | ||||
-rw-r--r-- | src/preferences/dialog/dlgprefrecord.cpp | 3 | ||||
-rw-r--r-- | src/recording/recordingmanager.cpp | 4 |
4 files changed, 13 insertions, 17 deletions
diff --git a/src/encoder/encoder.cpp b/src/encoder/encoder.cpp index 315eac0aca..61853ff947 100644 --- a/src/encoder/encoder.cpp +++ b/src/encoder/encoder.cpp @@ -40,17 +40,17 @@ const EncoderFactory& EncoderFactory::getFactory() EncoderFactory::EncoderFactory() { // Add new supported formats here. Also modify the getNewEncoder/getEncoderSettings method. - m_formats.append(Encoder::Format("WAV PCM", ENCODING_WAVE, true)); - m_formats.append(Encoder::Format("AIFF PCM", ENCODING_AIFF, true)); - m_formats.append(Encoder::Format("FLAC", ENCODING_FLAC, true)); - m_formats.append(Encoder::Format("MP3", ENCODING_MP3, false)); - m_formats.append(Encoder::Format("OGG Vorbis", ENCODING_OGG, false)); + m_formats.append(Encoder::Format("WAV PCM", ENCODING_WAVE, true, "wav")); + m_formats.append(Encoder::Format("AIFF PCM", ENCODING_AIFF, true, "aiff")); + m_formats.append(Encoder::Format("FLAC", ENCODING_FLAC, true, "flac")); + m_formats.append(Encoder::Format("MP3", ENCODING_MP3, false, "mp3")); + m_formats.append(Encoder::Format("OGG Vorbis", ENCODING_OGG, false, "ogg")); #ifdef __OPUS__ - m_formats.append(Encoder::Format("Opus", ENCODING_OPUS, false)); + m_formats.append(Encoder::Format("Opus", ENCODING_OPUS, false, "opus")); #endif - m_formats.append(Encoder::Format("AAC", ENCODING_AAC, false, "m4a")); - m_formats.append(Encoder::Format("HE-AAC", ENCODING_HEAAC, false, "m4a")); - m_formats.append(Encoder::Format("HE-AACv2", ENCODING_HEAACV2, false, "m4a")); + m_formats.append(Encoder::Format("AAC", ENCODING_AAC, false, "aac")); + m_formats.append(Encoder::Format("HE-AAC", ENCODING_HEAAC, false, "aac")); + m_formats.append(Encoder::Format("HE-AACv2", ENCODING_HEAACV2, false, "aac")); } const QList<Encoder::Format> EncoderFactory::getFormats() const diff --git a/src/encoder/encoder.h b/src/encoder/encoder.h index 897ab629a7..7167515e42 100644 --- a/src/encoder/encoder.h +++ b/src/encoder/encoder.h @@ -14,14 +14,11 @@ class Encoder { Format(const QString& labelIn, const QString& nameIn, bool losslessIn, - const QString& fileExtIn = QString::null) + const QString& fileExtIn) : label(labelIn), internalName(nameIn), lossless(losslessIn), fileExtension(fileExtIn) { - if (fileExtension.isEmpty()) { - fileExtension = label; - } } QString label; QString internalName; diff --git a/src/preferences/dialog/dlgprefrecord.cpp b/src/preferences/dialog/dlgprefrecord.cpp index 533520f293..c8226765ee 100644 --- a/src/preferences/dialog/dlgprefrecord.cpp +++ b/src/preferences/dialog/dlgprefrecord.cpp @@ -18,8 +18,7 @@ constexpr bool kDefaultCueEnabled = true; DlgPrefRecord::DlgPrefRecord(QWidget* parent, UserSettingsPointer pConfig) : DlgPreferencePage(parent), m_pConfig(pConfig), - m_selFormat("","",false) -{ + m_selFormat(QString(), QString(), false, QString()) { setupUi(this); // Setting recordings path. diff --git a/src/recording/recordingmanager.cpp b/src/recording/recordingmanager.cpp index c66630e6d2..5568116414 100644 --- a/src/recording/recordingmanager.cpp +++ b/src/recording/recordingmanager.cpp @@ -117,7 +117,7 @@ void RecordingManager::startRecording() { ConfigKey(RECORDING_PREF_KEY, "Encoding")); QString fileExtension = EncoderFactory::getFactory() .getFormatFor(encodingType) - .fileExtension.toLower(); + .fileExtension; m_iNumberOfBytesRecordedSplit = 0; m_secondsRecordedSplit=0; @@ -162,7 +162,7 @@ void RecordingManager::splitContinueRecording() QString encodingType = m_pConfig->getValueString(ConfigKey(RECORDING_PREF_KEY, "Encoding")); QString fileExtension = EncoderFactory::getFactory() .getFormatFor(encodingType) - .fileExtension.toLower(); + .fileExtension; QString new_base_filename = m_recording_base_file + QStringLiteral("part") + QString::number(m_iNumberSplits); m_recordingLocation = new_base_filename + QChar('.') + fileExtension; |