--- qsampler/trunk/src/qsamplerDevice.cpp	2005/03/09 11:33:27	432
+++ qsampler/trunk/src/qsamplerDevice.cpp	2005/03/09 20:55:04	436
@@ -122,23 +122,25 @@
 	m_deviceType  = deviceType;
 
 	// Retrieve device info, if any.
-	QString sDeviceType;
 	lscp_device_info_t *pDeviceInfo = NULL;
 	switch (deviceType) {
 	case qsamplerDevice::Audio:
-		sDeviceType = QObject::tr("Audio");
+		m_sDeviceType = QObject::tr("Audio");
 		pDeviceInfo = ::lscp_get_audio_device_info(pClient, iDeviceID);
 		break;
 	case qsamplerDevice::Midi:
-		sDeviceType = QObject::tr("MIDI");
+		m_sDeviceType = QObject::tr("MIDI");
 		pDeviceInfo = ::lscp_get_midi_device_info(pClient, iDeviceID);
 		break;
+	case qsamplerDevice::None:
+		m_sDeviceType = QString::null;
+		break;
 	}
 
 	// If we're bogus, bail out...
 	if (pDeviceInfo == NULL) {
 		m_sDriverName = QString::null;
-		m_sDeviceName = QObject::tr("New %1 device").arg(sDeviceType);
+		m_sDeviceName = QObject::tr("New device");
 		return;
 	}
 
@@ -161,8 +163,13 @@
 			pParamInfo = ::lscp_get_midi_driver_param_info(pClient,
 				m_sDriverName.latin1(), pszParam, NULL);
 			break;
+		case qsamplerDevice::None:
+			break;
+		}
+		if (pParamInfo) {
+			m_params[pszParam] = qsamplerDeviceParam(pParamInfo,
+				pDeviceInfo->params[i].value);
 		}
-		m_params[pszParam] = qsamplerDeviceParam(pParamInfo, pDeviceInfo->params[i].value);
 	}
 }
 
@@ -186,6 +193,8 @@
 		pDriverInfo = ::lscp_get_midi_driver_info(pClient,
 			sDriverName.latin1());
 		break;
+	case qsamplerDevice::None:
+		break;
 	}
 
 	// If we're bogus, bail out...
@@ -209,8 +218,11 @@
 			pParamInfo = ::lscp_get_midi_driver_param_info(pClient,
 				sDriverName.latin1(), pszParam, NULL);
 			break;
+		case qsamplerDevice::None:
+			break;
 		}
-		m_params[pszParam] = qsamplerDeviceParam(pParamInfo, pParamInfo->defaultv);
+		if (pParamInfo)
+			m_params[pszParam] = qsamplerDeviceParam(pParamInfo, pParamInfo->defaultv);
 	}
 }
 
@@ -226,6 +238,11 @@
 	return m_deviceType;
 }
 
+const QString& qsamplerDevice::deviceTypeName (void) const
+{
+	return m_sDeviceType;
+}
+
 const QString& qsamplerDevice::driverName (void) const
 {
 	return m_sDriverName;
@@ -260,6 +277,8 @@
 	case qsamplerDevice::Midi:
 		piDeviceIDs = ::lscp_list_midi_devices(pClient);
 		break;
+	case qsamplerDevice::None:
+		break;
 	}
 	return piDeviceIDs;
 }
@@ -279,6 +298,8 @@
 	case qsamplerDevice::Midi:
 		ppszDrivers = ::lscp_get_available_midi_drivers(pClient);
 		break;
+	case qsamplerDevice::None:
+		break;
 	}
 	
 	for (int iDriver = 0; ppszDrivers[iDriver]; iDriver++)
@@ -293,8 +314,8 @@
 //
 
 // Constructors.
-qsamplerDeviceItem::qsamplerDeviceItem ( QListView *pListView, lscp_client_t *pClient,
-	qsamplerDevice::qsamplerDeviceType deviceType )
+qsamplerDeviceItem::qsamplerDeviceItem ( QListView *pListView,
+	lscp_client_t *pClient,	qsamplerDevice::qsamplerDeviceType deviceType )
 	: QListViewItem(pListView), m_device(pClient, deviceType)
 {
 	switch(m_device.deviceType()) {
@@ -306,11 +327,14 @@
 		QListViewItem::setPixmap(0, QPixmap::fromMimeSource("midi1.png"));
 		QListViewItem::setText(0, QObject::tr("MIDI devices"));
 		break;
+	case qsamplerDevice::None:
+		break;
 	}
 }
 
