diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | src/output/jack_output_plugin.c (renamed from src/output/jack_plugin.c) | 4 | ||||
| -rw-r--r-- | src/output_list.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index dfeb5386a..2c6a0474e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -602,7 +602,7 @@ OUTPUT_SRC += src/output/pipe_output_plugin.c endif if HAVE_JACK -OUTPUT_SRC += src/output/jack_plugin.c +OUTPUT_SRC += src/output/jack_output_plugin.c endif if HAVE_MVP diff --git a/src/output/jack_plugin.c b/src/output/jack_output_plugin.c index 5dc1eca24..0c935633a 100644 --- a/src/output/jack_plugin.c +++ b/src/output/jack_output_plugin.c @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "../output_api.h" +#include "output_api.h" #include "config.h" #include <assert.h> @@ -438,7 +438,7 @@ mpd_jack_play(void *data, const void *chunk, size_t size, GError **error) return size * frame_size; } -const struct audio_output_plugin jackPlugin = { +const struct audio_output_plugin jack_output_plugin = { .name = "jack", .test_default_device = mpd_jack_test_default_device, .init = mpd_jack_init, diff --git a/src/output_list.c b/src/output_list.c index d5888e386..fcb796751 100644 --- a/src/output_list.c +++ b/src/output_list.c @@ -33,7 +33,7 @@ extern const struct audio_output_plugin osxPlugin; extern const struct audio_output_plugin solaris_output_plugin; extern const struct audio_output_plugin pulse_output_plugin; extern const struct audio_output_plugin mvp_output_plugin; -extern const struct audio_output_plugin jackPlugin; +extern const struct audio_output_plugin jack_output_plugin; extern const struct audio_output_plugin httpd_output_plugin; extern const struct audio_output_plugin recorder_output_plugin; @@ -73,7 +73,7 @@ const struct audio_output_plugin *audio_output_plugins[] = { &mvp_output_plugin, #endif #ifdef HAVE_JACK - &jackPlugin, + &jack_output_plugin, #endif #ifdef ENABLE_HTTPD_OUTPUT &httpd_output_plugin, |