--- qsampler/trunk/src/qsamplerChannelForm.h	2007/11/20 16:48:04	1499
+++ qsampler/trunk/src/qsamplerChannelForm.h	2007/12/06 09:35:33	1558
@@ -32,48 +32,62 @@
 
 namespace QSampler {
 
-class ChannelForm : public QDialog {
-Q_OBJECT
+//-------------------------------------------------------------------------
+// QSampler::Channelform -- Channel form interface.
+//
+
+class ChannelForm : public QDialog
+{
+	Q_OBJECT
+
 public:
-    ChannelForm(QWidget* parent = 0);
-   ~ChannelForm();
 
-    void setup(qsamplerChannel* pChannel);
-    void setupDevice(qsamplerDevice* pDevice, qsamplerDevice::qsamplerDeviceType deviceTypeMode, const QString& sDriverName);
-    void selectMidiDriverItem(const QString& sMidiDriver);
-    void selectMidiDeviceItem(int iMidiItem);
-    void selectAudioDriverItem(const QString& sAudioDriver);
-    void selectAudioDeviceItem(int iAudioItem);
-
-protected:
-    qsamplerChannel* m_pChannel;
-    int m_iDirtySetup;
-    int m_iDirtyCount;
-    QList<qsamplerDevice *> m_audioDevices;
-    QList<qsamplerDevice *> m_midiDevices;
-    DeviceForm* m_pDeviceForm;
-    ChannelRoutingModel routingModel;
-    ChannelRoutingDelegate routingDelegate;
+	ChannelForm(QWidget* pParent = NULL);
+	~ChannelForm();
+
+	void setup(Channel* pChannel);
+
+	void setupDevice(Device* pDevice,
+		Device::DeviceType deviceTypeMode,
+		const QString& sDriverName);
+
+	void selectMidiDriverItem(const QString& sMidiDriver);
+	void selectMidiDeviceItem(int iMidiItem);
+	void selectAudioDriverItem(const QString& sAudioDriver);
+	void selectAudioDeviceItem(int iAudioItem);
 
 protected slots:
-    void accept();
-    void reject();
-    void openInstrumentFile();
-    void updateInstrumentName();
-    void selectMidiDriver(const QString& sMidiDriver);
-    void selectMidiDevice(int iMidiItem);
-    void setupMidiDevice();
-    void selectAudioDriver(const QString& sAudioDriver);
-    void selectAudioDevice(int iAudioItem);
-    void setupAudioDevice();
-    void updateDevices();
-    void optionsChanged();
-    void stabilizeForm();
-    void updateTableCellRenderers();
-    void updateTableCellRenderers(const QModelIndex& topLeft, const QModelIndex& bottomRight);
+
+	void accept();
+	void reject();
+	void openInstrumentFile();
+	void updateInstrumentName();
+	void selectMidiDriver(const QString& sMidiDriver);
+	void selectMidiDevice(int iMidiItem);
+	void setupMidiDevice();
+	void selectAudioDriver(const QString& sAudioDriver);
+	void selectAudioDevice(int iAudioItem);
+	void setupAudioDevice();
+	void updateDevices();
+	void optionsChanged();
+	void stabilizeForm();
+
+	void updateTableCellRenderers();
+	void updateTableCellRenderers(
+		const QModelIndex& topLeft, const QModelIndex& bottomRight);
 
 private:
-    Ui::qsamplerChannelForm ui;
+
+	Ui::qsamplerChannelForm m_ui;
+
+	Channel* m_pChannel;
+	int m_iDirtySetup;
+	int m_iDirtyCount;
+	QList<Device *> m_audioDevices;
+	QList<Device *> m_midiDevices;
+	DeviceForm* m_pDeviceForm;
+	ChannelRoutingModel m_routingModel;
+	ChannelRoutingDelegate m_routingDelegate;
 };
 
 } // namespace QSampler