--- qsampler/trunk/src/qsamplerMainForm.ui.h	2005/08/19 17:10:16	751
+++ qsampler/trunk/src/qsamplerMainForm.ui.h	2006/06/01 09:32:01	871
@@ -45,8 +45,6 @@
 #include "qsamplerDeviceForm.h"
 #include "qsamplerOptionsForm.h"
 
-#include "config.h"
-
 #ifdef HAVE_SIGNAL_H
 #include <signal.h>
 #endif
@@ -473,10 +471,10 @@
 
     // Ask for the filename to open...
     QString sFilename = QFileDialog::getOpenFileName(
-            m_pOptions->sSessionDir,                // Start here.
-            tr("LSCP Session files") + " (*.lscp)", // Filter (LSCP files)
-            this, 0,                                // Parent and name (none)
-            tr("Open Session")                      // Caption.
+		m_pOptions->sSessionDir,                // Start here.
+		tr("LSCP Session files") + " (*.lscp)", // Filter (LSCP files)
+		this, 0,                                // Parent and name (none)
+		QSAMPLER_TITLE ": " + tr("Open Session")	// Caption.
     );
 
     // Have we cancelled?
@@ -507,10 +505,10 @@
             sFilename = m_pOptions->sSessionDir;
         // Prompt the guy...
         sFilename = QFileDialog::getSaveFileName(
-                sFilename,                              // Start here.
-                tr("LSCP Session files") + " (*.lscp)", // Filter (LSCP files)
-                this, 0,                                // Parent and name (none)
-                tr("Save Session")                      // Caption.
+			sFilename,                              // Start here.
+			tr("LSCP Session files") + " (*.lscp)", // Filter (LSCP files)
+			this, 0,                                // Parent and name (none)
+			QSAMPLER_TITLE ": " + tr("Save Session")	// Caption.
         );
         // Have we cancelled it?
         if (sFilename.isEmpty())
