metronome work

3 files changed, 674 insertions, 424 deletions

diff --git a/muse2/muse/widgets/metronome.cpp b/muse2/muse/widgets/metronome.cpp
index 416e9e47..a31d5a31 100644
--- a/muse2/muse/widgets/metronome.cpp
+++ b/muse2/muse/widgets/metronome.cpp
@@ -40,13 +40,36 @@ MetronomeConfig::MetronomeConfig(QDialog* parent)
    : QDialog(parent)
       {
       setupUi(this);
+
+      volumeSlider->setValue(MusEGlobal::audioClickVolume*100);
+      measVolumeSlider->setValue(MusEGlobal::measClickVolume*100);
+      beatVolumeSlider->setValue(MusEGlobal::beatClickVolume*100);
+      accent1VolumeSlider->setValue(MusEGlobal::accent1ClickVolume*100);
+      accent2VolumeSlider->setValue(MusEGlobal::accent2ClickVolume*100);
+      if (MusEGlobal::clickSamples == MusEGlobal::origSamples)
+          radioSamples2->setChecked(true);
+      else
+          radioSamples4->setChecked(true);
+      switchSamples(); // to disable gui elements
+
+      volumeLabel->setText(QString::number(int(MusEGlobal::audioClickVolume*100)));
+      measVolumeLabel->setText(QString::number(int(MusEGlobal::measClickVolume*100)));
+      beatVolumeLabel->setText(QString::number(int(MusEGlobal::beatClickVolume*100)));
+      accent1VolumeLabel->setText(QString::number(int(MusEGlobal::accent1ClickVolume*100)));
+      accent2VolumeLabel->setText(QString::number(int(MusEGlobal::accent2ClickVolume*100)));
+
       connect(buttonApply, SIGNAL(clicked()), SLOT(apply()));
       connect(midiClick, SIGNAL(toggled(bool)), SLOT(midiClickChanged(bool)));
       connect(precountEnable, SIGNAL(toggled(bool)), SLOT(precountEnableChanged(bool)));
       connect(precountFromMastertrack, SIGNAL(toggled(bool)),
          SLOT(precountFromMastertrackChanged(bool)));
       connect(audioBeepRoutesButton, SIGNAL(clicked()), SLOT(audioBeepRoutesClicked()));
-      connect(volumeSlider, SIGNAL(valueChanged(int)), SLOT(beepVolumeChanged(int)));
+      connect(volumeSlider, SIGNAL(valueChanged(int)), SLOT(volumeChanged(int)));
+      connect(measVolumeSlider, SIGNAL(valueChanged(int)), SLOT(measVolumeChanged(int)));
+      connect(beatVolumeSlider, SIGNAL(valueChanged(int)), SLOT(beatVolumeChanged(int)));
+      connect(accent1VolumeSlider, SIGNAL(valueChanged(int)), SLOT(accent1VolumeChanged(int)));
+      connect(accent2VolumeSlider, SIGNAL(valueChanged(int)), SLOT(accent2VolumeChanged(int)));
+      connect(radioSamples2, SIGNAL(toggled(bool)),SLOT(switchSamples()));
 
       measureNote->setValue(MusEGlobal::measureClickNote);
       measureVelocity->setValue(MusEGlobal::measureClickVelo);
@@ -55,15 +78,15 @@ MetronomeConfig::MetronomeConfig(QDialog* parent)
       midiChannel->setValue(MusEGlobal::clickChan+1);
       midiPort->setValue(MusEGlobal::clickPort+1);
 
-      /*
+
       precountBars->setValue(MusEGlobal::preMeasures);
-      precountEnable->setChecked(precountEnableFlag);
-      precountFromMastertrack->setChecked(precountFromMastertrackFlag);
-      precountSigZ->setValue(::precountSigZ);
-      precountSigN->setValue(::precountSigN);
-      precountPrerecord->setChecked(::precountPrerecord);
-      precountPreroll->setChecked(::precountPreroll);
-      */
+      precountEnable->setChecked(MusEGlobal::precountEnableFlag);
+      precountFromMastertrack->setChecked(MusEGlobal::precountFromMastertrackFlag);
+      precountSigZ->setValue(MusEGlobal::precountSigZ);
+      precountSigN->setValue(MusEGlobal::precountSigN);
+      precountPrerecord->setChecked(MusEGlobal::precountPrerecord);
+      precountPreroll->setChecked(MusEGlobal::precountPreroll);
+
 
       midiClick->setChecked(MusEGlobal::midiClickFlag);
       audioBeep->setChecked(MusEGlobal::audioClickFlag);
@@ -139,14 +162,14 @@ void MetronomeConfig::apply()
       MusEGlobal::clickChan          = midiChannel->value() - 1;
       MusEGlobal::clickPort          = midiPort->value() - 1;
       MusEGlobal::preMeasures        = precountBars->value();
-      /*
-      precountEnableFlag = precountEnable->isChecked();
-      precountFromMastertrackFlag = precountFromMastertrack->isChecked();
-      ::precountSigZ     = precountSigZ->value();
-      ::precountSigN     = precountSigN->value();
-      ::precountPrerecord = precountPrerecord->isChecked();
-      ::precountPreroll  = precountPreroll->isChecked();
-      */
+
+      MusEGlobal::precountEnableFlag = precountEnable->isChecked();
+      MusEGlobal::precountFromMastertrackFlag = precountFromMastertrack->isChecked();
+      MusEGlobal::precountSigZ     = precountSigZ->value();
+      MusEGlobal::precountSigN     = precountSigN->value();
+      MusEGlobal::precountPrerecord = precountPrerecord->isChecked();
+      MusEGlobal::precountPreroll  = precountPreroll->isChecked();
+
       MusEGlobal::midiClickFlag      = midiClick->isChecked();
       MusEGlobal::audioClickFlag     = audioBeep->isChecked();
       //audioVolumeChanged = volumeSlider->value();
@@ -175,29 +198,57 @@ void MetronomeConfig::midiClickChanged(bool flag)
       midiPort->setEnabled(flag);
       }
 
