--- linuxsampler/trunk/src/network/lscpserver.h	2004/06/23 18:54:08	143
+++ linuxsampler/trunk/src/network/lscpserver.h	2004/06/28 04:30:11	155
@@ -58,6 +58,7 @@
 
         // Methods called by the parser
         String DestroyAudioOutputDevice(uint DeviceIndex);
+        String DestroyMidiInputDevice(uint DeviceIndex);
         String LoadInstrument(String Filename, uint uiInstrument, uint uiSamplerChannel, bool bBackground = false);
         String LoadEngine(String EngineName, uint uiSamplerChannel);
         String GetChannels();
@@ -70,27 +71,38 @@
         String GetStreamCount(uint uiSamplerChannel);
         String GetBufferFill(fill_response_t ResponseType, uint uiSamplerChannel);
         String GetAvailableAudioOutputDrivers();
+        String GetAvailableMidiInputDrivers();
         String GetAudioOutputDriverInfo(String Driver);
+        String GetMidiInputDriverInfo(String Driver);
 #ifdef __GNUC__
         typedef std::map<String,String> StringMap; // nasty workaround for a GCC bug (see GCC bug #15980, #57)
         String GetAudioOutputDriverParameterInfo(String Driver, String Parameter, std::map<String,String> DependencyList = StringMap());
+        String GetMidiInputDriverParameterInfo(String Driver, String Parameter, std::map<String,String> DependencyList = StringMap());
         String CreateAudioOutputDevice(String Driver, std::map<String,String> Parameters = StringMap());
+        String CreateMidiInputDevice(String Driver, std::map<String,String> Parameters = StringMap());
 #else
         String GetAudioOutputDriverParameterInfo(String Driver, String Parameter, std::map<String,String> DependencyList = std::map<String,String>());
+        String GetMidiInputDriverParameterInfo(String Driver, String Parameter, std::map<String,String> DependencyList = std::map<String,String>());
         String CreateAudioOutputDevice(String Driver, std::map<String,String> Parameters = std::map<String,String>());
+        String CreateMidiInputDevice(String Driver, std::map<String,String> Parameters = std::map<String,String>());
 #endif // __GNUC__
         String GetAudioOutputDeviceCount();
+        String GetMidiInputDeviceCount();
         String GetAudioOutputDevices();
+        String GetMidiInputDevices();
         String GetAudioOutputDeviceInfo(uint DeviceIndex);
+        String GetMidiInputDeviceInfo(uint DeviceIndex);
+        String GetMidiInputPortInfo(uint DeviceIndex, uint PortIndex);
         String GetAudioOutputChannelInfo(uint DeviceId, uint ChannelId);
         String GetAudioOutputChannelParameterInfo(uint DeviceId, uint ChannelId, String ParameterName);
         String SetAudioOutputChannelParameter(uint DeviceId, uint ChannelId, String ParamKey, String ParamVal);
         String SetAudioOutputDeviceParameter(uint DeviceIndex, String ParamKey, String ParamVal);
+        String SetMidiInputDeviceParameter(uint DeviceIndex, String ParamKey, String ParamVal);
+	String SetMidiInputPortParameter(uint DeviceIndex, uint PortIndex, String ParamKey, String ParamVal);
         String SetAudioOutputChannel(uint ChannelAudioOutputChannel, uint AudioOutputDeviceInputChannel, uint uiSamplerChannel);
         String SetAudioOutputType(String AudioOutputDriver, uint uiSamplerChannel);
         String SetMIDIInputType(String MidiInputDriver, uint uiSamplerChannel);
-        String SetMIDIInputPort(String MIDIInputPort, uint uiSamplerchannel);
-        String SetMIDIInputChannel(uint MIDIChannel, uint uiSamplerChannel);
+        String SetMIDIInput(uint MIDIDevice, uint MIDIPort, uint MIDIChannel, uint uiSamplerChannel);
         String SetAudioOutputDevice(uint AudioDeviceId, uint SamplerChannel);
         String SetVolume(double Volume, uint uiSamplerChannel);
         String ResetChannel(uint uiSamplerChannel);
@@ -109,6 +121,11 @@
          * Find a created audio output device index.
          */
         int GetAudioOutputDeviceIndex (AudioOutputDevice *pDevice);
+	
+        /**
+         * Find a created midi input device index.
+         */
+        int GetMidiInputDeviceIndex (MidiInputDevice *pDevice);
 
         /**
          * Converts a result_t structure into a valid LSCP answer message.