Implement UI for toggling sample format

bakajikara · bakajikara · commit 702a85a46414 · 2025-11-24T10:37:46.000+09:00
diff --git a/src/importexport/audioexport/iaudioexportconfiguration.h b/src/importexport/audioexport/iaudioexportconfiguration.h
@@ -46,6 +46,13 @@ class IAudioExportConfiguration : MODULE_EXPORT_INTERFACE
     virtual const std::vector<int>& availableSampleRates() const = 0;
 
     virtual muse::audio::samples_t exportBufferSize() const = 0;
+
+    virtual muse::audio::AudioSampleFormat exportSampleFormat() const = 0;
+    virtual void setExportSampleFormat(muse::audio::AudioSampleFormat format) = 0;
+    virtual void setExportSampleFormat(const QString& extension, muse::audio::AudioSampleFormat format) = 0;
+    virtual const std::vector<muse::audio::AudioSampleFormat>& availableSampleFormats(const QString& extension) const = 0;
+    virtual QString sampleFormatToString(muse::audio::AudioSampleFormat format) const = 0;
+    virtual void loadSampleFormatSetting(const QString& extension) = 0;
 };
 }
 
diff --git a/src/importexport/audioexport/internal/audioexportconfiguration.cpp b/src/importexport/audioexport/internal/audioexportconfiguration.cpp
@@ -23,6 +23,7 @@
 #include "audioexportconfiguration.h"
 
 #include "settings.h"
+#include "translation.h"
 
 using namespace muse;
 using namespace mu;
@@ -31,11 +32,15 @@ using namespace muse::audio;
 
 static const Settings::Key EXPORT_SAMPLE_RATE_KEY("iex_audioexport", "export/audio/sampleRate");
 static const Settings::Key EXPORT_MP3_BITRATE("iex_audioexport", "export/audio/mp3Bitrate");
+static const Settings::Key EXPORT_WAV_SAMPLE_FORMAT_KEY("iex_audioexport", "export/audio/wavSampleFormat");
+static const Settings::Key EXPORT_FLAC_SAMPLE_FORMAT_KEY("iex_audioexport", "export/audio/flacSampleFormat");
 
 void AudioExportConfiguration::init()
 {
     settings()->setDefaultValue(EXPORT_SAMPLE_RATE_KEY, Val(44100));
     settings()->setDefaultValue(EXPORT_MP3_BITRATE, Val(128));
+    settings()->setDefaultValue(EXPORT_WAV_SAMPLE_FORMAT_KEY, Val(static_cast<int>(AudioSampleFormat::Float32)));
+    settings()->setDefaultValue(EXPORT_FLAC_SAMPLE_FORMAT_KEY, Val(static_cast<int>(AudioSampleFormat::Int16)));
 }
 
 int AudioExportConfiguration::exportMp3Bitrate() const
@@ -79,3 +84,67 @@ samples_t AudioExportConfiguration::exportBufferSize() const
 {
     return 4096;
 }