-void MetronomeConfig::precountEnableChanged(bool /*flag*/)
+void MetronomeConfig::precountEnableChanged(bool flag)
       {
-      /*
       precountBars->setEnabled(flag);
       precountFromMastertrack->setEnabled(flag);
       precountSigZ->setEnabled(flag && !precountFromMastertrack->isChecked());
       precountSigN->setEnabled(flag && !precountFromMastertrack->isChecked());
-      */
+
       }
 
-void MetronomeConfig::precountFromMastertrackChanged(bool /*flag*/)
+void MetronomeConfig::precountFromMastertrackChanged(bool flag)
       {
-    /*
+
       precountSigZ->setEnabled(!flag);
       precountSigN->setEnabled(!flag);
-      */
+
       }
 
-void MetronomeConfig::beepVolumeChanged(int volume)
-      {
-      // this value is directly applied, not using th Apply button, it just seems more usable this way.
+// these values are directly applied, not using th Apply button, it just seems more usable this way.
+void MetronomeConfig::volumeChanged(int volume) {
       MusEGlobal::audioClickVolume=volume/100.0;
-      }
+      volumeLabel->setText(QString::number(int(MusEGlobal::audioClickVolume*100)));
+}
+void MetronomeConfig::measVolumeChanged(int volume) {
+      MusEGlobal::measClickVolume=volume/100.0;
+      measVolumeLabel->setText(QString::number(int(MusEGlobal::measClickVolume*100)));
+}
+void MetronomeConfig::beatVolumeChanged(int volume) {
+      MusEGlobal::beatClickVolume=volume/100.0;
+      beatVolumeLabel->setText(QString::number(int(MusEGlobal::beatClickVolume*100)));
+}
+void MetronomeConfig::accent1VolumeChanged(int volume) {
+      MusEGlobal::accent1ClickVolume=volume/100.0;
+      accent1VolumeLabel->setText(QString::number(int(MusEGlobal::accent1ClickVolume*100)));
+}
+void MetronomeConfig::accent2VolumeChanged(int volume) {
+      MusEGlobal::accent2ClickVolume=volume/100.0;
+      accent2VolumeLabel->setText(QString::number(int(MusEGlobal::accent2ClickVolume*100)));
+}
+
+void MetronomeConfig::switchSamples() {
+    if (radioSamples2->isChecked()) {
+        MusEGlobal::clickSamples = MusEGlobal::origSamples;
+        accent1VolumeSlider->setDisabled(true);
+        accent2VolumeSlider->setDisabled(true);
+    }
+    else {
+        MusEGlobal::clickSamples = MusEGlobal::newSamples;
+        accent1VolumeSlider->setDisabled(false);
+        accent2VolumeSlider->setDisabled(false);
+       }
+}
 
 } // namespace MusEGui
 
