--- linuxsampler/trunk/src/network/lscpserver.cpp	2007/01/04 14:43:02	1009
+++ linuxsampler/trunk/src/network/lscpserver.cpp	2007/03/22 20:39:04	1108
@@ -75,12 +75,15 @@
     LSCPEvent::RegisterEvent(LSCPEvent::event_stream_count, "STREAM_COUNT");
     LSCPEvent::RegisterEvent(LSCPEvent::event_buffer_fill, "BUFFER_FILL");
     LSCPEvent::RegisterEvent(LSCPEvent::event_channel_info, "CHANNEL_INFO");
+    LSCPEvent::RegisterEvent(LSCPEvent::event_fx_send_count, "FX_SEND_COUNT");
+    LSCPEvent::RegisterEvent(LSCPEvent::event_fx_send_info, "FX_SEND_INFO");
     LSCPEvent::RegisterEvent(LSCPEvent::event_midi_instr_map_count, "MIDI_INSTRUMENT_MAP_COUNT");
     LSCPEvent::RegisterEvent(LSCPEvent::event_midi_instr_map_info, "MIDI_INSTRUMENT_MAP_INFO");
     LSCPEvent::RegisterEvent(LSCPEvent::event_midi_instr_count, "MIDI_INSTRUMENT_COUNT");
     LSCPEvent::RegisterEvent(LSCPEvent::event_midi_instr_info, "MIDI_INSTRUMENT_INFO");
     LSCPEvent::RegisterEvent(LSCPEvent::event_misc, "MISCELLANEOUS");
     LSCPEvent::RegisterEvent(LSCPEvent::event_total_voice_count, "TOTAL_VOICE_COUNT");
+    LSCPEvent::RegisterEvent(LSCPEvent::event_global_info, "GLOBAL_INFO");
     hSocket = -1;
 }
 
@@ -148,6 +151,15 @@
                 if ((*itEngineChannel)->StatusChanged()) {
                     SendLSCPNotify(LSCPEvent(LSCPEvent::event_channel_info, (*itEngineChannel)->iSamplerChannelIndex));
                 }
+
+                for (int i = 0; i < (*itEngineChannel)->GetFxSendCount(); i++) {
+                    FxSend* fxs = (*itEngineChannel)->GetFxSend(i);
+                    if(fxs != NULL && fxs->IsInfoChanged()) {
+                        int chn = (*itEngineChannel)->iSamplerChannelIndex;
+                        LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_fx_send_info, chn, fxs->Id()));
+                        fxs->SetInfoChanged(false);
+                    }
+                }
             }
         }
 
@@ -1567,7 +1579,7 @@
     }
 }
 
-String LSCPServer::AddOrReplaceMIDIInstrumentMapping(uint MidiMapID, uint MidiBank, uint MidiProg, String EngineType, String InstrumentFile, uint InstrumentIndex, float Volume, MidiInstrumentMapper::mode_t LoadMode, String Name) {
+String LSCPServer::AddOrReplaceMIDIInstrumentMapping(uint MidiMapID, uint MidiBank, uint MidiProg, String EngineType, String InstrumentFile, uint InstrumentIndex, float Volume, MidiInstrumentMapper::mode_t LoadMode, String Name, bool bModal) {
     dmsg(2,("LSCPServer: AddOrReplaceMIDIInstrumentMapping()\n"));
 
     midi_prog_index_t idx;
@@ -1585,9 +1597,11 @@
 
     LSCPResultSet result;
     try {
-        // PERSISTENT mapping commands might bloock for a long time, so in
-        // that case we add/replace the mapping in another thread
-        bool bInBackground = (entry.LoadMode == MidiInstrumentMapper::PERSISTENT);
+        // PERSISTENT mapping commands might block for a long time, so in
+        // that case we add/replace the mapping in another thread in case
+        // the NON_MODAL argument was supplied, non persistent mappings
+        // should return immediately, so we don't need to do that for them
+        bool bInBackground = (entry.LoadMode == MidiInstrumentMapper::PERSISTENT && !bModal);
         MidiInstrumentMapper::AddOrReplaceEntry(MidiMapID, idx, entry, bInBackground);
     } catch (Exception e) {
         result.Error(e);
@@ -1979,6 +1993,8 @@
 
         // success
         result.Add("NAME", pFxSend->Name());
+        result.Add("MIDI_CONTROLLER", pFxSend->MidiController());
+        result.Add("LEVEL", ToString(pFxSend->Level()));
         result.Add("AUDIO_OUTPUT_ROUTING", AudioRouting);
     } catch (Exception e) {
         result.Error(e);
@@ -2006,6 +2022,61 @@
         if (!pFxSend) throw Exception("There is no FxSend with that ID on the given sampler channel");
 
         pFxSend->SetDestinationChannel(FxSendChannel, DeviceChannel);
+        LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_fx_send_info, uiSamplerChannel, FxSendID));
+    } catch (Exception e) {
+        result.Error(e);
+    }
+    return result.Produce();
+}
+
+String LSCPServer::SetFxSendMidiController(uint uiSamplerChannel, uint FxSendID, uint MidiController) {
+    dmsg(2,("LSCPServer: SetFxSendMidiController()\n"));
+    LSCPResultSet result;
+    try {
+        SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
+        if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
+
+        EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
+        if (!pEngineChannel) throw Exception("There is no engine deployed on this sampler channel yet");
+
+        FxSend* pFxSend = NULL;
+        for (int i = 0; i < pEngineChannel->GetFxSendCount(); i++) {
+            if (pEngineChannel->GetFxSend(i)->Id() == FxSendID) {
+                pFxSend = pEngineChannel->GetFxSend(i);
+                break;
+            }
+        }
+        if (!pFxSend) throw Exception("There is no FxSend with that ID on the given sampler channel");
+
+        pFxSend->SetMidiController(MidiController);
+        LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_fx_send_info, uiSamplerChannel, FxSendID));
+    } catch (Exception e) {
+        result.Error(e);
+    }
+    return result.Produce();
+}
+
+String LSCPServer::SetFxSendLevel(uint uiSamplerChannel, uint FxSendID, double dLevel) {
+    dmsg(2,("LSCPServer: SetFxSendLevel()\n"));
+    LSCPResultSet result;
+    try {
+        SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
+        if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
+
+        EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
+        if (!pEngineChannel) throw Exception("There is no engine deployed on this sampler channel yet");
+
+        FxSend* pFxSend = NULL;
+        for (int i = 0; i < pEngineChannel->GetFxSendCount(); i++) {
+            if (pEngineChannel->GetFxSend(i)->Id() == FxSendID) {
+                pFxSend = pEngineChannel->GetFxSend(i);
+                break;
+            }
+        }
+        if (!pFxSend) throw Exception("There is no FxSend with that ID on the given sampler channel");
+
+        pFxSend->SetLevel((float)dLevel);
+        LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_fx_send_info, uiSamplerChannel, FxSendID));
     } catch (Exception e) {
         result.Error(e);
     }
@@ -2085,6 +2156,7 @@
     try {
         if (dVolume < 0) throw Exception("Volume may not be negative");
         GLOBAL_VOLUME = dVolume; // see common/global.cpp
+        LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_global_info, "VOLUME", GLOBAL_VOLUME));
     } catch (Exception e) {
         result.Error(e);
     }