aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.am9
-rw-r--r--src/audio.c52
-rw-r--r--src/audio.h3
-rw-r--r--src/mixer_control.c77
-rw-r--r--src/mixer_control.h30
-rw-r--r--src/volume.c2
6 files changed, 115 insertions, 58 deletions
diff --git a/Makefile.am b/Makefile.am
index 6133fc7c9..7658fed17 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -80,6 +80,7 @@ mpd_headers = \
src/ls.h \
src/main.h \
src/mixer_api.h \
+ src/mixer_control.h \
src/event_pipe.h \
src/daemon.h \
src/normalize.h \
@@ -151,7 +152,7 @@ src_mpd_SOURCES = \
$(DECODER_SRC) \
$(ENCODER_SRC) \
$(OUTPUT_API_SRC) $(OUTPUT_SRC) \
- $(MIXER_SRC) \
+ $(MIXER_API_SRC) $(MIXER_SRC) \
src/notify.c \
src/audio.c \
src/audio_parser.c \
@@ -453,9 +454,12 @@ OUTPUT_API_SRC = \
OUTPUT_SRC = \
src/output/null_plugin.c
-MIXER_SRC = \
+MIXER_API_SRC = \
+ src/mixer_control.c \
src/mixer_api.c
+MIXER_SRC =
+
if HAVE_ALSA
OUTPUT_SRC += src/output/alsa_plugin.c
MIXER_SRC += src/mixer/alsa_mixer.c
@@ -592,6 +596,7 @@ test_run_output_SOURCES = test/run_output.c \
src/timer.c \
src/output_init.c src/output_list.c \
$(ENCODER_SRC) \
+ src/mixer_api.c \
$(MIXER_SRC) \
$(OUTPUT_SRC)
diff --git a/src/audio.c b/src/audio.c
index 8c5132199..dce9bc93f 100644
--- a/src/audio.c
+++ b/src/audio.c
@@ -60,55 +60,3 @@ void finishAudioConfig(void)
{
audio_format_clear(&configured_audio_format);
}
-
-bool mixer_control_setvol(unsigned int device, int volume, int rel)
-{
- struct audio_output *output;
- struct mixer *mixer;
-
- if (device >= audio_output_count())
- return false;
-
- output = audio_output_get(device);
- mixer = ao_plugin_get_mixer(output->plugin, output->data);
- if (mixer != NULL) {
- if (rel) {
- int cur_volume = mixer_get_volume(mixer);
- if (cur_volume < 0)
- return false;
-
- volume = volume + cur_volume;
- }
- if (volume > 100)
- volume = 100;
- else if (volume < 0)
- volume = 0;
-
- return mixer_set_volume(mixer, volume);
- }
- return false;
-}
-
-bool mixer_control_getvol(unsigned int device, int *volume)
-{
- struct audio_output *output;
- struct mixer *mixer;
-
- if (device >= audio_output_count())
- return false;
-
- output = audio_output_get(device);
- mixer = ao_plugin_get_mixer(output->plugin, output->data);
- if (mixer != NULL) {
- int volume2;
-
- volume2 = mixer_get_volume(mixer);
- if (volume2 < 0)
- return false;
-
- *volume = volume2;
- return true;
- }
-
- return false;
-}
diff --git a/src/audio.h b/src/audio.h
index 7f4ff04d7..a948b2c4e 100644
--- a/src/audio.h
+++ b/src/audio.h
@@ -31,7 +31,4 @@ void initAudioConfig(void);
void finishAudioConfig(void);
-bool mixer_control_setvol(unsigned int device, int volume, int rel);
-bool mixer_control_getvol(unsigned int device, int *volume);
-
#endif
diff --git a/src/mixer_control.c b/src/mixer_control.c
new file mode 100644
index 000000000..782fbcd6a
--- /dev/null
+++ b/src/mixer_control.c
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2003-2009 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include "mixer_control.h"
+#include "mixer_api.h"
+#include "output_all.h"
+#include "output_plugin.h"
+#include "output_internal.h"
+
+bool
+mixer_control_setvol(unsigned int device, int volume, int rel)
+{
+ struct audio_output *output;
+ struct mixer *mixer;
+
+ if (device >= audio_output_count())
+ return false;
+
+ output = audio_output_get(device);
+ mixer = ao_plugin_get_mixer(output->plugin, output->data);
+ if (mixer != NULL) {
+ if (rel) {
+ int cur_volume = mixer_get_volume(mixer);
+ if (cur_volume < 0)
+ return false;
+
+ volume = volume + cur_volume;
+ }
+ if (volume > 100)
+ volume = 100;
+ else if (volume < 0)
+ volume = 0;
+
+ return mixer_set_volume(mixer, volume);
+ }
+ return false;
+}
+
+bool
+mixer_control_getvol(unsigned int device, int *volume)
+{
+ struct audio_output *output;
+ struct mixer *mixer;
+
+ if (device >= audio_output_count())
+ return false;
+
+ output = audio_output_get(device);
+ mixer = ao_plugin_get_mixer(output->plugin, output->data);
+ if (mixer != NULL) {
+ int volume2;
+
+ volume2 = mixer_get_volume(mixer);
+ if (volume2 < 0)
+ return false;
+
+ *volume = volume2;
+ return true;
+ }
+
+ return false;
+}
diff --git a/src/mixer_control.h b/src/mixer_control.h
new file mode 100644
index 000000000..aa1c6caae
--- /dev/null
+++ b/src/mixer_control.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2003-2009 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef MPD_MIXER_CONTROL_H
+#define MPD_MIXER_CONTROL_H
+
+#include <stdbool.h>
+
+bool
+mixer_control_setvol(unsigned int device, int volume, int rel);
+
+bool
+mixer_control_getvol(unsigned int device, int *volume);
+
+#endif
diff --git a/src/volume.c b/src/volume.c
index 336615e81..1f54df344 100644
--- a/src/volume.c
+++ b/src/volume.c
@@ -22,7 +22,7 @@
#include "idle.h"
#include "pcm_volume.h"
#include "config.h"
-#include "audio.h"
+#include "mixer_control.h"
#include "output_all.h"
#include "mixer_api.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 03:14:18 +0000