--- qsampler/trunk/src/qsamplerMainForm.ui.h	2005/03/15 11:39:12	462
+++ qsampler/trunk/src/qsamplerMainForm.ui.h	2005/03/31 14:17:19	487
@@ -218,6 +218,7 @@
     // Some child forms are to be created right now.
     m_pMessages = new qsamplerMessages(this);
     m_pDeviceForm = new qsamplerDeviceForm(this, 0, wflags);
+    m_pDeviceForm->setMainForm(this); // An important life immutable!
     // Set message defaults...
     updateMessagesFont();
     updateMessagesLimit();
@@ -598,7 +599,6 @@
             if (::lscp_client_query(m_pClient, sCommand.latin1()) != LSCP_OK) {
                 appendMessagesClient("lscp_client_query");
                 iErrors++;
-                break;
             }
         }
         // Try to make it snappy :)
@@ -608,18 +608,18 @@
     // Ok. we've read it.
     file.close();
 
-    // Have we any errors?
-    if (iErrors > 0)
-        appendMessagesError(tr("Session could not be loaded\nfrom \"%1\".\n\nSorry.").arg(sFilename));
-
 	// Now we'll try to create (update) the whole GUI session.
 	updateSession();
 
+	// Have we any errors?
+	if (iErrors > 0)
+		appendMessagesError(tr("Session loaded with errors\nfrom \"%1\".\n\nSorry.").arg(sFilename));
+
     // Save as default session directory.
     if (m_pOptions)
         m_pOptions->sSessionDir = QFileInfo(sFilename).dirPath(true);
-    // We're not dirty anymore.
-    m_iDirtyCount = 0;
+	// We're not dirty anymore, if loaded without errors, 
+	m_iDirtyCount = iErrors;
     // Stabilize form...
     m_sFilename = sFilename;
     updateRecentFiles(sFilename);
@@ -666,16 +666,38 @@
 	QMap<int, int> audioDeviceMap;
 	piDeviceIDs = qsamplerDevice::getDevices(m_pClient, qsamplerDevice::Audio);
 	for (iDevice = 0; piDeviceIDs && piDeviceIDs[iDevice] >= 0; iDevice++) {
-		qsamplerDevice device(m_pClient, qsamplerDevice::Audio, piDeviceIDs[iDevice]);
 		ts << endl;
-        ts << "# " << device.deviceTypeName() << " " << device.driverName()
+		qsamplerDevice device(this, qsamplerDevice::Audio, piDeviceIDs[iDevice]);
+		// Audio device specification...
+		ts << "# " << device.deviceTypeName() << " " << device.driverName()
 		   << " " << tr("Device") << " " << iDevice << endl;
 		ts << "CREATE AUDIO_OUTPUT_DEVICE " << device.driverName();
-		const qsamplerDeviceParamMap& params = device.params();
-		qsamplerDeviceParamMap::ConstIterator iter;
-		for (iter = params.begin(); iter != params.end(); ++iter)
-			ts << " " << iter.key() << "='" << iter.data().value << "'";
+		qsamplerDeviceParamMap::ConstIterator deviceParam;
+		for (deviceParam = device.params().begin();
+				deviceParam != device.params().end();
+					++deviceParam) {
+			const qsamplerDeviceParam& param = deviceParam.data();
+			if (param.value.isEmpty()) ts << "# ";
+			ts << " " << deviceParam.key() << "='" << param.value << "'";
+		}
 		ts << endl;
+		// Audio channel parameters...
+		int iPort = 0;
+		for (qsamplerDevicePort *pPort = device.ports().first();
+				pPort;
+					pPort = device.ports().next(), ++iPort) {
+			qsamplerDeviceParamMap::ConstIterator portParam;
+			for (portParam = pPort->params().begin();
+					portParam != pPort->params().end();
+						++portParam) {
+				const qsamplerDeviceParam& param = portParam.data();
+				if (param.fix || param.value.isEmpty()) ts << "# ";
+				ts << "SET AUDIO_OUTPUT_CHANNEL_PARAMETER " << iDevice
+				   << " " << iPort << " " << portParam.key()
+				   << "='" << param.value << "'" << endl;
+			}
+		}
+		// Audio device index/id mapping.
 		audioDeviceMap[device.deviceID()] = iDevice;
         // Try to keep it snappy :)
         QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput);
@@ -684,16 +706,38 @@
 	QMap<int, int> midiDeviceMap;
 	piDeviceIDs = qsamplerDevice::getDevices(m_pClient, qsamplerDevice::Midi);
 	for (iDevice = 0; piDeviceIDs && piDeviceIDs[iDevice] >= 0; iDevice++) {
-		qsamplerDevice device(m_pClient, qsamplerDevice::Midi, piDeviceIDs[iDevice]);
 		ts << endl;
+		qsamplerDevice device(this, qsamplerDevice::Midi, piDeviceIDs[iDevice]);
+		// MIDI device specification...
         ts << "# " << device.deviceTypeName() << " " << device.driverName()
 		   << " " << tr("Device") << " " << iDevice << endl;
 		ts << "CREATE MIDI_INPUT_DEVICE " << device.driverName();
-		const qsamplerDeviceParamMap& params = device.params();
-		qsamplerDeviceParamMap::ConstIterator iter;
-		for (iter = params.begin(); iter != params.end(); ++iter)
-			ts << " " << iter.key() << "='" << iter.data().value << "'";
+		qsamplerDeviceParamMap::ConstIterator deviceParam;
+		for (deviceParam = device.params().begin();
+				deviceParam != device.params().end();
+					++deviceParam) {
+			const qsamplerDeviceParam& param = deviceParam.data();
+			if (param.value.isEmpty()) ts << "# ";
+			ts << " " << deviceParam.key() << "='" << param.value << "'";
+		}
 		ts << endl;
+		// MIDI port parameters...
+		int iPort = 0;
+		for (qsamplerDevicePort *pPort = device.ports().first();
+				pPort;
+					pPort = device.ports().next(), ++iPort) {
+			qsamplerDeviceParamMap::ConstIterator portParam;
+			for (portParam = pPort->params().begin();
+					portParam != pPort->params().end();
+						++portParam) {
+				const qsamplerDeviceParam& param = portParam.data();
+				if (param.fix || param.value.isEmpty()) ts << "# ";
+				ts << "SET MIDI_INPUT_PORT_PARAMETER " << iDevice
+				   << " " << iPort << " " << portParam.key()
+				   << "='" << param.value << "'" << endl;
+			}
+		}
+		// MIDI device index/id mapping.
 		midiDeviceMap[device.deviceID()] = iDevice;
         // Try to keep it snappy :)
         QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput);
@@ -1363,6 +1407,10 @@
 		QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput);
 	}
 	m_pWorkspace->setUpdatesEnabled(true);
+	
+	// Remember to refresh devices
+	if (m_pDeviceForm)
+	    m_pDeviceForm->refreshDevices();
 }