Update audio export extension name logic

Author: CrSjimo

src/plugins/audio/audioexport/AudioExporterConfig.cpp

@@ -104,14 +104,20 @@ namespace Audio {
         }
     }
 
-    QString AudioExporterConfig::extensionOfType(FileType type) {
+    QString AudioExporterConfig::extensionOfType(FileType type, int formatOption) {
         switch (type) {
             case FT_Wav:
                 return QStringLiteral("wav");
             case FT_Flac:
                 return QStringLiteral("flac");
             case FT_OggContainer:
-                return QStringLiteral("ogg");
+                switch (formatOption) {
+                    case 0:
+                        return QStringLiteral("ogg");
+                    case 1:
+                        return QStringLiteral("opus");
+                }
+                break;
             case FT_Mp3:
                 return QStringLiteral("mp3");
         }

src/plugins/audio/audioexport/AudioExporterConfig.h

@@ -79,7 +79,7 @@ namespace Audio {
         void setFormatMono(bool formatMono);
 
         static QStringList formatOptionsOfType(FileType type);
-        static QString extensionOfType(FileType type);
+        static QString extensionOfType(FileType type, int formatOption);
 
         int formatOption() const;
         void setFormatOption(int formatOption);

src/plugins/audio/internal/addon/ExportAudioAddOn.cpp

@@ -65,12 +65,19 @@ namespace Audio::Internal {
             return documentsDirectory();
         }
 
-        void applyFileType(AudioExporterConfig &config, int index) {
+        void applyFileType(AudioExporterConfig &config, int index, int formatOption = 0) {
             const QFileInfo fileInfo(config.fileName());
             config.setFileType(static_cast<AudioExporterConfig::FileType>(index));
-            config.setFormatOption(0);
+            config.setFormatOption(formatOption);
             config.setFileName(fileInfo.completeBaseName() + QStringLiteral(".") +
-                               AudioExporterConfig::extensionOfType(static_cast<AudioExporterConfig::FileType>(index)));
+                               AudioExporterConfig::extensionOfType(config.fileType(), config.formatOption()));
+        }
+
+        void applyFormatOption(AudioExporterConfig &config, int index) {
+            const QFileInfo fileInfo(config.fileName());
+            config.setFormatOption(index);
+            config.setFileName(fileInfo.completeBaseName() + QStringLiteral(".") +
+                               AudioExporterConfig::extensionOfType(config.fileType(), config.formatOption()));
         }
     }
 
@@ -231,7 +238,7 @@ namespace Audio::Internal {
         const QStringList filters = {
             tr("WAV (*.wav)"),
             tr("FLAC (*.flac)"),
-            tr("Ogg Container (*.ogg)"),
+            tr("Ogg Container (*.ogg *.opus)"),
             tr("MP3 (*.mp3)"),
         };
         QString selectedFilter = filters.at(config.fileType());
@@ -252,7 +259,9 @@ namespace Audio::Internal {
             : QStringLiteral("_${trackIndex}_${trackName}.");
         config.setFileName(fileInfo.completeBaseName() + templateSuffix + fileInfo.suffix());
         config.setFileDirectory(fileInfo.dir().canonicalPath());
-        applyFileType(config, filters.indexOf(selectedFilter));
+        const auto fileType = filters.indexOf(selectedFilter);
+        const auto formatOption = fileType == config.fileType() ? config.formatOption() : 0;
+        applyFileType(config, fileType, formatOption);
         presets->setCurrentConfig(config);
     }
 
@@ -301,7 +310,7 @@ namespace Audio::Internal {
             basename += QStringLiteral("_${trackIndex}_${trackName}");
         }
         if (suffix.isEmpty()) {
-            suffix = AudioExporterConfig::extensionOfType(config.fileType());
+            suffix = AudioExporterConfig::extensionOfType(config.fileType(), config.formatOption());
         }
         config.setFileName(basename + QStringLiteral(".") + suffix);
         presets->setCurrentConfig(config);
@@ -314,6 +323,13 @@ namespace Audio::Internal {
         presets->setCurrentConfig(config);
     }
 
+    void ExportAudioAddOn::setFormatOption(int index) {
+        auto presets = AudioExporterPresets::instance();
+        auto config = presets->currentConfig();
+        applyFormatOption(config, index);
+        presets->setCurrentConfig(config);
+    }
+
     void ExportAudioAddOn::setMixingOptionSimple(int index) {
         auto config = m_simpleConfig;
         config.setMixingOption(static_cast<AudioExporterConfig::MixingOption>(index));
@@ -330,7 +346,7 @@ namespace Audio::Internal {
             basename += QStringLiteral("_${trackIndex}_${trackName}");
                    }
         if (suffix.isEmpty()) {
-            suffix = AudioExporterConfig::extensionOfType(config.fileType());
+            suffix = AudioExporterConfig::extensionOfType(config.fileType(), config.formatOption());
         }
         config.setFileName(basename + QStringLiteral(".") + suffix);
         setSimpleConfig(config);

src/plugins/audio/internal/addon/ExportAudioAddOn.h

@@ -95,6 +95,7 @@ namespace Audio::Internal {
         Q_INVOKABLE static QStringList formatOptions(int fileType) ;
         Q_INVOKABLE static void setMixingOption(int index);
         Q_INVOKABLE static void setFileType(int index);
+        Q_INVOKABLE static void setFormatOption(int index);
         Q_INVOKABLE void setMixingOptionSimple(int index);
         Q_INVOKABLE void setFileTypeSimple(int index);
         Q_INVOKABLE static void appendFileNameTemplate(const QString &templateString);

src/plugins/audio/qml/dialogs/AudioExportDialog.qml

@@ -427,7 +427,7 @@ Window {
                                     columnItem: ComboBox {
                                         model: dialog.addOn.formatOptions(AudioExporterPresets.currentConfig.fileType)
                                         currentIndex: AudioExporterPresets.currentConfig.formatOption
-                                        onActivated: (index) => AudioExporterPresets.currentConfig.formatOption = index
+                                        onActivated: (index) => dialog.addOn.setFormatOption(index)
                                     }
                                     Layout.fillWidth: true
                                 }