/[svn]/linuxsampler/trunk/src/network/lscpserver.h
ViewVC logotype

Diff of /linuxsampler/trunk/src/network/lscpserver.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 778 by iliev, Fri Sep 23 06:58:26 2005 UTC revision 947 by schoenebeck, Mon Nov 27 21:34:55 2006 UTC
# Line 3  Line 3 
3   *   LinuxSampler - modular, streaming capable sampler                     *   *   LinuxSampler - modular, streaming capable sampler                     *
4   *                                                                         *   *                                                                         *
5   *   Copyright (C) 2003, 2004 by Benno Senoner and Christian Schoenebeck   *   *   Copyright (C) 2003, 2004 by Benno Senoner and Christian Schoenebeck   *
6   *   Copyright (C) 2005 Christian Schoenebeck                              *   *   Copyright (C) 2005, 2006 Christian Schoenebeck                        *
7   *                                                                         *   *                                                                         *
8   *   This library is free software; you can redistribute it and/or modify  *   *   This library is free software; you can redistribute it and/or modify  *
9   *   it under the terms of the GNU General Public License as published by  *   *   it under the terms of the GNU General Public License as published by  *
# Line 40  Line 40 
40  #include "lscpparser.h"  #include "lscpparser.h"
41  #include "lscp.h"  #include "lscp.h"
42  #include "lscpevent.h"  #include "lscpevent.h"
 #include "lscpinstrumentloader.h"  
43  #include "../Sampler.h"  #include "../Sampler.h"
44  #include "../common/Thread.h"  #include "../common/Thread.h"
45  #include "../common/Mutex.h"  #include "../common/Mutex.h"
46  #include "../common/Condition.h"  #include "../common/Condition.h"
47    
48    #include "../drivers/midi/MidiInstrumentMapper.h"
49    
50  /// TCP Port on which the server should listen for connection requests.  /// TCP Port on which the server should listen for connection requests.
51  #define LSCP_ADDR INADDR_ANY  #define LSCP_ADDR INADDR_ANY
52  #define LSCP_PORT 8888  #define LSCP_PORT 8888
# Line 127  class LSCPServer : public Thread { Line 128  class LSCPServer : public Thread {
128          String SetVolume(double dVolume, uint uiSamplerChannel);          String SetVolume(double dVolume, uint uiSamplerChannel);
129          String SetChannelMute(bool bMute, uint uiSamplerChannel);          String SetChannelMute(bool bMute, uint uiSamplerChannel);
130          String SetChannelSolo(bool bSolo, uint uiSamplerChannel);          String SetChannelSolo(bool bSolo, uint uiSamplerChannel);
131            String AddOrReplaceMIDIInstrumentMapping(uint MidiBankMSB, uint MidiBankLSB, uint MidiProg, String EngineType, String InstrumentFile, uint InstrumentIndex, float Volume, MidiInstrumentMapper::mode_t LoadMode, String Name);
132            String RemoveMIDIInstrumentMapping(uint MidiBankMSB, uint MidiBankLSB, uint MidiProg);
133            String GetMidiIstrumentMappings();
134            String GetMidiInstrumentMapping(uint MidiBankMSB, uint MidiBankLSB, uint MidiProg);
135            String ListMidiInstrumentMappings();
136            String ClearMidiInstrumentMappings();
137          String ResetChannel(uint uiSamplerChannel);          String ResetChannel(uint uiSamplerChannel);
138          String ResetSampler();          String ResetSampler();
139          String GetServerInfo();          String GetServerInfo();
# Line 151  class LSCPServer : public Thread { Line 158  class LSCPServer : public Thread {
158          sockaddr_in    SocketAddress;          sockaddr_in    SocketAddress;
159          Sampler*       pSampler;          Sampler*       pSampler;
160          Condition      Initialized;          Condition      Initialized;
         LSCPInstrumentLoader InstrumentLoader; ///< thread responsible for loading instruments in the background  
161    
162          int Main(); ///< Implementation of virtual method from class Thread          int Main(); ///< Implementation of virtual method from class Thread
163    

Legend:
Removed from v.778  
changed lines
  Added in v.947

  ViewVC Help
Powered by ViewVC