--- qsampler/trunk/src/qsamplerDevice.h 2006/11/30 10:39:12 960 +++ qsampler/trunk/src/qsamplerDevice.h 2006/12/03 18:26:13 961 @@ -90,8 +90,7 @@ enum qsamplerDeviceType { None, Midi, Audio }; // Constructor. - qsamplerDevice(qsamplerMainForm *pMainForm, - qsamplerDeviceType deviceType, int iDeviceID = -1); + qsamplerDevice(qsamplerDeviceType deviceType, int iDeviceID = -1); // Copy constructor. qsamplerDevice(const qsamplerDevice& device); // Default destructor. @@ -103,9 +102,6 @@ // Driver name initializer. void setDriver(const QString& sDriverName); - // LSCP client descriptor accessor. - lscp_client_t *client() const; - // Device property accessors. int deviceID() const; qsamplerDeviceType deviceType() const; @@ -221,9 +217,9 @@ public: // Constructors. - qsamplerDeviceItem(QListView *pListView, qsamplerMainForm *pMainForm, + qsamplerDeviceItem(QListView *pListView, qsamplerDevice::qsamplerDeviceType deviceType); - qsamplerDeviceItem(QListViewItem *pItem, qsamplerMainForm *pMainForm, + qsamplerDeviceItem(QListViewItem *pItem, qsamplerDevice::qsamplerDeviceType deviceType, int iDeviceID); // Default destructor. ~qsamplerDeviceItem();