--- qsampler/trunk/src/qsamplerChannelStrip.ui	2004/06/24 18:26:57	145
+++ qsampler/trunk/src/qsamplerChannelStrip.ui	2005/02/11 15:36:06	371
@@ -2,7 +2,7 @@
 <class>qsamplerChannelStrip</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
@@ -29,7 +29,7 @@
             <x>0</x>
             <y>0</y>
             <width>694</width>
-            <height>46</height>
+            <height>47</height>
         </rect>
     </property>
     <property name="sizePolicy">
@@ -182,7 +182,7 @@
                         <string>--</string>
                     </property>
                     <property name="toolTip" stdset="0">
-                        <string>Instrument file [index]</string>
+                        <string>Instrument name</string>
                     </property>
                 </widget>
                 <widget class="QLabel" row="0" column="1">
@@ -410,75 +410,33 @@
     <tabstop>VolumeSpinBox</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">lscp/client.h</include>
-    <include location="global" impldecl="in declaration">lscp/device.h</include>
+    <include location="local" impldecl="in declaration">qsamplerChannel.h</include>
     <include location="local" impldecl="in implementation">qsamplerChannelStrip.ui.h</include>
 </includes>
-<forwards>
-    <forward>class qsamplerOptions;</forward>
-    <forward>class qsamplerMainForm;</forward>
-</forwards>
 <variables>
-    <variable access="private">qsamplerMainForm *m_pMainForm;</variable>
-    <variable access="private">int m_iChannelID;</variable>
-    <variable access="private">QString m_sEngineName;</variable>
-    <variable access="private">QString m_sInstrumentFile;</variable>
-    <variable access="private">int m_iInstrumentNr;</variable>
-    <variable access="private">int m_iInstrumentStatus;</variable>
-    <variable access="private">QString m_sMidiDriver;</variable>
-    <variable access="private">int m_iMidiDevice;</variable>
-    <variable access="private">int m_iMidiPort;</variable>
-    <variable access="private">int m_iMidiChannel;</variable>
-    <variable access="private">QString m_sAudioDriver;</variable>
-    <variable access="private">int m_iAudioDevice;</variable>
-    <variable access="private">float m_fVolume;</variable>
+    <variable access="private">qsamplerChannel *m_pChannel;</variable>
     <variable access="private">int m_iDirtyChange;</variable>
 </variables>
 <signals>
     <signal>channelChanged( qsamplerChannelStrip * )</signal>
 </signals>
 <slots>
-    <slot specifier="non virtual">channelSetup()</slot>
     <slot specifier="non virtual">volumeChanged(int)</slot>
+    <slot specifier="non virtual" returnType="bool">channelSetup()</slot>
 </slots>
 <functions>
     <function access="private" specifier="non virtual">init()</function>
     <function access="private" specifier="non virtual">destroy()</function>
-    <function specifier="non virtual">setup( qsamplerMainForm *pMainForm, int iChannelID )</function>
-    <function specifier="non virtual" returnType="qsamplerOptions *">options( void )</function>
-    <function specifier="non virtual" returnType="lscp_client_t *">client( void )</function>
-    <function specifier="non virtual" returnType="int">channelID( void )</function>
-    <function specifier="non virtual">setChannelID( int iChannelID )</function>
-    <function specifier="non virtual" returnType="QString&amp;">engineName( void )</function>
-    <function specifier="non virtual" returnType="bool">loadEngine( const QString&amp; sEngineName )</function>
-    <function specifier="non virtual" returnType="QString&amp;">instrumentFile( void )</function>
-    <function specifier="non virtual" returnType="int">instrumentNr( void )</function>
-    <function specifier="non virtual" returnType="int">instrumentStatus( void )</function>
-    <function specifier="non virtual" returnType="bool">loadInstrument( const QString&amp; sInstrumentFile, int iInstrumentNr )</function>
-    <function specifier="non virtual" returnType="QString&amp;">midiDriver( void )</function>
-    <function specifier="non virtual" returnType="bool">setMidiDriver( const QString&amp; sMidiDriver )</function>
-    <function specifier="non virtual" returnType="int">midiDevice( void )</function>
-    <function specifier="non virtual" returnType="bool">setMidiDevice( int iMidiDevice )</function>
-    <function specifier="non virtual" returnType="int">midiPort( void )</function>
-    <function specifier="non virtual" returnType="bool">setMidiPort( int iMidiPort )</function>
-    <function specifier="non virtual" returnType="int">midiChannel( void )</function>
-    <function specifier="non virtual" returnType="bool">setMidiChannel( int iMidiChannel )</function>
-    <function specifier="non virtual" returnType="int">audioDevice( void )</function>
-    <function specifier="non virtual" returnType="bool">setAudioDevice( int iAudioDevice )</function>
-    <function specifier="non virtual" returnType="QString&amp;">audioDriver( void )</function>
-    <function specifier="non virtual" returnType="bool">setAudioDriver( const QString&amp; sAudioDriver )</function>
-    <function specifier="non virtual" returnType="float">volume( void )</function>
-    <function specifier="non virtual" returnType="bool">setVolume( float fVolume )</function>
+    <function specifier="non virtual">setup( qsamplerChannel *pChannel )</function>
+    <function specifier="non virtual" returnType="qsamplerChannel *">channel ( void )</function>
     <function specifier="non virtual" returnType="QFont">displayFont( void )</function>
     <function specifier="non virtual">setDisplayFont( const QFont &amp; font )</function>
-    <function specifier="non virtual">updateChannelInfo( void )</function>
-    <function specifier="non virtual">updateChannelVolume( void )</function>
-    <function specifier="non virtual">updateChannelUsage( void )</function>
-    <function specifier="non virtual">appendMessages( const QString &amp; s )</function>
-    <function specifier="non virtual">appendMessagesColor( const QString &amp; s, const QString &amp; c )</function>
-    <function specifier="non virtual">appendMessagesText( const QString &amp; s )</function>
-    <function specifier="non virtual">appendMessagesError( const QString &amp; s )</function>
-    <function specifier="non virtual">appendMessagesClient( const QString &amp; s )</function>
+    <function specifier="non virtual">setDisplayEffect( bool bDisplayEffect )</function>
+    <function specifier="non virtual">setDisplayBackground( const QPixmap &amp; pm )</function>
+    <function specifier="non virtual" returnType="bool">updateInstrumentName( bool bForce )</function>
+    <function specifier="non virtual" returnType="bool">updateChannelInfo( void )</function>
+    <function specifier="non virtual" returnType="bool">updateChannelVolume( void )</function>
+    <function specifier="non virtual" returnType="bool">updateChannelUsage( void )</function>
     <function specifier="non virtual">contextMenuEvent( QContextMenuEvent *pEvent )</function>
     <function specifier="non virtual">setMaxVolume( int iMaxVolume )</function>
 </functions>