diff --git a/muse2/muse/widgets/metronome.h b/muse2/muse/widgets/metronome.h
index f93da182..b92ef71b 100644
--- a/muse2/muse/widgets/metronome.h
+++ b/muse2/muse/widgets/metronome.h
@@ -45,7 +45,12 @@ class MetronomeConfig : public QDialog, public Ui::MetronomeConfigBase {
       void midiClickChanged(bool);
       void precountEnableChanged(bool);
       void precountFromMastertrackChanged(bool);
-      void beepVolumeChanged(int);
+      void volumeChanged(int);
+      void measVolumeChanged(int);
+      void beatVolumeChanged(int);
+      void accent1VolumeChanged(int);
+      void accent2VolumeChanged(int);
+      void switchSamples();
 
    public:
       MetronomeConfig(QDialog* parent=0);
diff --git a/muse2/muse/widgets/metronomebase.ui b/muse2/muse/widgets/metronomebase.ui
index 18a2d2f6..33ee3895 100644
--- a/muse2/muse/widgets/metronomebase.ui
+++ b/muse2/muse/widgets/metronomebase.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>557</width>
-    <height>363</height>
+    <width>647</width>
+    <height>522</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -16,100 +16,48 @@
   <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
-  <layout class="QGridLayout">
-   <property name="margin">
-    <number>11</number>
-   </property>
-   <property name="spacing">
-    <number>6</number>
-   </property>
+  <layout class="QGridLayout" name="gridLayout_3">
    <item row="0" column="0">
-    <layout class="QGridLayout">
-     <item row="0" column="0">
-      <widget class="QGroupBox" name="GroupBox1">
-       <property name="title">
-        <string>Metronome</string>
-       </property>
-       <layout class="QGridLayout">
-        <property name="margin">
-         <number>11</number>
-        </property>
-        <property name="spacing">
-         <number>6</number>
-        </property>
-        <item row="0" column="0">
-         <layout class="QVBoxLayout">
+    <widget class="QGroupBox" name="GroupBox1">
+     <property name="title">
+      <string>Metronome</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_4">
+      <property name="margin">
+       <number>11</number>
+      </property>
+      <property name="spacing">
+       <number>6</number>
+      </property>
+      <item row="0" column="0">
+       <layout class="QVBoxLayout" name="qvbl_2">
+        <item>
+         <layout class="QHBoxLayout" name="qhbl_4">
           <item>
-           <layout class="QHBoxLayout">
-            <item>
-             <widget class="QCheckBox" name="audioBeep">
-              <property name="text">
-               <string>Audio Beep</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QPushButton" name="audioBeepRoutesButton">
-              <property name="text">
-               <string>Choose outputs...</string>
-              </property>
-              <property name="autoDefault">
-               <bool>true</bool>
-              </property>
-             </widget>
-            </item>
-           </layout>
+           <widget class="QCheckBox" name="audioBeep">
+            <property name="text">
+             <string>Audio Beep</string>
+            </property>
+           </widget>
           </item>
           <item>
-           <layout class="QHBoxLayout">
-            <item>
-             <widget class="QSlider" name="volumeSlider">
-              <property name="minimum">
-               <number>0</number>
-              </property>
-              <property name="maximum">
-               <number>100</number>
-              </property>
-              <property name="singleStep">
-               <number>1</number>
-              </property>
-              <property name="pageStep">
-               <number>10</number>
-              </property>
-              <property name="value">
-               <number>50</number>
-              </property>
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLabel" name="volumeLabel">
-              <property name="text">
-               <string>50</string>
-              </property>
-              <property name="wordWrap">
-               <bool>false</bool>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLabel" name="textLabel1">
-              <property name="text">
-               <string>% Audio volume</string>
-              </property>
-              <property name="wordWrap">
-               <bool>false</bool>
-              </property>
-             </widget>
-            </item>
-           </layout>
+           <widget class="QPushButton" name="audioBeepRoutesButton">
+            <property name="text">
+             <string>Choose outputs...</string>
+            </property>
+            <property name="autoDefault">
+             <bool>true</bool>
+            </property>
+           </widget>
           </item>
+         </layout>
+        </item>
+        <item>
+         <layout class="QVBoxLayout" name="verticalLayout">
           <item>
-           <widget class="QCheckBox" name="midiClick">
+           <widget class="QRadioButton" name="radioSamples2">
             <property name="text">
-             <string>MIDI Click</string>
+             <string>Two samples (old samples)</string>
             </property>
             <property name="checked">
              <bool>true</bool>
@@ -117,274 +65,236 @@
            </widget>
           </item>
           <item>
-           <layout class="QHBoxLayout">
-            <property name="spacing">
-             <number>6</number>
-            </property>
-            <property name="margin">
-             <number>0</number>
+           <widget class="QRadioButton" name="radioSamples4">
+            <property name="text">
+             <string>Four samples (new samples, with accents)</string>
             </property>
-            <item>
-             <layout class="QGridLayout">
-              <property name="margin">
-               <number>0</number>
-              </property>
-              <property name="spacing">
-               <number>6</number>
-              </property>
-              <item row="4" column="1">
-               <widget class="QLabel" name="TextLabel5">
-                <property name="text">
-                 <string>Midi Channel</string>
-                </property>
-                <property name="wordWrap">
-                 <bool>false</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="0" column="1">
-               <widget class="QLabel" name="TextLabel1">
-                <property name="text">
-                 <string>Measure Note</string>
-                </property>
-                <property name="wordWrap">
-                 <bool>false</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="0">
-               <widget class="QSpinBox" name="midiChannel">
-                <property name="minimum">
-                 <number>1</number>
-                </property>
-                <property name="maximum">
-                 <number>16</number>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="1">
-               <widget class="QLabel" name="TextLabel2">
-                <property name="text">
-                 <string>Measure Velocity</string>
-                </property>
-                <property name="wordWrap">
-                 <bool>false</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="1">
-               <widget class="QLabel" name="TextLabel4">
-                <property name="text">
-                 <string>Beat Velocity</string>
-                </property>
-                <property name="wordWrap">
-                 <bool>false</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="5" column="0">
-               <widget class="QSpinBox" name="midiPort">
-                <property name="minimum">
-                 <number>1</number>
-                </property>
-                <property name="maximum">
-                 <number>16</number>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="1">
-               <widget class="QLabel" name="TextLabel3">
-                <property name="text">
-                 <string>Beat Note</string>
-                </property>
-                <property name="wordWrap">
-                 <bool>false</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="0">
-               <widget class="QSpinBox" name="beatNote"/>
-              </item>
-              <item row="1" column="0">
-               <widget class="QSpinBox" name="measureVelocity">
-                <property name="maximum">
-                 <number>127</number>
-                </property>
-               </widget>
-              </item>
-              <item row="0" column="0">
-               <widget class="QSpinBox" name="measureNote"/>
-              </item>
-              <item row="5" column="1">
-               <widget class="QLabel" name="TextLabel6">
-                <property name="text">
-                 <string>Midi Port</string>
-                </property>
-                <property name="wordWrap">
-                 <bool>false</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="0">
-               <widget class="QSpinBox" name="beatVelocity">
-                <property name="maximum">
-                 <number>127</number>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </item>
-            <item>
-             <spacer name="Spacer10">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeType">
-               <enum>QSizePolicy::Expanding</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>20</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
+           </widget>
           </item>
          </layout>
         </item>
-       </layout>
-      </widget>
-     </item>
-     <item row="0" column="1">
-      <widget class="QGroupBox" name="GroupBox2">
-       <property name="title">
-        <string>Precount</string>
-       </property>
-       <layout class="QVBoxLayout">
-        <property name="spacing">
-         <number>6</number>
-        </property>
-        <property name="margin">
-         <number>11</number>
-        </property>
-        <item>
-         <widget class="QCheckBox" name="precountEnable">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-          <property name="text">
-           <string>enable</string>
-          </property>
-          <property name="checked">
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
         <item>
-         <layout class="QHBoxLayout">
-          <property name="spacing">
-           <number>6</number>
-          </property>
-          <property name="margin">
-           <number>0</number>
-          </property>
-          <item>
-           <widget class="QSpinBox" name="precountBars">
-            <property name="enabled">
+         <layout class="QGridLayout" name="gridLayout_x">
+          <item row="0" column="0">
+           <widget class="QLabel" name="textLabel1_6">
+            <property name="text">
+             <string>Audio volume</string>
+            </property>
+            <property name="wordWrap">
              <bool>false</bool>
             </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QSlider" name="volumeSlider">
             <property name="minimum">
+             <number>0</number>
+            </property>
+            <property name="maximum">
+             <number>100</number>
+            </property>
+            <property name="singleStep">
              <number>1</number>
             </property>
+            <property name="pageStep">
+             <number>10</number>
+            </property>
+            <property name="value">
+             <number>50</number>
+            </property>
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="2">
+           <widget class="QLabel" name="volumeLabel">
+            <property name="text">
+             <string>50</string>
+            </property>
+            <property name="wordWrap">
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0" colspan="3">
+           <spacer name="verticalSpacer_2">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeType">
+             <enum>QSizePolicy::Fixed</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>20</width>
+              <height>5</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="textLabel1_2">
+            <property name="text">
+             <string>Meas volume</string>
+            </property>
+            <property name="wordWrap">
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="QSlider" name="measVolumeSlider">
+            <property name="minimum">
+             <number>0</number>
+            </property>
             <property name="maximum">
+             <number>100</number>
+            </property>
+            <property name="singleStep">
+             <number>1</number>
+            </property>
+            <property name="pageStep">
              <number>10</number>
             </property>
             <property name="value">
-             <number>2</number>
+             <number>50</number>
+            </property>
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
             </property>
            </widget>
           </item>
-          <item>
-           <widget class="QLabel" name="TextLabel7">
+          <item row="2" column="2">
+           <widget class="QLabel" name="measVolumeLabel">
             <property name="text">
-             <string>Bars</string>
+             <string>50</string>
             </property>
             <property name="wordWrap">
              <bool>false</bool>
             </property>
            </widget>
           </item>
-         </layout>
-        </item>
-        <item>
-         <widget class="QCheckBox" name="precountFromMastertrack">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-          <property name="text">
-           <string>From Mastertrack</string>
-          </property>
-          <property name="checked">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <layout class="QHBoxLayout">
-          <property name="spacing">
-           <number>6</number>
-          </property>
-          <property name="margin">
-           <number>0</number>
-          </property>
-          <item>
-           <widget class="QSpinBox" name="precountSigZ">
-            <property name="enabled">
+          <item row="3" column="0">
+           <widget class="QLabel" name="textLabel1_3">
+            <property name="text">
+             <string>Beat volume</string>
+            </property>
+            <property name="wordWrap">
              <bool>false</bool>
             </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="QSlider" name="beatVolumeSlider">
             <property name="minimum">
+             <number>0</number>
+            </property>
+            <property name="maximum">
+             <number>100</number>
+            </property>
+            <property name="singleStep">
              <number>1</number>
             </property>
+            <property name="pageStep">
+             <number>10</number>
+            </property>
+            <property name="value">
+             <number>50</number>
+            </property>
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="2">
+           <widget class="QLabel" name="beatVolumeLabel">
+            <property name="text">
+             <string>50</string>
+            </property>
+            <property name="wordWrap">
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="0">
+           <widget class="QLabel" name="textLabel1_4">
+            <property name="text">
+             <string>Accent1 volume</string>
+            </property>
+            <property name="wordWrap">
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="1">
+           <widget class="QSlider" name="accent1VolumeSlider">
+            <property name="minimum">
+             <number>0</number>
+            </property>
             <property name="maximum">
-             <number>32</number>
+             <number>100</number>
+            </property>
+            <property name="singleStep">
+             <number>1</number>
+            </property>
+            <property name="pageStep">
+             <number>10</number>
             </property>
             <property name="value">
-             <number>4</number>
+             <number>50</number>
+            </property>
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
             </property>
            </widget>
           </item>
-          <item>
-           <widget class="QLabel" name="TextLabel8">
+          <item row="4" column="2">
+           <widget class="QLabel" name="accent1VolumeLabel">
             <property name="text">
-             <string>/</string>
+             <string>50</string>
             </property>
             <property name="wordWrap">
              <bool>false</bool>
             </property>
            </widget>
           </item>
-          <item>
-           <widget class="QSpinBox" name="precountSigN">
-            <property name="enabled">
+          <item row="5" column="0">
+           <widget class="QLabel" name="textLabel1_5">
+            <property name="text">
+             <string>Accent2 volume</string>
+            </property>
+            <property name="wordWrap">
              <bool>false</bool>
             </property>
+           </widget>
+          </item>
+          <item row="5" column="1">
+           <widget class="QSlider" name="accent2VolumeSlider">
             <property name="minimum">
-             <number>2</number>
+             <number>0</number>
             </property>
             <property name="maximum">
-             <number>64</number>
+             <number>100</number>
+            </property>
+            <property name="singleStep">
+             <number>1</number>
+            </property>
+            <property name="pageStep">
+             <number>10</number>
             </property>
             <property name="value">
-             <number>4</number>
+             <number>50</number>
+            </property>
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
             </property>
            </widget>
           </item>
-          <item>
-           <widget class="QLabel" name="TextLabel9">
+          <item row="5" column="2">
+           <widget class="QLabel" name="accent2VolumeLabel">
             <property name="text">
-             <string>Signature</string>
+             <string>50</string>
             </property>
             <property name="wordWrap">
              <bool>false</bool>
@@ -394,103 +304,403 @@
          </layout>
         </item>
         <item>
-         <widget class="QCheckBox" name="precountPrerecord">
+         <spacer name="verticalSpacer">
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>40</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="midiClick">
+          <property name="text">
+           <string>MIDI Click</string>
+          </property>
+          <property name="checked">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <layout class="QHBoxLayout" name="qhbl_1">
+          <property name="spacing">
+           <number>6</number>
+          </property>
+          <property name="margin">
+           <number>0</number>
+          </property>
+          <item>
+           <layout class="QGridLayout" name="qgr_1">
+            <property name="margin">
+             <number>0</number>
+            </property>
+            <property name="spacing">
+             <number>6</number>
+            </property>
+            <item row="4" column="1">
+             <widget class="QLabel" name="TextLabel5">
+              <property name="text">
+               <string>Midi Channel</string>
+              </property>
+              <property name="wordWrap">
+               <bool>false</bool>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="1">
+             <widget class="QLabel" name="TextLabel1">
+              <property name="text">
+               <string>Measure Note</string>
+              </property>
+              <property name="wordWrap">
+               <bool>false</bool>
+              </property>
+             </widget>
+            </item>
+            <item row="4" column="0">
+             <widget class="QSpinBox" name="midiChannel">
+              <property name="minimum">
+               <number>1</number>
+              </property>
+              <property name="maximum">
+               <number>16</number>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="1">
+             <widget class="QLabel" name="TextLabel2">
+              <property name="text">
+               <string>Measure Velocity</string>
+              </property>
+              <property name="wordWrap">
+               <bool>false</bool>
+              </property>
+             </widget>
+            </item>
+            <item row="3" column="1">
+             <widget class="QLabel" name="TextLabel4">
+              <property name="text">
+               <string>Beat Velocity</string>
+              </property>
+              <property name="wordWrap">
+               <bool>false</bool>
+              </property>
+             </widget>
+            </item>
+            <item row="5" column="0">
+             <widget class="QSpinBox" name="midiPort">
+              <property name="minimum">
+               <number>1</number>
+              </property>
+              <property name="maximum">
+               <number>16</number>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="1">
+             <widget class="QLabel" name="TextLabel3">
+              <property name="text">
+               <string>Beat Note</string>
+              </property>
+              <property name="wordWrap">
+               <bool>false</bool>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="0">
+             <widget class="QSpinBox" name="beatNote"/>
+            </item>
+            <item row="1" column="0">
+             <widget class="QSpinBox" name="measureVelocity">
+              <property name="maximum">
+               <number>127</number>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="0">
+             <widget class="QSpinBox" name="measureNote"/>
+            </item>
+            <item row="5" column="1">
+             <widget class="QLabel" name="TextLabel6">
+              <property name="text">
+               <string>Midi Port</string>
+              </property>
+              <property name="wordWrap">
+               <bool>false</bool>
+              </property>
+             </widget>
+            </item>
+            <item row="3" column="0">
+             <widget class="QSpinBox" name="beatVelocity">
+              <property name="maximum">
+               <number>127</number>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <spacer name="Spacer10">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeType">
+             <enum>QSizePolicy::Expanding</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>20</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QGroupBox" name="GroupBox2">
+     <property name="title">
+      <string>Precount</string>
+     </property>
+     <layout class="QVBoxLayout" name="qvbl_1">
+      <property name="spacing">
+       <number>6</number>
+      </property>
+      <property name="margin">
+       <number>11</number>
+      </property>
+      <item>
+       <widget class="QCheckBox" name="precountEnable">
+        <property name="enabled">
+         <bool>true</bool>
+        </property>
+        <property name="text">
+         <string>enable</string>
+        </property>
+        <property name="checked">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="qhbl_2">
+        <property name="spacing">
+         <number>6</number>
+        </property>
+        <property name="margin">
+         <number>0</number>
+        </property>
+        <item>
+         <widget class="QSpinBox" name="precountBars">
           <property name="enabled">
-           <bool>false</bool>
+           <bool>true</bool>
+          </property>
+          <property name="minimum">
+           <number>1</number>
           </property>
+          <property name="maximum">
+           <number>10</number>
+          </property>
+          <property name="value">
+           <number>2</number>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="TextLabel7">
           <property name="text">
-           <string>Prerecord</string>
+           <string>Bars</string>
+          </property>
+          <property name="wordWrap">
+           <bool>false</bool>
           </property>
          </widget>
         </item>
+       </layout>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="precountFromMastertrack">
+        <property name="enabled">
+         <bool>true</bool>
+        </property>
+        <property name="text">
+         <string>From Mastertrack</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="qhbl_3">
+        <property name="spacing">
+         <number>6</number>
+        </property>
+        <property name="margin">
+         <number>0</number>
+        </property>
         <item>
-         <widget class="QCheckBox" name="precountPreroll">
+         <widget class="QSpinBox" name="precountSigZ">
           <property name="enabled">
+           <bool>true</bool>
+          </property>
+          <property name="minimum">
+           <number>1</number>
+          </property>
+          <property name="maximum">
+           <number>32</number>
+          </property>
+          <property name="value">
+           <number>4</number>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="TextLabel8">
+          <property name="text">
+           <string>/</string>
+          </property>
+          <property name="wordWrap">
            <bool>false</bool>
           </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QSpinBox" name="precountSigN">
+          <property name="enabled">
+           <bool>true</bool>
+          </property>
+          <property name="minimum">
+           <number>2</number>
+          </property>
+          <property name="maximum">
+           <number>64</number>
+          </property>
+          <property name="value">
+           <number>4</number>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="TextLabel9">
           <property name="text">
-           <string>Preroll</string>
+           <string>Signature</string>
+          </property>
+          <property name="wordWrap">
+           <bool>false</bool>
           </property>
          </widget>
         </item>
        </layout>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="precountPrerecord">
+        <property name="enabled">
+         <bool>true</bool>
+        </property>
+        <property name="text">
+         <string>Prerecord</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="precountPreroll">
+        <property name="enabled">
+         <bool>true</bool>
+        </property>
+        <property name="text">
+         <string>Preroll</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="1" column="0" colspan="2">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QLabel" name="textLabel3">
+       <property name="text">
+        <string>Hint: Enable metronome in Transportpanel</string>
+       </property>
+       <property name="wordWrap">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="Horizontal Spacing2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Expanding</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>13</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="buttonApply">
+       <property name="text">
+        <string>&amp;Apply</string>
+       </property>
+       <property name="shortcut">
+        <string>Alt+A</string>
+       </property>
+       <property name="autoDefault">
+        <bool>true</bool>
+       </property>
       </widget>
      </item>
-     <item row="1" column="0" colspan="2">
-      <layout class="QHBoxLayout">
-       <item>
-        <widget class="QLabel" name="textLabel3">
-         <property name="text">
-          <string>Hint: Enable metronome in Transportpanel</string>
-         </property>
-         <property name="wordWrap">
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="Horizontal Spacing2">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::Expanding</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>8</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="QPushButton" name="buttonApply">
-         <property name="text">
-          <string>&amp;Apply</string>
-         </property>
-         <property name="shortcut">
-          <string>Alt+A</string>
-         </property>
-         <property name="autoDefault">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="buttonOk">
-         <property name="text">
-          <string>&amp;OK</string>
-         </property>
-         <property name="shortcut">
-          <string>Alt+O</string>
-         </property>
-         <property name="autoDefault">
-          <bool>true</bool>
-         </property>
-         <property name="default">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="buttonCancel">
-         <property name="text">
-          <string>&amp;Cancel</string>
-         </property>
-         <property name="shortcut">
-          <string>Alt+C</string>
-         </property>
-         <property name="autoDefault">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-      </layout>
+     <item>
+      <widget class="QPushButton" name="buttonOk">
+       <property name="text">
+        <string>&amp;OK</string>
+       </property>
+       <property name="shortcut">
+        <string>Alt+O</string>
+       </property>
+       <property name="autoDefault">
+        <bool>true</bool>
+       </property>
+       <property name="default">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="buttonCancel">
+       <property name="text">
+        <string>&amp;Cancel</string>
+       </property>
+       <property name="shortcut">
+        <string>Alt+C</string>
+       </property>
+       <property name="autoDefault">
+        <bool>true</bool>
+       </property>
+      </widget>
      </item>
     </layout>
    </item>
   </layout>
+  <zorder>GroupBox1</zorder>
+  <zorder>GroupBox2</zorder>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <tabstops>
@@ -548,21 +758,5 @@
     </hint>
    </hints>
   </connection>
-  <connection>
-   <sender>volumeSlider</sender>
-   <signal>valueChanged(int)</signal>
-   <receiver>volumeLabel</receiver>
-   <slot>setNum(int)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>20</x>
-     <y>20</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>20</x>
-     <y>20</y>
-    </hint>
-   </hints>
-  </connection>
  </connections>
 </ui>