Add simple mode audio export dialog

CrSjimo · CrSjimo · commit c564324f5a72 · 2026-05-18T15:37:01.000+08:00
diff --git a/src/plugins/audio/audioexport/AudioExporter.h b/src/plugins/audio/audioexport/AudioExporter.h
@@ -1,6 +1,8 @@
 #ifndef DIFFSCOPE_AUDIO_AUDIOEXPORTER_H
 #define DIFFSCOPE_AUDIO_AUDIOEXPORTER_H
 
+#include <qqmlintegration.h>
+
 #include <QObject>
 #include <QStringList>
 
@@ -29,6 +31,8 @@ namespace Audio {
 
     class AUDIO_EXPORT AudioExporter : public QObject {
         Q_OBJECT
+        QML_ELEMENT
+        QML_UNCREATABLE("")
         Q_DECLARE_PRIVATE(AudioExporter)
         Q_PROPERTY(Core::ProjectWindowInterface *windowHandle READ windowHandle CONSTANT)
         Q_PROPERTY(Audio::AudioExporterConfig config READ config WRITE setConfig NOTIFY configChanged)
diff --git a/src/plugins/audio/internal/AudioPreference.cpp b/src/plugins/audio/internal/AudioPreference.cpp
@@ -11,6 +11,7 @@ namespace Audio::Internal {
         AudioPreference::PlayheadBehavior playbackBehavior{};
         AudioPreference::PlaybackTogglingAction playbackTogglingAction{AudioPreference::PTA_PlayStop};
         bool audioExporterClippingCheckEnabled{true};
+        bool audioExporterEnableAdvancedOptions{false};
         bool audioExporterUseTemporaryFile{true};
     };
 
@@ -36,10 +37,12 @@ namespace Audio::Internal {
         d->playbackBehavior = settings->value("playbackBehavior", QVariant::fromValue(PB_ReturnToStart)).value<PlayheadBehavior>();
         d->playbackTogglingAction = settings->value("playbackTogglingAction", QVariant::fromValue(PTA_PlayStop)).value<PlaybackTogglingAction>();
         d->audioExporterClippingCheckEnabled = settings->value("audioExporterClippingCheckEnabled", true).toBool();
+        d->audioExporterEnableAdvancedOptions = settings->value("audioExporterEnableAdvancedOptions", true).toBool();
         d->audioExporterUseTemporaryFile = settings->value("audioExporterUseTemporaryFile", true).toBool();
         emit playbackBehaviorChanged();
         emit playbackTogglingActionChanged();
         emit audioExporterClippingCheckEnabledChanged();
+        emit audioExporterEnableAdvancedOptionsChanged();
         emit audioExporterUseTemporaryFileChanged();
         settings->endGroup();
     }
@@ -51,6 +54,7 @@ namespace Audio::Internal {
         settings->setValue("playbackBehavior", d->playbackBehavior);
         settings->setValue("playbackTogglingAction", d->playbackTogglingAction);
         settings->setValue("audioExporterClippingCheckEnabled", d->audioExporterClippingCheckEnabled);
+        settings->setValue("audioExporterEnableAdvancedOptions", d->audioExporterEnableAdvancedOptions);
         settings->setValue("audioExporterUseTemporaryFile", d->audioExporterUseTemporaryFile);
         settings->endGroup();
     }
@@ -98,6 +102,19 @@ namespace Audio::Internal {
         emit m_instance->audioExporterClippingCheckEnabledChanged();
     }
 
+    bool AudioPreference::audioExporterEnableAdvancedOptions() {
+        M_INSTANCE_D;
+        return d->audioExporterEnableAdvancedOptions;
+    }
+
+    void AudioPreference::setAudioExporterEnableAdvancedOptions(bool enabled) {
+        M_INSTANCE_D;
+        if (d->audioExporterEnableAdvancedOptions == enabled)
+            return;
+        d->audioExporterEnableAdvancedOptions = enabled;
+        emit m_instance->audioExporterEnableAdvancedOptionsChanged();
+    }
+
     bool AudioPreference::audioExporterUseTemporaryFile() {
         M_INSTANCE_D;
         return d->audioExporterUseTemporaryFile;
diff --git a/src/plugins/audio/internal/AudioPreference.h b/src/plugins/audio/internal/AudioPreference.h
@@ -22,6 +22,7 @@ namespace Audio::Internal {
         Q_PROPERTY(AudioPreference::PlayheadBehavior playbackBehavior READ playbackBehavior WRITE setPlaybackBehavior NOTIFY playbackBehaviorChanged)
         Q_PROPERTY(AudioPreference::PlaybackTogglingAction playbackTogglingAction READ playbackTogglingAction WRITE setPlaybackTogglingAction NOTIFY playbackTogglingActionChanged)
         Q_PROPERTY(bool audioExporterClippingCheckEnabled READ audioExporterClippingCheckEnabled WRITE setAudioExporterClippingCheckEnabled NOTIFY audioExporterClippingCheckEnabledChanged)
+        Q_PROPERTY(bool audioExporterEnableAdvancedOptions READ audioExporterEnableAdvancedOptions WRITE setAudioExporterEnableAdvancedOptions NOTIFY audioExporterEnableAdvancedOptionsChanged)
         Q_PROPERTY(bool audioExporterUseTemporaryFile READ audioExporterUseTemporaryFile WRITE setAudioExporterUseTemporaryFile NOTIFY audioExporterUseTemporaryFileChanged)
 
     public:
@@ -55,13 +56,16 @@ namespace Audio::Internal {
         static void setPlaybackTogglingAction(PlaybackTogglingAction playbackTogglingAction);
         static bool audioExporterClippingCheckEnabled();
         static void setAudioExporterClippingCheckEnabled(bool enabled);
+        static bool audioExporterEnableAdvancedOptions();
+        static void setAudioExporterEnableAdvancedOptions(bool enabled);
         static bool audioExporterUseTemporaryFile();
         static void setAudioExporterUseTemporaryFile(bool enabled);
 
     Q_SIGNALS:
         void playbackBehaviorChanged();
         void playbackTogglingActionChanged();
         void audioExporterClippingCheckEnabledChanged();
+        void audioExporterEnableAdvancedOptionsChanged();
         void audioExporterUseTemporaryFileChanged();
 
     private:
diff --git a/src/plugins/audio/internal/addon/ExportAudioAddOn.cpp b/src/plugins/audio/internal/addon/ExportAudioAddOn.cpp
@@ -94,6 +94,8 @@ namespace Audio::Internal {
     }
 
     ExportAudioAddOn::ExportAudioAddOn(QObject *parent) : WindowInterfaceAddOn(parent) {
+        m_simpleConfig.setFormatQuality(100);
+        m_simpleConfig.setFormatSampleRate(48000);
     }
 
     ExportAudioAddOn::~ExportAudioAddOn() = default;
@@ -141,6 +143,17 @@ namespace Audio::Internal {
         emit currentParameterChanged();
     }
 
+    AudioExporterConfig ExportAudioAddOn::simpleConfig() const {
+        return m_simpleConfig;
+    }
+
+    void ExportAudioAddOn::setSimpleConfig(const AudioExporterConfig &config) {
+        if (m_simpleConfig == config)
+            return;
+        m_simpleConfig = config;
+        emit simpleConfigChanged();
+    }
+
     void ExportAudioAddOn::exportAudio() {
         auto windowInterface = windowHandle()->cast<Core::ProjectWindowInterface>();
         if (!windowInterface || !windowInterface->window())
@@ -163,15 +176,16 @@ namespace Audio::Internal {
         m_currentParameter.setRangeStart(0);
         m_currentParameter.setRangeLength(timeRangeAllEnd);
 
-        connect(AudioExporterPresets::instance(), &AudioExporterPresets::currentConfigChanged, &exporter, [&exporter] {
-            exporter.setConfig(AudioExporterPresets::instance()->currentConfig());
-        });
         connect(this, &ExportAudioAddOn::currentParameterChanged, &exporter, [this, &exporter] {
             exporter.setParameter(currentParameter());
         });
-        exporter.setConfig(AudioExporterPresets::instance()->currentConfig());
         exporter.setParameter(currentParameter());
 
+        if (m_simpleConfig.fileName().isEmpty() || m_simpleConfig.fileDirectory().isEmpty()) {
+            m_simpleConfig.setFileDirectory(AudioExporterPrivate::of(&exporter)->projectDirectory());
+            m_simpleConfig.setFileName(AudioExporterPrivate::of(&exporter)->projectName() + ".wav");
+        }
+
         QQmlComponent component(Core::RuntimeInterface::qmlEngine(), "DiffScope.Audio", "AudioExportDialog");
         if (component.isError()) {
             qFatal() << component.errorString();
@@ -230,6 +244,34 @@ namespace Audio::Internal {
         presets->setCurrentConfig(config);
     }
 
+    void ExportAudioAddOn::browseFileSimple() {
+        auto windowInterface = windowHandle()->cast<Core::ProjectWindowInterface>();
+        auto config = m_simpleConfig;
+        const QStringList filters = {
+            tr("WAV (*.wav)"),
+            tr("Ogg Vorbis (*.ogg)"),
+        };
+        QString selectedFilter = filters.at(config.fileType() == AudioExporterConfig::FT_Wav ? 0 : 1);
+        const auto path = QFileDialog::getSaveFileName(
+            nullptr,
+            {},
+            calculateSimplePath(config),
+            filters.join(QStringLiteral(";;")),
+            &selectedFilter
+        );
+        if (path.isEmpty()) {
+            return;
+        }
+        const QFileInfo fileInfo(path);
+        const auto templateSuffix = config.mixingOption() == AudioExporterConfig::MO_Mixed
+            ? QStringLiteral(".")
+            : QStringLiteral("_${trackIndex}_${trackName}.");
+        config.setFileName(fileInfo.completeBaseName() + templateSuffix + fileInfo.suffix());
+        config.setFileDirectory(fileInfo.dir().canonicalPath());
+        applyFileType(config, filters.indexOf(selectedFilter) == 0 ? AudioExporterConfig::FT_Wav : AudioExporterConfig::FT_OggVorbis);
+        setSimpleConfig(config);
+    }
+
     void ExportAudioAddOn::setMixingOption(int index) {
         auto presets = AudioExporterPresets::instance();
         auto config = presets->currentConfig();
@@ -260,6 +302,34 @@ namespace Audio::Internal {
         presets->setCurrentConfig(config);
     }
 
+    void ExportAudioAddOn::setMixingOptionSimple(int index) {
+        auto config = m_simpleConfig;
+        config.setMixingOption(static_cast<AudioExporterConfig::MixingOption>(index));
+
+        const QFileInfo fileInfo(config.fileName());
+        auto basename = fileInfo.completeBaseName();
+        auto suffix = fileInfo.suffix();
+        if (index == AudioExporterConfig::MO_Mixed) {
+            if (basename.endsWith(QStringLiteral("_${trackIndex}_${trackName}"))) {
+                basename = basename.chopped(27);
+            }
+        } else if (!basename.contains(QStringLiteral("${trackIndex}")) &&
+                   !basename.contains(QStringLiteral("${trackName}"))) {
+            basename += QStringLiteral("_${trackIndex}_${trackName}");
+                   }
+        if (suffix.isEmpty()) {
+            suffix = AudioExporterConfig::extensionOfType(config.fileType());
+        }
+        config.setFileName(basename + QStringLiteral(".") + suffix);
+        setSimpleConfig(config);
+    }
+
+    void ExportAudioAddOn::setFileTypeSimple(int index) {
+        auto config = m_simpleConfig;
+        applyFileType(config, index);
+        setSimpleConfig(config);
+    }
+
     double ExportAudioAddOn::calculateDurationInMsec(AudioExporter *exporter) const {
         auto windowInterface = windowHandle()->cast<Core::ProjectWindowInterface>();
 
@@ -269,6 +339,19 @@ namespace Audio::Internal {
         return musicTimeline->create(0, 0, range.second).millisecond() - musicTimeline->create(0, 0, range.first).millisecond();
     }
 
+    QString ExportAudioAddOn::calculateSimplePath(const AudioExporterConfig &config) {
+        auto fileName = config.fileName();
+        if (config.mixingOption() == AudioExporterConfig::MO_Mixed) {
+            return QDir::toNativeSeparators(QDir(config.fileDirectory()).absoluteFilePath(fileName));
+        } else {
+            QFileInfo info(fileName);
+            auto baseName = info.completeBaseName();
+            Q_ASSERT(baseName.endsWith(QStringLiteral("_${trackIndex}_${trackName}")));
+            baseName = baseName.chopped(27);
+            return QDir::toNativeSeparators(QDir(config.fileDirectory()).absoluteFilePath(baseName + QStringLiteral(".") + info.suffix()));
+        }
+    }
+
     void ExportAudioAddOn::appendFileNameTemplate(const QString &templateString) {
         auto config = AudioExporterPresets::instance()->currentConfig();
         QFileInfo info(config.fileName());
diff --git a/src/plugins/audio/internal/addon/ExportAudioAddOn.h b/src/plugins/audio/internal/addon/ExportAudioAddOn.h
@@ -69,6 +69,7 @@ namespace Audio::Internal {
         QML_ELEMENT
         QML_UNCREATABLE("")
         Q_PROPERTY(Audio::AudioExporterParameter currentParameter READ currentParameter WRITE setCurrentParameter NOTIFY currentParameterChanged)
+        Q_PROPERTY(Audio::AudioExporterConfig simpleConfig READ simpleConfig WRITE setSimpleConfig NOTIFY simpleConfigChanged)
     public:
         explicit ExportAudioAddOn(QObject *parent = nullptr);
         ~ExportAudioAddOn() override;
@@ -82,22 +83,32 @@ namespace Audio::Internal {
         AudioExporterParameter currentParameter() const;
         void setCurrentParameter(const AudioExporterParameter &parameter);
 
+        AudioExporterConfig simpleConfig() const;
+        void setSimpleConfig(const AudioExporterConfig &config);
+
         Q_INVOKABLE void exportAudio();
         Q_INVOKABLE void browseFile();
+        Q_INVOKABLE void browseFileSimple();
         Q_INVOKABLE bool runExport(AudioExporter *exporter);
 
         Q_INVOKABLE static QStringList formatOptions(int fileType) ;
         Q_INVOKABLE static void setMixingOption(int index);
         Q_INVOKABLE static void setFileType(int index);
+        Q_INVOKABLE void setMixingOptionSimple(int index);
+        Q_INVOKABLE void setFileTypeSimple(int index);
         Q_INVOKABLE static void appendFileNameTemplate(const QString &templateString);
 
         Q_INVOKABLE double calculateDurationInMsec(AudioExporter *exporter) const;
 
+        Q_INVOKABLE static QString calculateSimplePath(const AudioExporterConfig &config);
+
     Q_SIGNALS:
         void currentParameterChanged();
+        void simpleConfigChanged();
 
     private:
         AudioExporterParameter m_currentParameter;
+        AudioExporterConfig m_simpleConfig;
         Core::NotificationMessage *m_exportCompletedMessage{};
     };
 
diff --git a/src/plugins/audio/qml/dialogs/AudioExportDialog.qml b/src/plugins/audio/qml/dialogs/AudioExportDialog.qml