@@ -520,7 +518,8 @@
             sFilename += ".lscp";
         // Check if already exists...
         if (sFilename != m_sFilename && QFileInfo(sFilename).exists()) {
-            if (QMessageBox::warning(this, tr("Warning"),
+            if (QMessageBox::warning(this,
+				QSAMPLER_TITLE ": " + tr("Warning"),
                 tr("The file already exists:\n\n"
                    "\"%1\"\n\n"
                    "Do you want to replace it?")
@@ -542,7 +541,8 @@
 
     // Are we dirty enough to prompt it?
     if (m_iDirtyCount > 0) {
-        switch (QMessageBox::warning(this, tr("Warning"),
+        switch (QMessageBox::warning(this,
+			QSAMPLER_TITLE ": " + tr("Warning"),
             tr("The current session has been changed:\n\n"
             "\"%1\"\n\n"
             "Do you want to save the changes?")
@@ -600,7 +600,7 @@
     QTextStream ts(&file);
     while (!ts.atEnd()) {
         // Read the line.
-        QString sCommand = ts.readLine().simplifyWhiteSpace();
+        QString sCommand = ts.readLine().stripWhiteSpace();
         // If not empty, nor a comment, call the server...
         if (!sCommand.isEmpty() && sCommand[0] != '#') {
             appendMessagesColor(sCommand, "#996633");
@@ -787,11 +787,19 @@
                 ts << endl;
                 ts << "LOAD ENGINE " << pChannel->engineName() << " " << iChannel << endl;
                 ts << "LOAD INSTRUMENT NON_MODAL '" << pChannel->instrumentFile() << "' " << pChannel->instrumentNr() << " " << iChannel << endl;
+				qsamplerChannelRoutingMap::ConstIterator audioRoute;
+				for (audioRoute = pChannel->audioRouting().begin();
+						audioRoute != pChannel->audioRouting().end();
+							++audioRoute) {
+					ts << "SET CHANNEL AUDIO_OUTPUT_CHANNEL " << iChannel
+						<< " " << audioRoute.key()
+						<< " " << audioRoute.data() << endl;
+				}
                 ts << "SET CHANNEL VOLUME " << iChannel << " " << pChannel->volume() << endl;
-                if (pChannel->channelMute())
-                	ts << "SET CHANNEL MUTE " << iChannel << " 1" << endl;
-                if (pChannel->channelSolo())
-                	ts << "SET CHANNEL SOLO " << iChannel << " 1" << endl;
+				if (pChannel->channelMute())
+					ts << "SET CHANNEL MUTE " << iChannel << " 1" << endl;
+				if (pChannel->channelSolo())
+					ts << "SET CHANNEL SOLO " << iChannel << " 1" << endl;
                 ts << endl;
             }
         }
@@ -883,7 +891,8 @@
         return;
 
     // Ask user whether he/she want's an internal sampler reset...
-    if (QMessageBox::warning(this, tr("Warning"),
+    if (QMessageBox::warning(this,
+		QSAMPLER_TITLE ": " + tr("Warning"),
         tr("Resetting the sampler instance will close\n"
            "all device and channel configurations.\n\n"
            "Please note that this operation may cause\n"
@@ -918,7 +927,8 @@
     // Ask user whether he/she want's a complete restart...
     // (if we're currently up and running)
     if (bRestart && m_pClient) {
-        bRestart = (QMessageBox::warning(this, tr("Warning"),
+        bRestart = (QMessageBox::warning(this,
+			QSAMPLER_TITLE ": " + tr("Warning"),
             tr("New settings will be effective after\n"
                "restarting the client/server connection.\n\n"
                "Please note that this operation may cause\n"
@@ -994,7 +1004,8 @@
 
     // Prompt user if he/she's sure about this...
     if (m_pOptions && m_pOptions->bConfirmRemove) {
-        if (QMessageBox::warning(this, tr("Warning"),
+        if (QMessageBox::warning(this,
+			QSAMPLER_TITLE ": " + tr("Warning"),
             tr("About to remove channel:\n\n"
                "%1\n\n"
                "Are you sure?")
@@ -1177,7 +1188,8 @@
                 (!bOldStdoutCapture &&  m_pOptions->bStdoutCapture) ||
                 ( bOldKeepOnTop     && !m_pOptions->bKeepOnTop)     ||
                 (!bOldKeepOnTop     &&  m_pOptions->bKeepOnTop)) {
-                QMessageBox::information(this, tr("Information"),
+                QMessageBox::information(this,
+					QSAMPLER_TITLE ": " + tr("Information"),
                     tr("Some settings may be only effective\n"
                        "next time you start this program."), tr("OK"));
                 updateMessagesCapture();
@@ -1345,7 +1357,7 @@
     // Update the main application caption...
     QString sSessionName = sessionName(m_sFilename);
     if (m_iDirtyCount > 0)
-        sSessionName += '*';
+        sSessionName += " *";
     setCaption(tr(QSAMPLER_TITLE " - [%1]").arg(sSessionName));
 
     // Update the main menu state...
@@ -1609,7 +1621,8 @@
 
     appendMessagesColor(s.simplifyWhiteSpace(), "#ff0000");
 
-    QMessageBox::critical(this, tr("Error"), s, tr("Cancel"));
+    QMessageBox::critical(this,
+		QSAMPLER_TITLE ": " + tr("Error"), s, tr("Cancel"));
 }
 
 
@@ -1881,7 +1894,8 @@
 
     // Is the server process instance still here?
     if (m_pServer) {
-        switch (QMessageBox::warning(this, tr("Warning"),
+        switch (QMessageBox::warning(this,
+			QSAMPLER_TITLE ": " + tr("Warning"),
             tr("Could not start the LinuxSampler server.\n\n"
                "Maybe it ss already started."),
             tr("Stop"), tr("Kill"), tr("Cancel"))) {