+
+AudioSampleFormat AudioExportConfiguration::exportSampleFormat() const
+{
+    return m_exportSampleFormat;
+}
+
+void AudioExportConfiguration::setExportSampleFormat(AudioSampleFormat format)
+{
+    m_exportSampleFormat = format;
+}
+
+void AudioExportConfiguration::setExportSampleFormat(const QString& extension, AudioSampleFormat format)
+{
+    m_exportSampleFormat = format;
+    if (extension == QLatin1String("wav")) {
+        settings()->setSharedValue(EXPORT_WAV_SAMPLE_FORMAT_KEY, Val(static_cast<int>(format)));
+    } else if (extension == QLatin1String("flac")) {
+        settings()->setSharedValue(EXPORT_FLAC_SAMPLE_FORMAT_KEY, Val(static_cast<int>(format)));
+    }
+}
+
+const std::vector<AudioSampleFormat>& AudioExportConfiguration::availableSampleFormats(const QString& extension) const
+{
+    if (extension == QLatin1String("wav")) {
+        static const std::vector<muse::audio::AudioSampleFormat> wavSampleFormats {
+            AudioSampleFormat::Int16,
+            AudioSampleFormat::Int24,
+            AudioSampleFormat::Float32,
+        };
+        return wavSampleFormats;
+    }
+    if (extension == QLatin1String("flac")) {
+        static const std::vector<muse::audio::AudioSampleFormat> flacSampleFormats {
+            AudioSampleFormat::Int16,
+            AudioSampleFormat::Int24,
+        };
+        return flacSampleFormats;
+    }
+    static const std::vector<muse::audio::AudioSampleFormat> emptySampleFormats {};
+    return emptySampleFormats;
+}
+
+void AudioExportConfiguration::loadSampleFormatSetting(const QString& extension)
+{
+    if (extension == QLatin1String("wav")) {
+        setExportSampleFormat(static_cast<AudioSampleFormat>(settings()->value(EXPORT_WAV_SAMPLE_FORMAT_KEY).toInt()));
+    } else if (extension == QLatin1String("flac")) {
+        setExportSampleFormat(static_cast<AudioSampleFormat>(settings()->value(EXPORT_FLAC_SAMPLE_FORMAT_KEY).toInt()));
+    }
+}
+
+QString AudioExportConfiguration::sampleFormatToString(AudioSampleFormat format) const
+{
+    switch (format) {
+    case AudioSampleFormat::Int16:
+        return muse::qtrc("project/export", "16-bit integer");
+    case AudioSampleFormat::Int24:
+        return muse::qtrc("project/export", "24-bit integer");
+    case AudioSampleFormat::Float32:
+        return muse::qtrc("project/export", "32-bit float");
+    default:
+        return QString();
+    }
+}
diff --git a/src/importexport/audioexport/internal/audioexportconfiguration.h b/src/importexport/audioexport/internal/audioexportconfiguration.h
@@ -41,8 +41,16 @@ class AudioExportConfiguration : public IAudioExportConfiguration
 
     muse::audio::samples_t exportBufferSize() const override;
 
+    muse::audio::AudioSampleFormat exportSampleFormat() const override;
+    void setExportSampleFormat(muse::audio::AudioSampleFormat format) override;
+    void setExportSampleFormat(const QString& extension, muse::audio::AudioSampleFormat format) override;
+    const std::vector<muse::audio::AudioSampleFormat>& availableSampleFormats(const QString& extension) const override;
+    QString sampleFormatToString(muse::audio::AudioSampleFormat format) const override;
+    void loadSampleFormatSetting(const QString& extension) override;
+
 private:
     std::optional<int> m_exportMp3BitrateOverride = std::nullopt;
+    muse::audio::AudioSampleFormat m_exportSampleFormat;
 };
 }
 
diff --git a/src/importexport/audioexport/internal/flacwriter.cpp b/src/importexport/audioexport/internal/flacwriter.cpp
@@ -37,7 +37,7 @@ muse::Ret FlacWriter::write(notation::INotationPtr notation, muse::io::IODevice&
             configuration()->exportBufferSize(),
             2 /* audioChannelsNumber */
         },
-        AudioSampleFormat::Int16,
+        configuration()->exportSampleFormat(),
         0 /* bitRate */
     };
 
diff --git a/src/importexport/audioexport/internal/wavewriter.cpp b/src/importexport/audioexport/internal/wavewriter.cpp
@@ -37,7 +37,7 @@ Ret WaveWriter::write(notation::INotationPtr notation, io::IODevice& destination
             configuration()->exportBufferSize(),
             2 /* audioChannelsNumber */
         },
-        AudioSampleFormat::Float32,
+        configuration()->exportSampleFormat(),
         0 /* bitRate */
     };
 
diff --git a/src/project/qml/MuseScore/Project/internal/Export/AudioSettingsPage.qml b/src/project/qml/MuseScore/Project/internal/Export/AudioSettingsPage.qml
@@ -82,6 +82,29 @@ ExportSettingsPage {
         }
     }
 
