oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

MixerPlugin: add EventLoop& init() parameter

Browse Source
This commit is contained in:
Max Kellermann
2014-02-05 00:02:02 +01:00
parent 4a28333039
commit e8938b1069
16 changed files with 51 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/read_mixer.cxx
View File

@@ -35,8 +35,6 @@
#include <string.h>
#include <unistd.h>
EventLoop *main_loop;
#ifdef HAVE_PULSE
#include "output/plugins/PulseOutputPlugin.hxx"
@@ -115,10 +113,10 @@ int main(int argc, gcc_unused char **argv)
g_thread_init(NULL);
#endif
main_loop = new EventLoop;
EventLoop event_loop;
Error error;
Mixer *mixer = mixer_new(&alsa_mixer_plugin, nullptr,
Mixer *mixer = mixer_new(event_loop, &alsa_mixer_plugin, nullptr,
config_param(), error);
if (mixer == NULL) {
LogError(error, "mixer_new() failed");
@@ -135,8 +133,6 @@ int main(int argc, gcc_unused char **argv)
mixer_close(mixer);
mixer_free(mixer);
delete main_loop;
assert(volume >= -1 && volume <= 100);
if (volume < 0) {