--- qsampler/trunk/src/qsamplerChannelForm.ui	2004/05/30 15:38:06	95
+++ qsampler/trunk/src/qsamplerChannelForm.ui	2005/03/14 12:59:27	455
@@ -2,7 +2,7 @@
 <class>qsamplerChannelForm</class>
 <comment>qsampler - A LinuxSampler Qt GUI Interface.
 
-   Copyright (C) 2004, rncbc aka Rui Nuno Capela. All rights reserved.
+   Copyright (C) 2004-2005, rncbc aka Rui Nuno Capela. All rights reserved.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License
@@ -28,8 +28,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>424</width>
-            <height>268</height>
+            <width>455</width>
+            <height>303</height>
         </rect>
     </property>
     <property name="sizePolicy">
@@ -93,7 +93,7 @@
         </widget>
         <widget class="QLabel" row="1" column="0">
             <property name="name">
-                <cstring>InstrumentTextLabel</cstring>
+                <cstring>InstrumentFileTextLabel</cstring>
             </property>
             <property name="sizePolicy">
                 <sizepolicy>
@@ -104,7 +104,7 @@
                 </sizepolicy>
             </property>
             <property name="text">
-                <string>&amp;Instrument:</string>
+                <string>&amp;Filename:</string>
             </property>
             <property name="alignment">
                 <set>AlignVCenter|AlignRight</set>
@@ -159,6 +159,12 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
+            <property name="minimumSize">
+                <size>
+                    <width>320</width>
+                    <height>0</height>
+                </size>
+            </property>
             <property name="editable">
                 <bool>true</bool>
             </property>
@@ -166,23 +172,6 @@
                 <string>Instrument filename</string>
             </property>
         </widget>
-        <spacer row="3" column="0" rowspan="2" colspan="1">
-            <property name="name">
-                <cstring>spacer1</cstring>
-            </property>
-            <property name="orientation">
-                <enum>Vertical</enum>
-            </property>
-            <property name="sizeType">
-                <enum>Expanding</enum>
-            </property>
-            <property name="sizeHint">
-                <size>
-                    <width>8</width>
-                    <height>8</height>
-                </size>
-            </property>
-        </spacer>
         <widget class="QLayoutWidget" row="5" column="0" rowspan="1" colspan="4">
             <property name="name">
                 <cstring>layout1</cstring>
@@ -232,18 +221,26 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QSpinBox" row="2" column="1">
+        <widget class="QComboBox" row="2" column="1" rowspan="1" colspan="3">
             <property name="name">
-                <cstring>InstrumentNrSpinBox</cstring>
+                <cstring>InstrumentNrComboBox</cstring>
             </property>
-            <property name="maximumSize">
+            <property name="sizePolicy">
+                <sizepolicy>
+                    <hsizetype>7</hsizetype>
+                    <vsizetype>0</vsizetype>
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                </sizepolicy>
+            </property>
+            <property name="minimumSize">
                 <size>
-                    <width>40</width>
-                    <height>32767</height>
+                    <width>320</width>
+                    <height>0</height>
                 </size>
             </property>
             <property name="toolTip" stdset="0">
-                <string>Instrument index</string>
+                <string>Instrument name</string>
             </property>
         </widget>
         <widget class="QLabel" row="2" column="0">
@@ -251,29 +248,13 @@
                 <cstring>InstrumentNrTextLabel</cstring>
             </property>
             <property name="text">
-                <string>Inde&amp;x:</string>
+                <string>&amp;Instrument:</string>
             </property>
             <property name="alignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
             <property name="buddy" stdset="0">
-                <cstring>InstrumentNrSpinBox</cstring>
-            </property>
-        </widget>
-        <widget class="QLabel" row="2" column="2" rowspan="1" colspan="2">
-            <property name="name">
-                <cstring>InstrumentNameTextLabel</cstring>
-            </property>
-            <property name="sizePolicy">
-                <sizepolicy>
-                    <hsizetype>1</hsizetype>
-                    <vsizetype>5</vsizetype>
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                </sizepolicy>
-            </property>
-            <property name="toolTip" stdset="0">
-                <string>Instrument name</string>
+                <cstring>InstrumentNrComboBox</cstring>
             </property>
         </widget>
         <widget class="QGroupBox" row="3" column="1" rowspan="1" colspan="3">
@@ -289,9 +270,9 @@
                 </sizepolicy>
             </property>
             <property name="title">
-                <string>&amp;MIDI/Input</string>
+                <string>MIDI / Input</string>
             </property>
