diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | src/mixer/pulse_mixer_plugin.c (renamed from src/mixer/pulse_mixer.c) | 4 | ||||
| -rw-r--r-- | src/mixer_list.h | 2 | ||||
| -rw-r--r-- | src/output/pulse_output_plugin.c (renamed from src/output/pulse_plugin.c) | 8 | ||||
| -rw-r--r-- | src/output_list.c | 4 |
5 files changed, 12 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index 84261fa64..0282be27c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -622,8 +622,8 @@ OUTPUT_SRC += src/output/osx_plugin.c endif if HAVE_PULSE -OUTPUT_SRC += src/output/pulse_plugin.c -MIXER_SRC += src/mixer/pulse_mixer.c +OUTPUT_SRC += src/output/pulse_output_plugin.c +MIXER_SRC += src/mixer/pulse_mixer_plugin.c endif if HAVE_SHOUT diff --git a/src/mixer/pulse_mixer.c b/src/mixer/pulse_mixer_plugin.c index 5d9ce0475..54b082819 100644 --- a/src/mixer/pulse_mixer.c +++ b/src/mixer/pulse_mixer_plugin.c @@ -206,7 +206,7 @@ static struct mixer * pulse_mixer_init(const struct config_param *param) { struct pulse_mixer *pm = g_new(struct pulse_mixer,1); - mixer_init(&pm->base, &pulse_mixer); + mixer_init(&pm->base, &pulse_mixer_plugin); pm->online = false; @@ -372,7 +372,7 @@ pulse_mixer_set_volume(struct mixer *mixer, unsigned volume) return true; } -const struct mixer_plugin pulse_mixer = { +const struct mixer_plugin pulse_mixer_plugin = { .init = pulse_mixer_init, .finish = pulse_mixer_finish, .open = pulse_mixer_open, diff --git a/src/mixer_list.h b/src/mixer_list.h index 4e81c57b2..916e3738c 100644 --- a/src/mixer_list.h +++ b/src/mixer_list.h @@ -28,6 +28,6 @@ extern const struct mixer_plugin software_mixer_plugin; extern const struct mixer_plugin alsa_mixer; extern const struct mixer_plugin oss_mixer; -extern const struct mixer_plugin pulse_mixer; +extern const struct mixer_plugin pulse_mixer_plugin; #endif diff --git a/src/output/pulse_plugin.c b/src/output/pulse_output_plugin.c index e4780fd45..2557106f9 100644 --- a/src/output/pulse_plugin.c +++ b/src/output/pulse_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 "mixer_list.h" #include <glib.h> @@ -168,8 +168,9 @@ pulse_play(void *data, const void *chunk, size_t size, GError **error_r) return size; } -const struct audio_output_plugin pulse_plugin = { +const struct audio_output_plugin pulse_output_plugin = { .name = "pulse", + .test_default_device = pulse_test_default_device, .init = pulse_init, .finish = pulse_finish, @@ -177,5 +178,6 @@ const struct audio_output_plugin pulse_plugin = { .play = pulse_play, .cancel = pulse_cancel, .close = pulse_close, - .mixer_plugin = &pulse_mixer, + + .mixer_plugin = &pulse_mixer_plugin, }; diff --git a/src/output_list.c b/src/output_list.c index 476701a1a..d5888e386 100644 --- a/src/output_list.c +++ b/src/output_list.c @@ -31,7 +31,7 @@ extern const struct audio_output_plugin oss_output_plugin; extern const struct audio_output_plugin openal_output_plugin; extern const struct audio_output_plugin osxPlugin; extern const struct audio_output_plugin solaris_output_plugin; -extern const struct audio_output_plugin pulse_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 httpd_output_plugin; @@ -67,7 +67,7 @@ const struct audio_output_plugin *audio_output_plugins[] = { &solaris_output_plugin, #endif #ifdef HAVE_PULSE - &pulse_plugin, + &pulse_output_plugin, #endif #ifdef HAVE_MVP &mvp_output_plugin, |