diff options
| author | Max Kellermann <max@duempel.org> | 2014-02-05 23:20:33 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-02-19 21:40:14 +0100 |
| commit | 8d6fedf8177d0d2ced81e6d93d35c368b2ac69db (patch) | |
| tree | 17890432eb5d7f6cbdf5feb32a0105dc6f9d8974 /test | |
| parent | f4f8fa7c947af10235d1cdd70b294a3b8810c6f4 (diff) | |
| download | mpd-8d6fedf8177d0d2ced81e6d93d35c368b2ac69db.tar.gz mpd-8d6fedf8177d0d2ced81e6d93d35c368b2ac69db.tar.xz mpd-8d6fedf8177d0d2ced81e6d93d35c368b2ac69db.zip | |
Mixer: add class MixerListener
Use a listener interface instead of GlobalEvents.
Diffstat (limited to 'test')
| -rw-r--r-- | test/read_mixer.cxx | 7 | ||||
| -rw-r--r-- | test/run_output.cxx | 10 |
2 files changed, 4 insertions, 13 deletions
diff --git a/test/read_mixer.cxx b/test/read_mixer.cxx index 881f517c7..97529057f 100644 --- a/test/read_mixer.cxx +++ b/test/read_mixer.cxx @@ -22,7 +22,6 @@ #include "mixer/MixerList.hxx" #include "filter/FilterRegistry.hxx" #include "pcm/Volume.hxx" -#include "GlobalEvents.hxx" #include "Main.hxx" #include "event/Loop.hxx" #include "config/ConfigData.hxx" @@ -35,11 +34,6 @@ #include <string.h> #include <unistd.h> -void -GlobalEvents::Emit(gcc_unused Event event) -{ -} - const struct filter_plugin * filter_plugin_by_name(gcc_unused const char *name) { @@ -65,6 +59,7 @@ int main(int argc, gcc_unused char **argv) Error error; Mixer *mixer = mixer_new(event_loop, alsa_mixer_plugin, *(AudioOutput *)nullptr, + *(MixerListener *)nullptr, config_param(), error); if (mixer == NULL) { LogError(error, "mixer_new() failed"); diff --git a/test/run_output.cxx b/test/run_output.cxx index 374a0ceca..8aac5e555 100644 --- a/test/run_output.cxx +++ b/test/run_output.cxx @@ -26,7 +26,6 @@ #include "Idle.hxx" #include "Main.hxx" #include "event/Loop.hxx" -#include "GlobalEvents.hxx" #include "IOThread.hxx" #include "fs/Path.hxx" #include "AudioParser.hxx" @@ -47,11 +46,6 @@ #include <stdlib.h> #include <stdio.h> -void -GlobalEvents::Emit(gcc_unused Event event) -{ -} - const struct filter_plugin * filter_plugin_by_name(gcc_unused const char *name) { @@ -95,7 +89,9 @@ load_audio_output(EventLoop &event_loop, const char *name) Error error; AudioOutput *ao = - audio_output_new(event_loop, *param, dummy_player_control, + audio_output_new(event_loop, *param, + *(MixerListener *)nullptr, + dummy_player_control, error); if (ao == nullptr) LogError(error); |