-            <hbox>
+            <grid>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
@@ -301,7 +282,15 @@
                 <property name="spacing">
                     <number>8</number>
                 </property>
-                <widget class="QLabel">
+                <widget class="QComboBox" row="0" column="1">
+                    <property name="name">
+                        <cstring>MidiDriverComboBox</cstring>
+                    </property>
+                    <property name="toolTip" stdset="0">
+                        <string>MIDI input driver type</string>
+                    </property>
+                </widget>
+                <widget class="QLabel" row="0" column="0">
                     <property name="name">
                         <cstring>MidiDriverTextLabel</cstring>
                     </property>
@@ -309,40 +298,35 @@
                         <string>&amp;Type:</string>
                     </property>
                     <property name="alignment">
-                        <set>AlignVCenter|AlignRight</set>
+                        <set>AlignVCenter</set>
                     </property>
                     <property name="buddy" stdset="0">
                         <cstring>MidiDriverComboBox</cstring>
                     </property>
                 </widget>
-                <widget class="QComboBox">
-                    <item>
-                        <property name="text">
-                            <string>ALSA</string>
-                        </property>
-                    </item>
+                <widget class="QComboBox" row="1" column="1" rowspan="1" colspan="6">
                     <property name="name">
-                        <cstring>MidiDriverComboBox</cstring>
+                        <cstring>MidiDeviceComboBox</cstring>
                     </property>
                     <property name="toolTip" stdset="0">
-                        <string>MIDI input driver type</string>
+                        <string>MIDI input device</string>
                     </property>
                 </widget>
-                <widget class="QLabel">
+                <widget class="QLabel" row="1" column="0">
                     <property name="name">
-                        <cstring>MidiPortTextLabel</cstring>
+                        <cstring>MidiDeviceTextLabel</cstring>
                     </property>
                     <property name="text">
-                        <string>&amp;Port:</string>
+                        <string>&amp;Device:</string>
                     </property>
                     <property name="alignment">
-                        <set>AlignVCenter|AlignRight</set>
+                        <set>AlignVCenter</set>
                     </property>
                     <property name="buddy" stdset="0">
-                        <cstring>MidiPortSpinBox</cstring>
+                        <cstring>MidiDeviceComboBox</cstring>
                     </property>
                 </widget>
-                <widget class="QSpinBox">
+                <widget class="QSpinBox" row="0" column="4">
                     <property name="name">
                         <cstring>MidiPortSpinBox</cstring>
                     </property>
@@ -350,7 +334,100 @@
                         <string>MIDI input port number</string>
                     </property>
                 </widget>
-                <widget class="QLabel">
+                <widget class="QComboBox" row="0" column="6">
+                    <item>
+                        <property name="text">
+                            <string>1</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property name="text">
+                            <string>2</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property name="text">
+                            <string>3</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property name="text">
+                            <string>4</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property name="text">
+                            <string>5</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property name="text">
+                            <string>6</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property name="text">
+                            <string>7</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property name="text">
+                            <string>8</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property name="text">
+                            <string>9</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property name="text">
+                            <string>10</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property name="text">
+                            <string>11</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property name="text">
+                            <string>12</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property name="text">
+                            <string>13</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property name="text">
+                            <string>14</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property name="text">
+                            <string>15</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property name="text">
+                            <string>16</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property name="text">
+                            <string>All</string>
+                        </property>
+                    </item>
+                    <property name="name">
+                        <cstring>MidiChannelComboBox</cstring>
+                    </property>
+                    <property name="toolTip" stdset="0">
+                        <string>MIDI input channel</string>
+                    </property>
+                </widget>
+                <widget class="QLabel" row="0" column="5">
                     <property name="name">
                         <cstring>MidiChannelTextLabel</cstring>
                     </property>
@@ -361,26 +438,12 @@
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
-                        <cstring>MidiChannelSpinBox</cstring>
+                        <cstring>MidiChannelComboBox</cstring>
                     </property>
                 </widget>
-                <widget class="QSpinBox">
+                <spacer row="0" column="2">
                     <property name="name">
-                        <cstring>MidiChannelSpinBox</cstring>
-                    </property>
-                    <property name="maxValue">
-                        <number>16</number>
-                    </property>
-                    <property name="minValue">
-                        <number>0</number>
-                    </property>
-                    <property name="toolTip" stdset="0">
-                        <string>MIDI input channel</string>
-                    </property>
-                </widget>
-                <spacer>
-                    <property name="name">
-                        <cstring>spacer2</cstring>
+                        <cstring>spacer1</cstring>
                     </property>
                     <property name="orientation">
                         <enum>Horizontal</enum>
