diff options
| author | Tom Rondeau | 2010-11-24 17:24:58 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2010-11-24 17:24:58 -0500 |
| commit | d7f501f61362652030ccfcb740dbb03b33f4689e (patch) | |
| tree | 4cc8441a8666a1ed26b3eb8fb9118c995127809d /gr-audio-jack | |
| parent | ed307f12857545b5c034532e261b6ac2dadcf5fe (diff) | |
| parent | e5198a304a12410da8936a16900feba2fad1edae (diff) | |
| download | gnuradio-d7f501f61362652030ccfcb740dbb03b33f4689e.tar.gz gnuradio-d7f501f61362652030ccfcb740dbb03b33f4689e.tar.bz2 gnuradio-d7f501f61362652030ccfcb740dbb03b33f4689e.zip | |
Merge branch 'warnings'
Diffstat (limited to 'gr-audio-jack')
| -rw-r--r-- | gr-audio-jack/src/audio_jack_sink.cc | 13 | ||||
| -rw-r--r-- | gr-audio-jack/src/audio_jack_source.cc | 7 |
2 files changed, 15 insertions, 5 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"); diff --git a/gr-audio-jack/src/audio_jack_source.cc b/gr-audio-jack/src/audio_jack_source.cc index ca3df51d7..a92e970f5 100644 --- a/gr-audio-jack/src/audio_jack_source.cc +++ b/gr-audio-jack/src/audio_jack_source.cc @@ -110,7 +110,12 @@ audio_jack_source::audio_jack_source (int sampling_rate, #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_source[%s]: jack server not running?\n", d_device_name.c_str()); throw std::runtime_error ("audio_jack_source"); |