diff options
| author | Ben Reynwar | 2010-12-03 21:30:27 -0700 |
|---|---|---|
| committer | Ben Reynwar | 2010-12-03 21:30:27 -0700 |
| commit | ed55c41ce13558b840654cea9c959d32dbaed174 (patch) | |
| tree | e62a8db9087e17a908195dee470b49a176cbda1c /gr-audio-jack/src/audio_jack_sink.cc | |
| parent | 26e7851318dfc691fd4412823a392a15bd1c475e (diff) | |
| parent | dd656e9db5e69ed6b11653deea710e299d72827e (diff) | |
| download | gnuradio-ed55c41ce13558b840654cea9c959d32dbaed174.tar.gz gnuradio-ed55c41ce13558b840654cea9c959d32dbaed174.tar.bz2 gnuradio-ed55c41ce13558b840654cea9c959d32dbaed174.zip | |
Merge branch 'grorg-master'
Diffstat (limited to 'gr-audio-jack/src/audio_jack_sink.cc')
| -rw-r--r-- | gr-audio-jack/src/audio_jack_sink.cc | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/gr-audio-jack/src/audio_jack_sink.cc b/gr-audio-jack/src/audio_jack_sink.cc index 6e39135c9..f28fddc34 100644 --- a/gr-audio-jack/src/audio_jack_sink.cc +++ b/gr-audio-jack/src/audio_jack_sink.cc @@ -105,12 +105,17 @@ audio_jack_sink::audio_jack_sink (int sampling_rate, d_nunderuns (0) { #ifndef NO_PTHREAD - pthread_cond_init(&d_ringbuffer_ready, NULL);; - pthread_mutex_init(&d_jack_process_lock, NULL); + pthread_cond_init(&d_ringbuffer_ready, NULL);; + pthread_mutex_init(&d_jack_process_lock, NULL); #endif - + // try to become a client of the JACK server - if ((d_jack_client = jack_client_new (d_device_name.c_str ())) == 0) { + jack_options_t options = JackNullOption; + jack_status_t status; + const char *server_name = NULL; + if ((d_jack_client = jack_client_open (d_device_name.c_str (), + options, &status, + server_name)) == NULL) { fprintf (stderr, "audio_jack_sink[%s]: jack server not running?\n", d_device_name.c_str()); throw std::runtime_error ("audio_jack_sink"); |