@@ -390,12 +453,26 @@
                     </property>
                     <property name="sizeHint">
                         <size>
-                            <width>8</width>
+                            <width>16</width>
                             <height>8</height>
                         </size>
                     </property>
                 </spacer>
-            </hbox>
+                <widget class="QLabel" row="0" column="3">
+                    <property name="name">
+                        <cstring>MidiPortTextLabel</cstring>
+                    </property>
+                    <property name="text">
+                        <string>&amp;Port:</string>
+                    </property>
+                    <property name="alignment">
+                        <set>AlignVCenter|AlignRight</set>
+                    </property>
+                    <property name="buddy" stdset="0">
+                        <cstring>MidiPortSpinBox</cstring>
+                    </property>
+                </widget>
+            </grid>
         </widget>
         <widget class="QGroupBox" row="4" column="1" rowspan="1" colspan="3">
             <property name="name">
@@ -410,12 +487,12 @@
                 </sizepolicy>
             </property>
             <property name="title">
-                <string>&amp;Audio/Output</string>
+                <string>Audio / Output</string>
             </property>
             <property name="alignment">
                 <set>AlignAuto</set>
             </property>
-            <hbox>
+            <grid>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
@@ -425,7 +502,23 @@
                 <property name="spacing">
                     <number>8</number>
                 </property>
-                <widget class="QLabel">
+                <widget class="QComboBox" row="1" column="1" rowspan="1" colspan="2">
+                    <property name="name">
+                        <cstring>AudioDeviceComboBox</cstring>
+                    </property>
+                    <property name="toolTip" stdset="0">
+                        <string>Audio output device</string>
+                    </property>
+                </widget>
+                <widget class="QComboBox" row="0" column="1">
+                    <property name="name">
+                        <cstring>AudioDriverComboBox</cstring>
+                    </property>
+                    <property name="toolTip" stdset="0">
+                        <string>Audio output driver type</string>
+                    </property>
+                </widget>
+                <widget class="QLabel" row="0" column="0">
                     <property name="name">
                         <cstring>AudioDriverTextLabel</cstring>
                     </property>
@@ -433,33 +526,29 @@
                         <string>&amp;Type:</string>
                     </property>
                     <property name="alignment">
-                        <set>AlignVCenter|AlignRight</set>
+                        <set>AlignVCenter</set>
                     </property>
                     <property name="buddy" stdset="0">
                         <cstring>AudioDriverComboBox</cstring>
                     </property>
                 </widget>
-                <widget class="QComboBox">
-                    <item>
-                        <property name="text">
-                            <string>ALSA</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property name="text">
-                            <string>JACK</string>
-                        </property>
-                    </item>
+                <widget class="QLabel" row="1" column="0">
                     <property name="name">
-                        <cstring>AudioDriverComboBox</cstring>
+                        <cstring>AudioDeviceTextLabel</cstring>
                     </property>
-                    <property name="toolTip" stdset="0">
-                        <string>Audio output driver type</string>
+                    <property name="text">
+                        <string>&amp;Device:</string>
+                    </property>
+                    <property name="alignment">
+                        <set>AlignVCenter</set>
+                    </property>
+                    <property name="buddy" stdset="0">
+                        <cstring>AudioDeviceComboBox</cstring>
                     </property>
                 </widget>
-                <spacer>
+                <spacer row="0" column="2">
                     <property name="name">
-                        <cstring>spacer3</cstring>
+                        <cstring>spacer2</cstring>
                     </property>
                     <property name="orientation">
                         <enum>Horizontal</enum>
@@ -469,12 +558,12 @@
                     </property>
                     <property name="sizeHint">
                         <size>
-                            <width>8</width>
+                            <width>210</width>
                             <height>8</height>
                         </size>
                     </property>
                 </spacer>
-            </hbox>
+            </grid>
         </widget>
     </grid>
 </widget>
@@ -498,16 +587,22 @@
         <slot>openInstrumentFile()</slot>
     </connection>
     <connection>
-        <sender>InstrumentNrSpinBox</sender>
-        <signal>valueChanged(int)</signal>
+        <sender>InstrumentNrComboBox</sender>
+        <signal>activated(int)</signal>
         <receiver>qsamplerChannelForm</receiver>
-        <slot>updateInstrumentName()</slot>
+        <slot>optionsChanged()</slot>
     </connection>
     <connection>
         <sender>MidiDriverComboBox</sender>
