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

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

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

revision 1682 by schoenebeck, Wed Feb 13 15:31:56 2008 UTC revision 1748 by persson, Sun Jun 22 14:46:46 2008 UTC
# Line 249  namespace LinuxSampler { Line 249  namespace LinuxSampler {
249      }      }
250    
251      String AudioOutputDeviceJack::Version() {      String AudioOutputDeviceJack::Version() {
252         String s = "$Revision: 1.23 $";         String s = "$Revision: 1.24 $";
253         return s.substr(11, s.size() - 13); // cut dollar signs, spaces and CVS macro keyword         return s.substr(11, s.size() - 13); // cut dollar signs, spaces and CVS macro keyword
254      }      }
255    
# Line 305  namespace LinuxSampler { Line 305  namespace LinuxSampler {
305          audio = midi = false;          audio = midi = false;
306          if (Name.size() >= jack_client_name_size())          if (Name.size() >= jack_client_name_size())
307              throw Exception("JACK client name too long");              throw Exception("JACK client name too long");
308          if ((hJackClient = jack_client_new(Name.c_str())) == 0)  #if HAVE_JACK_CLIENT_OPEN
309            hJackClient = jack_client_open(Name.c_str(), JackNullOption, NULL);
310    #else
311            hJackClient = jack_client_new(Name.c_str());
312    #endif
313            if (!hJackClient)
314              throw Exception("Seems Jack server is not running.");              throw Exception("Seems Jack server is not running.");
315          jack_set_process_callback(hJackClient, linuxsampler_libjack_process_callback, this);          jack_set_process_callback(hJackClient, linuxsampler_libjack_process_callback, this);
316          jack_on_shutdown(hJackClient, linuxsampler_libjack_shutdown_callback, this);          jack_on_shutdown(hJackClient, linuxsampler_libjack_shutdown_callback, this);
Legend:
Removed from v.1682  
changed lines
  Added in v.1748
  ViewVC Help
Powered by ViewVC