--- linuxsampler/trunk/src/network/lscpserver.h	2004/06/20 23:18:24	138
+++ linuxsampler/trunk/src/network/lscpserver.h	2004/08/22 14:46:47	225
@@ -26,28 +26,32 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <sys/select.h>
+#include <sys/time.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
 #include <netdb.h>
 
+#include <list>
+
 #include "lscp.h"
 #include "lscpparser.h"
+#include "lscp.h"
+#include "lscpevent.h"
 #include "../Sampler.h"
 #include "../common/Thread.h"
+#include "../common/Mutex.h"
+#include "../common/Condition.h"
 
 /// TCP Port on which the server should listen for connection requests.
 #define LSCP_PORT 8888
 
 using namespace LinuxSampler;
 
-/// Handle for a client connection (FIXME: doesn't work for more than one network connections of course, thus has to be included to the yyparse() parameters instead).
-extern int hSession;
-
 // External references to the main scanner and parser functions
 extern int yyparse(void* YYPARSE_PARAM);
-extern int yylex_init(yyscan_t* scanner);
-extern int yylex_destroy(yyscan_t yyscanner);
+extern void restart(yyparse_param_t* pparam, int& yychar);
 
 /**
  * Network server for the LinuxSampler Control Protocol (LSCP).
@@ -55,13 +59,15 @@
 class LSCPServer : public Thread {
     public:
         LSCPServer(Sampler* pSampler);
+        int WaitUntilInitialized(long TimeoutSeconds = 0L, long TimeoutNanoSeconds = 0L);
 
         // Methods called by the parser
-        String CreateAudioOutputDevice(String Driver, std::map<String,String> Parameters = StringMap());
         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();
+        String ListChannels();
         String AddChannel();
         String RemoveChannel(uint uiSamplerChannel);
         String GetAvailableEngines();
@@ -71,65 +77,86 @@
         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 GetMidiInputPortParameterInfo(uint DeviceId, uint PortId, String ParameterName);
         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 SetMIDIInputType(String MidiInputDriver, uint uiSamplerChannel);
-        String SetMIDIInputPort(String MIDIInputPort, uint uiSamplerchannel);
-        String SetMIDIInputChannel(uint MIDIChannel, uint uiSamplerChannel);
         String SetAudioOutputDevice(uint AudioDeviceId, uint SamplerChannel);
-        String SetVolume(double Volume, uint uiSamplerChannel);
+        String SetAudioOutputType(String AudioOutputDriver, uint uiSamplerChannel);
+        String SetMIDIInputPort(uint MIDIPort, uint uiSamplerChannel);
+        String SetMIDIInputChannel(uint MIDIChannel, uint uiSamplerChannel);
+        String SetMIDIInputDevice(uint MIDIDeviceId, uint uiSamplerChannel);
+        String SetMIDIInputType(String MidiInputDriver, uint uiSamplerChannel);
+        String SetMIDIInput(uint MIDIDeviceId, uint MIDIPort, uint MIDIChannel, uint uiSamplerChannel);
+        String SetVolume(double dVolume, uint uiSamplerChannel);
         String ResetChannel(uint uiSamplerChannel);
-        String SubscribeNotification(event_t Event);
-        String UnsubscribeNotification(event_t Event);
+        String ResetSampler();
+        String SubscribeNotification(LSCPEvent::event_t);
+        String UnsubscribeNotification(LSCPEvent::event_t);
+        String SetEcho(yyparse_param_t* pSession, double boolean_value);
         void   AnswerClient(String ReturnMessage);
+
+	static int currentSocket;
+	static std::map<int,String> bufferedCommands;
+
+	static void SendLSCPNotify( LSCPEvent Event );
+
     protected:
         int            hSocket;
         sockaddr_in    SocketAddress;
         Sampler*       pSampler;
+        Condition      Initialized;
 
         int Main(); ///< Implementation of virtual method from class Thread
+
     private:
+
         /**
-         * Converts a result_t structure into a valid LSCP answer message.
+         * Find a created audio output device index.
          */
-        inline String ConvertResult(result_t result) {
-            switch (result.type) {
-                case result_type_success: {
-                    return "OK\r\n";
-                }
-                case result_type_warning: {
-                    std::stringstream ss;
-                    ss << "WRN:" << result.code << ":" << result.message << "\r\n";
-                    return ss.str();
-                }
-                case result_type_error: {
-                    std::stringstream ss;
-                    ss << "ERR:" << result.code << ":" << result.message << "\r\n";
-                    return ss.str();
-                }
-            }
-        }
-
-        template<class T> inline String ToString(T o) {
-            std::stringstream ss;
-            ss << o;
-            return ss.str();
-        }
-};
+        int GetAudioOutputDeviceIndex (AudioOutputDevice *pDevice);
 
+        /**
+         * Find a created midi input device index.
+         */
+        int GetMidiInputDeviceIndex (MidiInputDevice *pDevice);
+
+	static std::map<int,String> bufferedNotifies;
+	static Mutex NotifyMutex;
+	static Mutex NotifyBufferMutex;
+	static bool GetLSCPCommand( std::vector<yyparse_param_t>::iterator iter );
+	static void CloseConnection( std::vector<yyparse_param_t>::iterator iter );
+	static std::vector<yyparse_param_t> Sessions;
+	static Mutex SubscriptionMutex;
+	static std::map< LSCPEvent::event_t, std::list<int> > eventSubscriptions;
+	static fd_set fdSet;
+};
 
 /**
  * Instrument loader thread for the LinuxSampler Control Protocol (LSCP).