-qsamplerDeviceItem::qsamplerDeviceItem ( QListViewItem *pItem, lscp_client_t *pClient,
-	qsamplerDevice::qsamplerDeviceType deviceType, int iDeviceID )
+qsamplerDeviceItem::qsamplerDeviceItem ( QListViewItem *pItem,
+	lscp_client_t *pClient, qsamplerDevice::qsamplerDeviceType deviceType,
+	int iDeviceID )
 	: QListViewItem(pItem), m_device(pClient, deviceType, iDeviceID)
 {
 	switch(m_device.deviceType()) {
@@ -320,6 +344,8 @@
 	case qsamplerDevice::Midi:
 		QListViewItem::setPixmap(0, QPixmap::fromMimeSource("midi2.png"));
 		break;
+	case qsamplerDevice::None:
+		break;
 	}
 
 	QListViewItem::setText(0, m_device.deviceName());
@@ -349,7 +375,8 @@
 //
 
 // Constructor.
-qsamplerDeviceParamTable::qsamplerDeviceParamTable ( QWidget *pParent, const char *pszName )
+qsamplerDeviceParamTable::qsamplerDeviceParamTable ( QWidget *pParent,
+	const char *pszName )
 	: QTable(pParent, pszName)
 {
 	// Set fixed number of columns.
@@ -363,14 +390,14 @@
 	QTable::setLeftMargin(0);
 	// Initialize the fixed table column headings.
 	QHeader *pHeader = QTable::horizontalHeader();
-	pHeader->setLabel(0, tr("Description"));
-	pHeader->setLabel(1, tr("Value"));
-	pHeader->setLabel(2, tr("Parameter"));
+	pHeader->setLabel(0, tr("Parameter"));
+	pHeader->setLabel(1, tr("Description"));
+	pHeader->setLabel(2, tr("Value"));
 	// Set read-onlyness of each column
 	QTable::setColumnReadOnly(0, true);
-//  QTable::setColumnReadOnly(1, true); -- of course not.
-	QTable::setColumnReadOnly(2, true);
-	QTable::setColumnStretchable(0, true);
+	QTable::setColumnReadOnly(1, true);
+//  QTable::setColumnReadOnly(2, true); -- of course not.
+	QTable::setColumnStretchable(1, true);
 }
 
 // Default destructor.
@@ -383,6 +410,7 @@
 void qsamplerDeviceParamTable::refresh ( qsamplerDevice& device )
 {
 	// Always (re)start it empty.
+	QTable::setUpdatesEnabled(false);
 	QTable::setNumRows(0);
 
 	// Now fill the parameter table...
@@ -392,34 +420,38 @@
 	qsamplerDeviceParamMap::ConstIterator iter;
 	for (iter = params.begin(); iter != params.end(); ++iter) {
 		const qsamplerDeviceParam& param = iter.data();
-		QTable::setText(iRow, 0, param.description);
+		bool fEnabled = (device.deviceID() < 0 || !param.fix);
+		QTable::setText(iRow, 0, iter.key());
+		QTable::setText(iRow, 1, param.description);
 		if (param.type == LSCP_TYPE_BOOL) {
 			QStringList opts;
 			opts.append(tr("false"));
 			opts.append(tr("true"));
 			QComboTableItem *pComboItem = new QComboTableItem(this, opts);
 		    pComboItem->setCurrentItem(param.value.lower() == "true" ? 1 : 0);
-		    pComboItem->setEnabled(param.fix);
-			QTable::setItem(iRow, 1, pComboItem);
-		} else if (param.possibilities.count() > 0) {
+		    pComboItem->setEnabled(fEnabled);
+			QTable::setItem(iRow, 2, pComboItem);
+		} else if (param.possibilities.count() > 0 && !param.multiplicity) {
 			QComboTableItem *pComboItem = new QComboTableItem(this,
 				param.possibilities);
 		    pComboItem->setCurrentItem(param.value);
-		    pComboItem->setEnabled(param.fix);
-			QTable::setItem(iRow, 1, pComboItem);
+		    pComboItem->setEnabled(fEnabled);
+			QTable::setItem(iRow, 2, pComboItem);
 		} else {
 			QTableItem* pTableItem = new QTableItem(this,
-				param.fix ? QTableItem::Never : QTableItem::OnTyping,
+				fEnabled ? QTableItem::OnTyping : QTableItem::Never,
 				param.value);
-			QTable::setItem(iRow, 1, pTableItem);
+			QTable::setItem(iRow, 2, pTableItem);
 		}
-		QTable::setText(iRow, 2, iter.key());
 		++iRow;
 	}
 
-	// Adjust optimal column width.
-	for (int iCol = 0; iCol < QTable::numCols(); iCol++)
-		QTable::adjustColumn(iCol);
+	// Adjust optimal column widths.
+	QTable::adjustColumn(0);
+	QTable::adjustColumn(2);
+
+	QTable::setUpdatesEnabled(true);
+	QTable::updateContents();
 }