Skip to content

M
mpd
Commit 67cf2ee6 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

jack: initialize libjack's error function in mpd_jack_init()

Do the global libjack initialization in the global plugin initialization function.
parent 3a75f158
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
src/output/jack_plugin.c
View file @ 67cf2ee6
...@@ -200,6 +200,8 @@ mpd_jack_init(struct audio_output *ao, ...@@ -200,6 +200,8 @@ mpd_jack_init(struct audio_output *ao,
jd->ringbuffer_size = jd->ringbuffer_size =
config_get_block_unsigned(param, "ringbuffer_size", 32768); config_get_block_unsigned(param, "ringbuffer_size", 32768);
jack_set_error_function(mpd_jack_error);
return jd; return jd;
} }
...@@ -227,7 +229,6 @@ mpd_jack_connect(struct jack_data *jd, struct audio_format *audio_format) ...@@ -227,7 +229,6 @@ mpd_jack_connect(struct jack_data *jd, struct audio_format *audio_format)
return -1; return -1;
} }
jack_set_error_function(mpd_jack_error);
jack_set_process_callback(jd->client, mpd_jack_process, jd); jack_set_process_callback(jd->client, mpd_jack_process, jd);
jack_set_sample_rate_callback(jd->client, mpd_jack_srate, jd); jack_set_sample_rate_callback(jd->client, mpd_jack_srate, jd);
jack_on_shutdown(jd->client, mpd_jack_shutdown, jd); jack_on_shutdown(jd->client, mpd_jack_shutdown, jd);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment