summaryrefslogtreecommitdiffstats
path: root/src/recording
diff options
context:
space:
mode:
authorStéphane L <contact@slepin.fr>2019-01-17 09:25:40 +0100
committerDaniel Schürmann <daschuer@mixxx.org>2021-01-08 23:51:53 +0100
commit029b40539380119bcd80a28e53607b2530d1b548 (patch)
tree8178e8b2dee2f374ecf5274921c4027a572f4c56 /src/recording
parenta1cc267f91826830ee4e1cab8318a44641e445e2 (diff)
fdk-aac encoder
Diffstat (limited to 'src/recording')
-rw-r--r--src/recording/defs_recording.h3
-rw-r--r--src/recording/recordingmanager.cpp12
2 files changed, 12 insertions, 3 deletions
diff --git a/src/recording/defs_recording.h b/src/recording/defs_recording.h
index 63e158c11a..694ec0d826 100644
--- a/src/recording/defs_recording.h
+++ b/src/recording/defs_recording.h
@@ -7,6 +7,9 @@
#define ENCODING_OGG "OGG"
#define ENCODING_MP3 "MP3"
#define ENCODING_OPUS "Opus"
+#define ENCODING_AAC "AAC"
+#define ENCODING_HEAAC "HEAAC"
+#define ENCODING_HEAACV2 "HEAACV2"
#define RECORD_OFF 0.0
#define RECORD_READY 1.0
diff --git a/src/recording/recordingmanager.cpp b/src/recording/recordingmanager.cpp
index e81df4ec43..c66630e6d2 100644
--- a/src/recording/recordingmanager.cpp
+++ b/src/recording/recordingmanager.cpp
@@ -115,6 +115,9 @@ qint64 RecordingManager::getFreeSpace() {
void RecordingManager::startRecording() {
QString encodingType = m_pConfig->getValueString(
ConfigKey(RECORDING_PREF_KEY, "Encoding"));
+ QString fileExtension = EncoderFactory::getFactory()
+ .getFormatFor(encodingType)
+ .fileExtension.toLower();
m_iNumberOfBytesRecordedSplit = 0;
m_secondsRecordedSplit=0;
@@ -135,13 +138,13 @@ void RecordingManager::startRecording() {
// Append file extension.
QString date_time_str = formatDateTimeForFilename(QDateTime::currentDateTime());
m_recordingFile = QString("%1.%2")
- .arg(date_time_str, encodingType.toLower());
+ .arg(date_time_str, fileExtension);
// Storing the absolutePath of the recording file without file extension.
m_recording_base_file = getRecordingDir();
m_recording_base_file.append("/").append(date_time_str);
// Appending file extension to get the filelocation.
- m_recordingLocation = m_recording_base_file + QStringLiteral(".") + encodingType.toLower();
+ m_recordingLocation = m_recording_base_file + QChar('.') + fileExtension;
m_pConfig->set(ConfigKey(RECORDING_PREF_KEY, "Path"), m_recordingLocation);
m_pConfig->set(ConfigKey(RECORDING_PREF_KEY, "CuePath"), ConfigValue(m_recording_base_file + QStringLiteral(".cue")));
@@ -157,9 +160,12 @@ void RecordingManager::splitContinueRecording()
m_secondsRecordedSplit=0;
QString encodingType = m_pConfig->getValueString(ConfigKey(RECORDING_PREF_KEY, "Encoding"));
+ QString fileExtension = EncoderFactory::getFactory()
+ .getFormatFor(encodingType)
+ .fileExtension.toLower();
QString new_base_filename = m_recording_base_file + QStringLiteral("part") + QString::number(m_iNumberSplits);
- m_recordingLocation = new_base_filename + QStringLiteral(".") + encodingType.toLower();
+ m_recordingLocation = new_base_filename + QChar('.') + fileExtension;
m_pConfig->set(ConfigKey(RECORDING_PREF_KEY, "Path"), m_recordingLocation);
m_pConfig->set(ConfigKey(RECORDING_PREF_KEY, "CuePath"), ConfigValue(new_base_filename + QStringLiteral(".cue")));