Please see ChangeLog

2 files changed, 16 insertions, 32 deletions

diff --git a/muse2/muse/widgets/genset.cpp b/muse2/muse/widgets/genset.cpp
index 68405f9b..4a0550bb 100644
--- a/muse2/muse/widgets/genset.cpp
+++ b/muse2/muse/widgets/genset.cpp
@@ -83,7 +83,15 @@ GlobalSettingsConfig::GlobalSettingsConfig(QWidget* parent)
       
       //DummyAudioDevice* dad = dynamic_cast<DummyAudioDevice*>(audioDevice);
       //dummyAudioRealRate->setText(dad ? QString().setNum(sampleRate) : "---");
-      dummyAudioRealRate->setText(QString().setNum(sampleRate));
+      //dummyAudioRealRate->setText(QString().setNum(sampleRate));  // Not used any more. p4.0.20 
+      // Just a record of what the gensetbase.ui file contained for dummyAudioRate whats this:
+      /*  <property name="whatsThis">
+             <string>Actual rate used depends on limitations of
+ timer used. If a high rate timer is available,
+ short periods can be used with high sample rates. 
+Period affects midi playback resolution. 
+Shorter periods are desirable.</string>
+            </property>                       */
       
       startSongEntry->setText(config.startSong);
       startSongGroup->button(config.startMode)->setChecked(true);
@@ -188,7 +196,7 @@ void GlobalSettingsConfig::updateSettings()
       
       //DummyAudioDevice* dad = dynamic_cast<DummyAudioDevice*>(audioDevice);
       //dummyAudioRealRate->setText(dad ? QString().setNum(sampleRate) : "---");
-      dummyAudioRealRate->setText(QString().setNum(sampleRate));
+      //dummyAudioRealRate->setText(QString().setNum(sampleRate));   // Not used any more. p4.0.20 
       
       startSongEntry->setText(config.startSong);
       startSongGroup->button(config.startMode)->setChecked(true);
diff --git a/muse2/muse/widgets/gensetbase.ui b/muse2/muse/widgets/gensetbase.ui
index cdbaea2c..e452de8b 100644
--- a/muse2/muse/widgets/gensetbase.ui
+++ b/muse2/muse/widgets/gensetbase.ui
@@ -23,7 +23,7 @@
       </sizepolicy>
      </property>
      <property name="currentIndex">
-      <number>2</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="TabPage">
       <attribute name="title">
@@ -774,7 +774,7 @@
           <item row="0" column="0">
            <widget class="QLabel" name="dummyAudioRateLabel">
             <property name="text">
-             <string>Preferred sample rate</string>
+             <string>Sample rate</string>
             </property>
             <property name="wordWrap">
              <bool>false</bool>
@@ -783,13 +783,6 @@
           </item>
           <item row="0" column="1">
            <widget class="QSpinBox" name="dummyAudioRate">
-            <property name="whatsThis">
-             <string>Actual rate used depends on limitations of
- timer used. If a high rate timer is available,
- short periods can be used with high sample rates. 
-Period affects midi playback resolution. 
-Shorter periods are desirable.</string>
-            </property>
             <property name="suffix">
              <string>Hz</string>
             </property>
@@ -808,26 +801,6 @@ Shorter periods are desirable.</string>
            </widget>
           </item>
           <item row="1" column="0">
-           <widget class="QLabel" name="dummyAudioRealRateLabel">
-            <property name="text">
-             <string>Actual rate used now (dummy or not):</string>
-            </property>
-            <property name="wordWrap">
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QLabel" name="dummyAudioRealRate">
-            <property name="text">
-             <string>---</string>
-            </property>
-            <property name="wordWrap">
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0">
            <widget class="QLabel" name="dummyAudioSizeLabel">
             <property name="text">
              <string>Period size (Frames per period):</string>
@@ -837,8 +810,11 @@ Shorter periods are desirable.</string>
             </property>
            </widget>
           </item>
-          <item row="2" column="1">
+          <item row="1" column="1">
            <widget class="QComboBox" name="dummyAudioSize">
+             <property name="toolTip">
+               <string>Shorter periods give better midi playback resolution.</string>
+             </property>
             <item>
              <property name="text">
               <string>16</string>