--- qsampler/trunk/src/qsamplerInstrument.cpp	2007/11/20 16:48:04	1499
+++ qsampler/trunk/src/qsamplerInstrument.cpp	2007/11/25 11:40:47	1523
@@ -24,6 +24,7 @@
 #include "qsamplerInstrument.h"
 #include "qsamplerUtilities.h"
 
+#include "qsamplerOptions.h"
 #include "qsamplerMainForm.h"
 
 
@@ -39,7 +40,7 @@
 	m_iMap          = iMap;
 	m_iBank         = iBank;
 	m_iProg         = iProg;
-	m_iInstrumentNr = 0;;
+	m_iInstrumentNr = 0;
 	m_fVolume       = 1.0f;
 	m_iLoadMode     = 0;
 }
@@ -197,9 +198,7 @@
 			m_sEngineName.toUtf8().constData(),
 			qsamplerUtilities::lscpEscapePath(
 				m_sInstrumentFile).toUtf8().constData(),
-			m_iInstrumentNr,
-			m_fVolume,
-			load_mode,
+			m_iInstrumentNr, m_fVolume, load_mode,
 			m_sName.toUtf8().constData()) != LSCP_OK) {
 		pMainForm->appendMessagesClient("lscp_map_midi_instrument");
 		return false;
@@ -275,12 +274,14 @@
 		return false;
 	}
 
-	m_sName           = qsamplerUtilities::lscpEscapedTextToRaw(pInstrInfo->name);
-	m_sEngineName     = pInstrInfo->engine_name;
-	m_sInstrumentName = qsamplerUtilities::lscpEscapedTextToRaw(pInstrInfo->instrument_name);
-	m_sInstrumentFile = qsamplerUtilities::lscpEscapedPathToPosix(pInstrInfo->instrument_file);
-	m_iInstrumentNr   = pInstrInfo->instrument_nr;
-	m_fVolume         = pInstrInfo->volume;
+	m_sName = qsamplerUtilities::lscpEscapedTextToRaw(pInstrInfo->name);
+	m_sEngineName = pInstrInfo->engine_name;
+	m_sInstrumentName = qsamplerUtilities::lscpEscapedTextToRaw(
+		pInstrInfo->instrument_name);
+	m_sInstrumentFile = qsamplerUtilities::lscpEscapedPathToPosix(
+		pInstrInfo->instrument_file);
+	m_iInstrumentNr = pInstrInfo->instrument_nr;
+	m_fVolume = pInstrInfo->volume;
 
 	switch (pInstrInfo->load_mode) {
 		case LSCP_LOAD_PERSISTENT:
@@ -359,7 +360,8 @@
 		if (::lscp_client_get_errno(pMainForm->client()))
 			pMainForm->appendMessagesClient("lscp_get_midi_instrument_name");
 	}
-	sMapName = QString("%1 - %2").arg(iMidiMap).arg(qsamplerUtilities::lscpEscapedTextToRaw(pszMapName));
+	sMapName = QString("%1 - %2").arg(iMidiMap)
+		.arg(qsamplerUtilities::lscpEscapedTextToRaw(pszMapName));
 #endif
 
 	return sMapName;