diff options
Diffstat (limited to 'test/read_mixer.cxx')
| -rw-r--r-- | test/read_mixer.cxx | 47 |
1 files changed, 19 insertions, 28 deletions
diff --git a/test/read_mixer.cxx b/test/read_mixer.cxx index 8426443ae..1401a6a1e 100644 --- a/test/read_mixer.cxx +++ b/test/read_mixer.cxx @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2011 The Music Player Daemon Project + * Copyright (C) 2003-2014 The Music Player Daemon Project * http://www.musicpd.org * * This program is free software; you can redistribute it and/or modify @@ -18,15 +18,16 @@ */ #include "config.h" -#include "MixerControl.hxx" -#include "MixerList.hxx" -#include "FilterRegistry.hxx" -#include "pcm/PcmVolume.hxx" +#include "mixer/MixerControl.hxx" +#include "mixer/MixerList.hxx" +#include "filter/FilterRegistry.hxx" +#include "pcm/Volume.hxx" #include "GlobalEvents.hxx" #include "Main.hxx" #include "event/Loop.hxx" -#include "ConfigData.hxx" +#include "config/ConfigData.hxx" #include "util/Error.hxx" +#include "Log.hxx" #include <glib.h> @@ -37,7 +38,7 @@ EventLoop *main_loop; #ifdef HAVE_PULSE -#include "output/PulseOutputPlugin.hxx" +#include "output/plugins/PulseOutputPlugin.hxx" void pulse_output_lock(gcc_unused PulseOutput *po) @@ -72,7 +73,7 @@ pulse_output_set_volume(gcc_unused PulseOutput *po, #endif #ifdef HAVE_ROAR -#include "output/RoarOutputPlugin.hxx" +#include "output/plugins/RoarOutputPlugin.hxx" int roar_output_get_volume(gcc_unused RoarOutput *roar) @@ -101,22 +102,13 @@ filter_plugin_by_name(gcc_unused const char *name) return NULL; } -bool -pcm_volume(gcc_unused void *buffer, gcc_unused size_t length, - gcc_unused SampleFormat format, - gcc_unused int volume) -{ - assert(false); - return false; -} - int main(int argc, gcc_unused char **argv) { int volume; if (argc != 2) { - g_printerr("Usage: read_mixer PLUGIN\n"); - return 1; + fprintf(stderr, "Usage: read_mixer PLUGIN\n"); + return EXIT_FAILURE; } #if !GLIB_CHECK_VERSION(2,32,0) @@ -129,14 +121,14 @@ int main(int argc, gcc_unused char **argv) Mixer *mixer = mixer_new(&alsa_mixer_plugin, nullptr, config_param(), error); if (mixer == NULL) { - g_printerr("mixer_new() failed: %s\n", error.GetMessage()); - return 2; + LogError(error, "mixer_new() failed"); + return EXIT_FAILURE; } if (!mixer_open(mixer, error)) { mixer_free(mixer); - g_printerr("failed to open the mixer: %s\n", error.GetMessage()); - return 2; + LogError(error, "failed to open the mixer"); + return EXIT_FAILURE; } volume = mixer_get_volume(mixer, error); @@ -149,13 +141,12 @@ int main(int argc, gcc_unused char **argv) if (volume < 0) { if (error.IsDefined()) { - g_printerr("failed to read volume: %s\n", - error.GetMessage()); + LogError(error, "failed to read volume"); } else - g_printerr("failed to read volume\n"); - return 2; + fprintf(stderr, "failed to read volume\n"); + return EXIT_FAILURE; } - g_print("%d\n", volume); + printf("%d\n", volume); return 0; } |