aboutsummaryrefslogtreecommitdiffstats
path: root/src/output
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/output/pulse_output_plugin.c (renamed from src/output/pulse_plugin.c)8
-rw-r--r--src/output_list.c4
2 files changed, 7 insertions, 5 deletions
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,