diff options
Diffstat (limited to '')
| -rw-r--r-- | src/Volume.cxx (renamed from src/volume.c) | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/src/volume.c b/src/Volume.cxx index d3ce47dd4..116f4aa18 100644 --- a/src/volume.c +++ b/src/Volume.cxx @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2011 The Music Player Daemon Project + * Copyright (C) 2003-2013 The Music Player Daemon Project * http://www.musicpd.org * * This program is free software; you can redistribute it and/or modify @@ -18,21 +18,14 @@ */ #include "config.h" -#include "volume.h" -#include "conf.h" -#include "idle.h" -#include "pcm_volume.h" -#include "output_all.h" -#include "mixer_control.h" -#include "mixer_all.h" -#include "mixer_type.h" -#include "event_pipe.h" +#include "Volume.hxx" +#include "MixerAll.hxx" +#include "Idle.hxx" +#include "GlobalEvents.hxx" #include <glib.h> #include <assert.h> -#include <math.h> -#include <string.h> #include <stdlib.h> #undef G_LOG_DOMAIN @@ -48,7 +41,7 @@ static int last_hardware_volume = -1; static GTimer *hardware_volume_timer; /** - * Handler for #PIPE_EVENT_MIXER. + * Handler for #GlobalEvents::MIXER. */ static void mixer_event_callback(void) @@ -69,7 +62,7 @@ void volume_init(void) { hardware_volume_timer = g_timer_new(); - event_pipe_register(PIPE_EVENT_MIXER, mixer_event_callback); + GlobalEvents::Register(GlobalEvents::MIXER, mixer_event_callback); } int volume_level_get(void) |