projects
/
debian
/
gnuradio
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updating audio_jack to new interface for creating a client. Fixes depricated warning.
[debian/gnuradio]
/
gr-audio-jack
/
src
/
audio_jack_sink.cc
diff --git
a/gr-audio-jack/src/audio_jack_sink.cc
b/gr-audio-jack/src/audio_jack_sink.cc
index 6e39135c968d550f4f2b967ff6de2d7d878bca4c..f28fddc344c9e3bc9f971d3aad2b55ca386c67b8 100644
(file)
--- 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
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
#endif
-
+
// try to become a client of the JACK server
// 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");
fprintf (stderr, "audio_jack_sink[%s]: jack server not running?\n",
d_device_name.c_str());
throw std::runtime_error ("audio_jack_sink");