+    ExportOptionItem {
+        id: sampleFormatLabel
+        visible: model.availableSampleFormats.length > 0
+        text: qsTrc("project/export", "Sample format:")
+
+        StyledDropdown {
+            Layout.preferredWidth: 126
+
+            navigation.name: "SampleFormatsDropdown"
+            navigation.panel: root.navigationPanel
+            navigation.row: root.navigationOrder + 3
+            navigation.accessible.name: sampleFormatLabel.text + " " + currentText
+
+            model: root.model.availableSampleFormats
+
+            currentIndex: indexOfValue(root.model.selectedSampleFormat)
+
+            onActivated: function(index, value) {
+                root.model.selectedSampleFormat = value
+            }
+        }
+    }
+
     StyledTextLabel {
         width: parent.width
         text: qsTrc("project/export", "Each selected part will be exported as a separate audio file.")
diff --git a/src/project/view/exportdialogmodel.cpp b/src/project/view/exportdialogmodel.cpp
@@ -266,7 +266,11 @@ void ExportDialogModel::setExportType(const ExportType& type)
 
     m_selectedExportType = type;
 
+    audioExportConfiguration()->loadSampleFormatSetting(type.suffixes[0]);
+
     emit selectedExportTypeChanged(type.toMap());
+    emit availableSampleFormatsChanged();
+    emit selectedSampleFormatChanged();
 
     std::vector<UnitType> unitTypes = exportProjectScenario()->supportedUnitTypes(type);
 
@@ -728,3 +732,32 @@ void ExportDialogModel::updateExportInfo()
 
     exportProjectScenario()->setExportInfo(info);
 }
+
+QVariantList ExportDialogModel::availableSampleFormats() const
+{
+    const auto& formats = audioExportConfiguration()->availableSampleFormats(m_selectedExportType.suffixes[0]);
+    QVariantList result;
+    for (const auto& format : formats) {
+        QVariantMap obj;
+        obj["text"] = audioExportConfiguration()->sampleFormatToString(format);
+        obj["value"] = static_cast<int>(format);
+        result << obj;
+    }
+    return result;
+}
+
+int ExportDialogModel::selectedSampleFormat() const
+{
+    return static_cast<int>(audioExportConfiguration()->exportSampleFormat());
+}
+
+void ExportDialogModel::setSelectedSampleFormat(int format)
+{
+    const auto audioFormat = static_cast<muse::audio::AudioSampleFormat>(format);
+    if (audioFormat == audioExportConfiguration()->exportSampleFormat()) {
+        return;
+    }
+
+    audioExportConfiguration()->setExportSampleFormat(m_selectedExportType.suffixes[0], audioFormat);
+    emit selectedSampleFormatChanged();
+}
diff --git a/src/project/view/exportdialogmodel.h b/src/project/view/exportdialogmodel.h
@@ -83,6 +83,8 @@ class ExportDialogModel : public QAbstractListModel, public muse::async::Asyncab
 
     Q_PROPERTY(int sampleRate READ sampleRate WRITE setSampleRate NOTIFY sampleRateChanged)
     Q_PROPERTY(int bitRate READ bitRate WRITE setBitRate NOTIFY bitRateChanged)
+    Q_PROPERTY(QVariantList availableSampleFormats READ availableSampleFormats NOTIFY availableSampleFormatsChanged)
+    Q_PROPERTY(int selectedSampleFormat READ selectedSampleFormat WRITE setSelectedSampleFormat NOTIFY selectedSampleFormatChanged)
 
     Q_PROPERTY(bool midiExpandRepeats READ midiExpandRepeats WRITE setMidiExpandRepeats NOTIFY midiExpandRepeatsChanged)
     Q_PROPERTY(bool midiExportRpns READ midiExportRpns WRITE setMidiExportRpns NOTIFY midiExportRpnsChanged)
@@ -154,6 +156,10 @@ class ExportDialogModel : public QAbstractListModel, public muse::async::Asyncab
     int bitRate() const;
     void setBitRate(int bitRate);
 
+    QVariantList availableSampleFormats() const;
+    int selectedSampleFormat() const;
+    void setSelectedSampleFormat(int format);
+
     bool midiExpandRepeats() const;
     void setMidiExpandRepeats(bool expandRepeats);
 
@@ -204,6 +210,8 @@ class ExportDialogModel : public QAbstractListModel, public muse::async::Asyncab
     void sampleRateChanged(int sampleRate);
     void availableBitRatesChanged();
     void bitRateChanged(int bitRate);
+    void availableSampleFormatsChanged();
+    void selectedSampleFormatChanged();
 
     void midiExpandRepeatsChanged(bool expandRepeats);
     void midiExportRpnsChanged(bool exportRpns);
