Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix GH#17659: OGG export always at 48000 Hz #17694

Merged
merged 1 commit into from Jun 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions src/project/project.qrc
Expand Up @@ -20,6 +20,7 @@
<file>qml/MuseScore/Project/internal/Export/PngSettingsPage.qml</file>
<file>qml/MuseScore/Project/internal/Export/SvgSettingsPage.qml</file>
<file>qml/MuseScore/Project/internal/Export/Mp3SettingsPage.qml</file>
<file>qml/MuseScore/Project/internal/Export/OggSettingsPage.qml</file>
<file>qml/MuseScore/Project/internal/Export/AudioSettingsPage.qml</file>
<file>qml/MuseScore/Project/internal/Export/MidiSettingsPage.qml</file>
<file>qml/MuseScore/Project/internal/Export/MusicXmlSettingsPage.qml</file>
Expand Down
Expand Up @@ -30,9 +30,11 @@ ExportSettingsPage {
id: root

property bool showBitRateControl: false
property bool showSampleRateControl: true

ExportOptionItem {
id: sampleRateLabel
visible: root.showSampleRateControl
text: qsTrc("project/export", "Sample rate:")

StyledDropdown {
Expand Down
Jojo-Schmitz marked this conversation as resolved.
Show resolved Hide resolved
@@ -0,0 +1,26 @@
/*
* SPDX-License-Identifier: GPL-3.0-only
* MuseScore-CLA-applies
*
* MuseScore
* Music Composition & Notation
*
* Copyright (C) 2021 MuseScore BVBA and others
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 3 as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.15

AudioSettingsPage {
showSampleRateControl: false
}
2 changes: 1 addition & 1 deletion src/project/view/exportdialogmodel.cpp
Expand Up @@ -82,7 +82,7 @@ ExportDialogModel::ExportDialogModel(QObject* parent)
ExportType::makeWithSuffixes({ "ogg" },
qtrc("project/export", "OGG audio"),
qtrc("project/export", "OGG audio files"),
"AudioSettingsPage.qml"),
"OggSettingsPage.qml"),
ExportType::makeWithSuffixes({ "flac" },
qtrc("project/export", "FLAC audio"),
qtrc("project/export", "FLAC audio files"),
Expand Down