follow up for fix #50926: fix bitrates for MP3 (MPEG-1)

as documented in http://lame.cvs.sourceforge.net/viewvc/lame/lame/USAGE Also fixed a 'brown paper bag' copy/paste error and a typo
musescore · Feb 17, 2017 · 5b4f256 · 5b4f256
1 parent 0d1bd52
commit 5b4f256
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/mscore/preferences.cpp b/mscore/preferences.cpp
@@ -607,21 +607,20 @@ PreferenceDialog::PreferenceDialog(QWidget* parent)
 #endif
 
       exportAudioSampleRate->clear();
+      exportAudioSampleRate->addItem(tr("32000"), 32000);
       exportAudioSampleRate->addItem(tr("44100"), 44100); // default
       exportAudioSampleRate->addItem(tr("48000"), 48000);
 
 #ifndef USE_LAME
       exportMp3BitRateLabel->setVisible(false);
       exportMp3BitRate->setVisible(false);
-      exporMp3BitRateUnit->setVisible(false)
+      exportMp3BitRateUnit->setVisible(false)
 #else
       exportMp3BitRate->clear();
-      exportMp3BitRate->addItem(  tr("8"),   8);
-      exportMp3BitRate->addItem( tr("16"),  16);
       exportMp3BitRate->addItem( tr("32"),  32);
       exportMp3BitRate->addItem( tr("40"),  40);
       exportMp3BitRate->addItem( tr("48"),  48);
-      //exportMp3BitRate->addItem( tr("56"),  56);
+      exportMp3BitRate->addItem( tr("56"),  56);
       exportMp3BitRate->addItem( tr("64"),  64);
       exportMp3BitRate->addItem( tr("80"),  80);
       exportMp3BitRate->addItem( tr("96"),  96);

diff --git a/mscore/prefsdialog.ui b/mscore/prefsdialog.ui
@@ -3645,8 +3645,13 @@
              <string>Choose sample rate</string>
             </property>
             <property name="currentIndex">
-             <number>0</number>
+             <number>1</number>
             </property>
+            <item>
+             <property name="text">
+              <string notr="true">32000</string>
+             </property>
+            </item>
             <item>
              <property name="text">
               <string notr="true">44100</string>
@@ -3667,7 +3672,7 @@
            </widget>
           </item>
           <item row="1" column="3">
-           <widget class="QLabel" name="exporMp3BitRateUnit">
+           <widget class="QLabel" name="exportMp3BitRateUnit">
             <property name="text">
              <string>kBit/s</string>
             </property>