--- linuxsampler/trunk/src/network/lscpserver.h 2004/07/03 20:08:07 170 +++ linuxsampler/trunk/src/network/lscpserver.h 2004/07/24 12:33:49 210 @@ -66,6 +66,7 @@ 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(); @@ -97,6 +98,7 @@ 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); @@ -115,10 +117,14 @@ String ResetChannel(uint uiSamplerChannel); 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 bufferedCommands; + + static void SendLSCPNotify( LSCPEvent Event ); + protected: int hSocket; sockaddr_in SocketAddress; @@ -126,15 +132,13 @@ int Main(); ///< Implementation of virtual method from class Thread - static void SendLSCPNotify( LSCPEvent Event ); - private: - + /** * Find a created audio output device index. */ int GetAudioOutputDeviceIndex (AudioOutputDevice *pDevice); - + /** * Find a created midi input device index. */ @@ -143,9 +147,9 @@ static std::map bufferedNotifies; static Mutex NotifyMutex; static Mutex NotifyBufferMutex; - static bool GetLSCPCommand( std::vector::iterator iter ); - static void CloseConnection( std::vector::iterator iter ); - static std::vector hSessions; + static bool GetLSCPCommand( std::vector::iterator iter ); + static void CloseConnection( std::vector::iterator iter ); + static std::vector Sessions; static Mutex SubscriptionMutex; static std::map< LSCPEvent::event_t, std::list > eventSubscriptions; static fd_set fdSet;