diff options
author | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-12-15 17:45:30 +0100 |
---|---|---|
committer | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-12-15 17:45:30 +0100 |
commit | 95a5716a54b6bc0f937ea08755bdfc4cd01ee351 (patch) | |
tree | f575fd31ae7f9482df0c46880109da554a3b732e /src/recording | |
parent | 3f7b674633fdb7b314ef4ecefd6223928872b92f (diff) | |
parent | 72b91833a8e7049e75328d32b00c596c4516022a (diff) |
Merge branch '2.3' of github.com:mixxxdj/mixxx into main
Diffstat (limited to 'src/recording')
-rw-r--r-- | src/recording/recordingmanager.cpp | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/src/recording/recordingmanager.cpp b/src/recording/recordingmanager.cpp index 2f0a4a28a6..66ecef5fbf 100644 --- a/src/recording/recordingmanager.cpp +++ b/src/recording/recordingmanager.cpp @@ -312,38 +312,40 @@ const QString& RecordingManager::getRecordingLocation() const { quint64 RecordingManager::getFileSplitSize() { QString fileSizeStr = m_pConfig->getValueString(ConfigKey(RECORDING_PREF_KEY, "FileSize")); - if(fileSizeStr == SPLIT_650MB) + if (fileSizeStr == SPLIT_650MB) { return SIZE_650MB; - else if(fileSizeStr == SPLIT_700MB) + } else if (fileSizeStr == SPLIT_700MB) { return SIZE_700MB; - else if(fileSizeStr == SPLIT_1024MB) + } else if (fileSizeStr == SPLIT_1024MB) { return SIZE_1GB; - else if(fileSizeStr == SPLIT_2048MB) + } else if (fileSizeStr == SPLIT_2048MB) { return SIZE_2GB; - else if(fileSizeStr == SPLIT_4096MB) + } else if (fileSizeStr == SPLIT_4096MB) { return SIZE_4GB; - else if(fileSizeStr == SPLIT_60MIN) + } else if (fileSizeStr == SPLIT_60MIN) { return SIZE_4GB; //Ignore size limit. use time limit - else if(fileSizeStr == SPLIT_74MIN) + } else if (fileSizeStr == SPLIT_74MIN) { return SIZE_4GB; //Ignore size limit. use time limit - else if(fileSizeStr == SPLIT_80MIN) + } else if (fileSizeStr == SPLIT_80MIN) { return SIZE_4GB; //Ignore size limit. use time limit - else if(fileSizeStr == SPLIT_120MIN) + } else if (fileSizeStr == SPLIT_120MIN) { return SIZE_4GB; //Ignore size limit. use time limit - else + } else { return SIZE_650MB; + } } unsigned int RecordingManager::getFileSplitSeconds() { QString fileSizeStr = m_pConfig->getValueString(ConfigKey(RECORDING_PREF_KEY, "FileSize")); - if(fileSizeStr == SPLIT_60MIN) + if (fileSizeStr == SPLIT_60MIN) { return 60*60; - else if(fileSizeStr == SPLIT_74MIN) + } else if (fileSizeStr == SPLIT_74MIN) { return 74*60; - else if(fileSizeStr == SPLIT_80MIN) + } else if (fileSizeStr == SPLIT_80MIN) { return 80*60; - else if(fileSizeStr == SPLIT_120MIN) + } else if (fileSizeStr == SPLIT_120MIN) { return 120*60; - else // Do not limit by time for the rest. + } else { // Do not limit by time for the rest. return INT_MAX; + } } |