--- qsampler/trunk/src/qsamplerChannel.cpp	2006/12/03 18:26:13	961
+++ qsampler/trunk/src/qsamplerChannel.cpp	2007/01/11 16:14:31	1022
@@ -1,7 +1,7 @@
 // qsamplerChannel.cpp
 //
 /****************************************************************************
-   Copyright (C) 2004-2006, rncbc aka Rui Nuno Capela. All rights reserved.
+   Copyright (C) 2004-2007, rncbc aka Rui Nuno Capela. All rights reserved.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License
@@ -53,6 +53,7 @@
 	m_iMidiDevice       = -1;
 	m_iMidiPort         = -1;
 	m_iMidiChannel      = -1;
+	m_iMidiMap          = -1;
 	m_sAudioDriver      = "ALSA";
 	m_iAudioDevice      = -1;
 	m_fVolume           = 0.0;
@@ -341,6 +342,34 @@
 }
 
 
+// MIDI instrument map accessor.
+int qsamplerChannel::midiMap (void) const
+{
+	return m_iMidiMap;
+}
+
+bool qsamplerChannel::setMidiMap ( int iMidiMap )
+{
+	qsamplerMainForm *pMainForm = qsamplerMainForm::getInstance();
+	if (pMainForm == NULL)
+		return false;
+	if (pMainForm->client() == NULL || m_iChannelID < 0)
+		return false;
+	if (m_iInstrumentStatus == 100 && m_iMidiMap == iMidiMap)
+		return true;
+#ifdef CONFIG_MIDI_INSTRUMENT
+	if (::lscp_set_channel_midi_map(pMainForm->client(), m_iChannelID, iMidiMap) != LSCP_OK) {
+		appendMessagesClient("lscp_set_channel_midi_map");
+		return false;
+	}
+#endif
+	appendMessages(QObject::tr("MIDI map: %1.").arg(iMidiMap));
+
+	m_iMidiMap = iMidiMap;
+	return true;
+}
+
+
 // Audio device accessor.
 int qsamplerChannel::audioDevice (void) const
 {
@@ -571,6 +600,9 @@
 	m_iMidiDevice       = pChannelInfo->midi_device;
 	m_iMidiPort         = pChannelInfo->midi_port;
 	m_iMidiChannel      = pChannelInfo->midi_channel;
+#ifdef CONFIG_MIDI_INSTRUMENT
+	m_iMidiMap          = pChannelInfo->midi_map;
+#endif
 	m_iAudioDevice      = pChannelInfo->audio_device;
 	m_fVolume           = pChannelInfo->volume;
 #ifdef CONFIG_MUTE_SOLO
@@ -607,10 +639,15 @@
 
 	// Set the audio routing map.
 	m_audioRouting.clear();
-	char **ppszRouting = pChannelInfo->audio_routing;
-	for (int i = 0; ppszRouting && ppszRouting[i]; i++) {
-		m_audioRouting[i] = ::atoi(ppszRouting[i]);
-	}
+#ifdef CONFIG_AUDIO_ROUTING
+	int *piAudioRouting = pChannelInfo->audio_routing;
+	for (int i = 0; piAudioRouting && piAudioRouting[i] >= 0; i++)
+		m_audioRouting[i] = piAudioRouting[i];
+#else
+	char **ppszAudioRouting = pChannelInfo->audio_routing;
+	for (int i = 0; ppszAudioRouting && ppszAudioRouting[i]; i++)
+		m_audioRouting[i] = ::atoi(ppszAudioRouting[i]);
+#endif
 
 	return true;
 }