+        <signal>activated(const QString &amp;)</signal>
+        <receiver>qsamplerChannelForm</receiver>
+        <slot>selectMidiDriver(const QString&amp;)</slot>
+    </connection>
+    <connection>
+        <sender>MidiDeviceComboBox</sender>
         <signal>activated(int)</signal>
         <receiver>qsamplerChannelForm</receiver>
-        <slot>optionsChanged()</slot>
+        <slot>selectMidiDevice(int)</slot>
     </connection>
     <connection>
         <sender>MidiPortSpinBox</sender>
@@ -516,16 +611,22 @@
         <slot>optionsChanged()</slot>
     </connection>
     <connection>
-        <sender>MidiChannelSpinBox</sender>
-        <signal>valueChanged(int)</signal>
+        <sender>MidiChannelComboBox</sender>
+        <signal>activated(int)</signal>
         <receiver>qsamplerChannelForm</receiver>
         <slot>optionsChanged()</slot>
     </connection>
     <connection>
         <sender>AudioDriverComboBox</sender>
+        <signal>activated(const QString &amp;)</signal>
+        <receiver>qsamplerChannelForm</receiver>
+        <slot>selectAudioDriver(const QString&amp;)</slot>
+    </connection>
+    <connection>
+        <sender>AudioDeviceComboBox</sender>
         <signal>activated(int)</signal>
         <receiver>qsamplerChannelForm</receiver>
-        <slot>optionsChanged()</slot>
+        <slot>selectAudioDevice(int)</slot>
     </connection>
     <connection>
         <sender>OkPushButton</sender>
@@ -544,37 +645,44 @@
     <tabstop>EngineNameComboBox</tabstop>
     <tabstop>InstrumentFileComboBox</tabstop>
     <tabstop>InstrumentFilePushButton</tabstop>
-    <tabstop>InstrumentNrSpinBox</tabstop>
+    <tabstop>InstrumentNrComboBox</tabstop>
     <tabstop>MidiDriverComboBox</tabstop>
     <tabstop>MidiPortSpinBox</tabstop>
-    <tabstop>MidiChannelSpinBox</tabstop>
+    <tabstop>MidiChannelComboBox</tabstop>
+    <tabstop>MidiDeviceComboBox</tabstop>
     <tabstop>AudioDriverComboBox</tabstop>
+    <tabstop>AudioDeviceComboBox</tabstop>
     <tabstop>OkPushButton</tabstop>
     <tabstop>CancelPushButton</tabstop>
 </tabstops>
 <includes>
+    <include location="local" impldecl="in declaration">qsamplerDevice.h</include>
+    <include location="local" impldecl="in declaration">qsamplerChannel.h</include>
     <include location="local" impldecl="in implementation">qsamplerChannelForm.ui.h</include>
 </includes>
-<forwards>
-    <forward>class qsamplerChannelStrip;</forward>
-</forwards>
 <variables>
-    <variable access="private">qsamplerChannelStrip *m_pChannel;</variable>
+    <variable access="private">qsamplerChannel *m_pChannel;</variable>
     <variable access="private">int m_iDirtySetup;</variable>
     <variable access="private">int m_iDirtyCount;</variable>
+    <variable access="private">QPtrList &lt; qsamplerDevice &gt; m_audioDevices;</variable>
+    <variable access="private">QPtrList &lt; qsamplerDevice &gt; m_midiDevices;</variable>
 </variables>
 <slots>
     <slot specifier="non virtual">accept()</slot>
     <slot specifier="non virtual">reject()</slot>
     <slot specifier="non virtual">openInstrumentFile()</slot>
     <slot specifier="non virtual">updateInstrumentName()</slot>
+    <slot specifier="non virtual">selectMidiDriver( const QString &amp; sMidiDriver )</slot>
+    <slot specifier="non virtual">selectMidiDevice( int iMidiItem )</slot>
+    <slot specifier="non virtual">selectAudioDriver( const QString &amp; sAudioDriver )</slot>
+    <slot specifier="non virtual">selectAudioDevice( int iAudioItem )</slot>
     <slot specifier="non virtual">optionsChanged()</slot>
     <slot specifier="non virtual">stabilizeForm()</slot>
 </slots>
 <functions>
     <function access="private" specifier="non virtual">init()</function>
     <function access="private" specifier="non virtual">destroy()</function>
-    <function specifier="non virtual">setup( qsamplerChannelStrip *pChannel )</function>
+    <function specifier="non virtual">setup( qsamplerChannel *pChannel )</function>
 </functions>
 <pixmapinproject/>
 <layoutdefaults spacing="8" margin="8"/>