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

mixer/Alsa: use MultiSocketMonitor

Browse Source
This commit is contained in:
Max Kellermann
2013-01-15 07:53:44 +01:00
parent 083065f433
commit 2101daef5a
4 changed files with 57 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/read_mixer.cxx
View File

@@ -27,6 +27,8 @@ extern "C" {
#include "pcm_volume.h"
#include "GlobalEvents.hxx"
#include "Main.hxx"
#include "event/Loop.hxx"
#include <glib.h>
@@ -34,6 +36,8 @@ extern "C" {
#include <string.h>
#include <unistd.h>
EventLoop *main_loop;
#ifdef HAVE_PULSE
#include "output/pulse_output_plugin.h"
@@ -122,6 +126,8 @@ int main(int argc, G_GNUC_UNUSED char **argv)
g_thread_init(NULL);
main_loop = new EventLoop(EventLoop::Default());
mixer = mixer_new(&alsa_mixer_plugin, NULL, NULL, &error);
if (mixer == NULL) {
g_printerr("mixer_new() failed: %s\n", error->message);
@@ -141,6 +147,8 @@ int main(int argc, G_GNUC_UNUSED char **argv)
mixer_close(mixer);
mixer_free(mixer);
delete main_loop;
assert(volume >= -1 && volume <= 100);
if (volume < 0) {

8
test/run_output.cxx
View File

@@ -21,6 +21,8 @@
#include "OutputControl.hxx"
#include "conf.h"
#include "Idle.hxx"
#include "Main.hxx"
#include "event/Loop.hxx"
#include "GlobalEvents.hxx"
#include "IOThread.hxx"
@@ -42,6 +44,8 @@ extern "C" {
#include <unistd.h>
#include <stdlib.h>
EventLoop *main_loop;
void
GlobalEvents::Emit(gcc_unused Event event)
{
@@ -211,6 +215,8 @@ int main(int argc, char **argv)
return 1;
}
main_loop = new EventLoop(EventLoop::Default());
io_thread_init();
if (!io_thread_start(&error)) {
g_warning("%s", error->message);
@@ -247,6 +253,8 @@ int main(int argc, char **argv)
io_thread_deinit();
delete main_loop;
config_global_finish();
return success ? EXIT_SUCCESS : EXIT_FAILURE;