/[svn]/linuxsampler/trunk/src/drivers/audio/AudioOutputDeviceJack.h
ViewVC logotype

Diff of /linuxsampler/trunk/src/drivers/audio/AudioOutputDeviceJack.h

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

revision 1681 by persson, Sun Jan 27 15:07:11 2008 UTC revision 1682 by schoenebeck, Wed Feb 13 15:31:56 2008 UTC
# Line 34  Line 34 
34    
35  #include "AudioOutputDevice.h"  #include "AudioOutputDevice.h"
36  #include "../../common/ConditionServer.h"  #include "../../common/ConditionServer.h"
37    
38    #if HAVE_JACK_MIDI
39  #include "../midi/MidiInputDeviceJack.h"  #include "../midi/MidiInputDeviceJack.h"
40    #endif
41    
42  namespace LinuxSampler {  namespace LinuxSampler {
43    
# Line 158  namespace LinuxSampler { Line 161  namespace LinuxSampler {
161              int Process(uint Samples);              int Process(uint Samples);
162              void Stop();              void Stop();
163              void SetAudioOutputDevice(AudioOutputDeviceJack* device);              void SetAudioOutputDevice(AudioOutputDeviceJack* device);
164                #if HAVE_JACK_MIDI
165              void SetMidiInputDevice(MidiInputDeviceJack* device);              void SetMidiInputDevice(MidiInputDeviceJack* device);
166                #endif
167    
168              jack_client_t* hJackClient;              jack_client_t* hJackClient;
169    
# Line 166  namespace LinuxSampler { Line 171  namespace LinuxSampler {
171              static std::map<String, JackClient*> Clients;              static std::map<String, JackClient*> Clients;
172              struct config_t {              struct config_t {
173                  AudioOutputDeviceJack* AudioDevice;                  AudioOutputDeviceJack* AudioDevice;
174                    #if HAVE_JACK_MIDI
175                  MidiInputDeviceJack* MidiDevice;                  MidiInputDeviceJack* MidiDevice;
176                    #endif
177              };              };
178              SynchronizedConfig<config_t> Config;              SynchronizedConfig<config_t> Config;
179              SynchronizedConfig<config_t>::Reader ConfigReader;              SynchronizedConfig<config_t>::Reader ConfigReader;
Legend:
Removed from v.1681  
changed lines
  Added in v.1682
  ViewVC Help
Powered by ViewVC