aboutsummaryrefslogtreecommitdiffstats
path: root/src/mixer
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/mixer/pulse_mixer_plugin.c (renamed from src/mixer/pulse_mixer.c)4
-rw-r--r--src/mixer_list.h2
2 files changed, 3 insertions, 3 deletions
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