aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis Krjuchkov <alcohold@gmail.com>2010-10-09 02:45:08 +0600
committerDenis Krjuchkov <alcohold@gmail.com>2010-10-09 02:45:08 +0600
commite6fc88a758af2f0a37376c5c8dcf90db05e4e45a (patch)
treeb314d6e3ed18c39f1bebd4a5269bd395b24d167f
parent20004b7ee09db7de5a58ef50735b64309709a4c7 (diff)
downloadmpd-e6fc88a758af2f0a37376c5c8dcf90db05e4e45a.tar.gz
mpd-e6fc88a758af2f0a37376c5c8dcf90db05e4e45a.tar.xz
mpd-e6fc88a758af2f0a37376c5c8dcf90db05e4e45a.zip
mixer: winmm_mixer implemented
Diffstat (limited to '')
-rw-r--r--Makefile.am2
-rw-r--r--src/mixer/winmm_mixer_plugin.c114
-rw-r--r--src/mixer_list.h1
-rw-r--r--src/output/winmm_output_plugin.c9
-rw-r--r--src/output/winmm_output_plugin.h29
5 files changed, 155 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index 7a8ebd4f7..cb0facf6d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -137,6 +137,7 @@ mpd_headers = \
src/output/httpd_client.h \
src/output/httpd_internal.h \
src/output/pulse_output_plugin.h \
+ src/output/winmm_output_plugin.h \
src/page.h \
src/pcm_buffer.h \
src/pcm_utils.h \
@@ -738,6 +739,7 @@ endif
if ENABLE_WINMM_OUTPUT
OUTPUT_SRC += src/output/winmm_output_plugin.c
+MIXER_SRC += src/mixer/winmm_mixer_plugin.c
endif
diff --git a/src/mixer/winmm_mixer_plugin.c b/src/mixer/winmm_mixer_plugin.c
new file mode 100644
index 000000000..e1e8a7a45
--- /dev/null
+++ b/src/mixer/winmm_mixer_plugin.c
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2003-2010 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+#include "mixer_api.h"
+#include "output_api.h"
+#include "output/winmm_output_plugin.h"
+
+#include <assert.h>
+#include <math.h>
+#include <windows.h>
+
+#undef G_LOG_DOMAIN
+#define G_LOG_DOMAIN "winmm_mixer"
+
+struct winmm_mixer {
+ struct mixer base;
+ struct winmm_output *output;
+};
+
+static inline GQuark
+winmm_mixer_quark(void)
+{
+ return g_quark_from_static_string("winmm_mixer");
+}
+
+static inline int
+winmm_volume_decode(DWORD volume)
+{
+ return lround((volume & 0xFFFF) / 655.35);
+}
+
+static inline DWORD
+winmm_volume_encode(int volume)
+{
+ int value = lround(volume * 655.35);
+ return MAKELONG(value, value);
+}
+
+static struct mixer *
+winmm_mixer_init(void *ao, G_GNUC_UNUSED const struct config_param *param,
+ G_GNUC_UNUSED GError **error_r)
+{
+ assert(ao != NULL);
+
+ struct winmm_mixer *wm = g_new(struct winmm_mixer, 1);
+ mixer_init(&wm->base, &winmm_mixer_plugin);
+ wm->output = (struct winmm_output *) ao;
+
+ return &wm->base;
+}
+
+static void
+winmm_mixer_finish(struct mixer *data)
+{
+ g_free(data);
+}
+
+static int
+winmm_mixer_get_volume(struct mixer *mixer, GError **error_r)
+{
+ struct winmm_mixer *wm = (struct winmm_mixer *) mixer;
+ DWORD volume;
+ HWAVEOUT handle = winmm_output_get_handle(wm->output);
+ MMRESULT result = waveOutGetVolume(handle, &volume);
+
+ if (result != MMSYSERR_NOERROR) {
+ g_set_error(error_r, 0, winmm_mixer_quark(),
+ "Failed to get winmm volume");
+ return -1;
+ }
+
+ return winmm_volume_decode(volume);
+}
+
+static bool
+winmm_mixer_set_volume(struct mixer *mixer, unsigned volume, GError **error_r)
+{
+ struct winmm_mixer *wm = (struct winmm_mixer *) mixer;
+ DWORD value = winmm_volume_encode(volume);
+ HWAVEOUT handle = winmm_output_get_handle(wm->output);
+ MMRESULT result = waveOutSetVolume(handle, value);
+
+ if (result != MMSYSERR_NOERROR) {
+ g_set_error(error_r, 0, winmm_mixer_quark(),
+ "Failed to set winmm volume");
+ return false;
+ }
+
+ return true;
+}
+
+const struct mixer_plugin winmm_mixer_plugin = {
+ .init = winmm_mixer_init,
+ .finish = winmm_mixer_finish,
+ .get_volume = winmm_mixer_get_volume,
+ .set_volume = winmm_mixer_set_volume,
+};
diff --git a/src/mixer_list.h b/src/mixer_list.h
index 44bfd9289..a472c8807 100644
--- a/src/mixer_list.h
+++ b/src/mixer_list.h
@@ -29,5 +29,6 @@ extern const struct mixer_plugin software_mixer_plugin;
extern const struct mixer_plugin alsa_mixer_plugin;
extern const struct mixer_plugin oss_mixer_plugin;
extern const struct mixer_plugin pulse_mixer_plugin;
+extern const struct mixer_plugin winmm_mixer_plugin;
#endif
diff --git a/src/output/winmm_output_plugin.c b/src/output/winmm_output_plugin.c
index 88c338c52..214d9e713 100644
--- a/src/output/winmm_output_plugin.c
+++ b/src/output/winmm_output_plugin.c
@@ -20,6 +20,8 @@
#include "config.h"
#include "output_api.h"
#include "pcm_buffer.h"
+#include "mixer_list.h"
+#include "winmm_output_plugin.h"
#include <windows.h>
@@ -54,6 +56,12 @@ winmm_output_quark(void)
return g_quark_from_static_string("winmm_output");
}
+HWAVEOUT
+winmm_output_get_handle(struct winmm_output* output)
+{
+ return output->handle;
+}
+
static bool
winmm_output_test_default_device(void)
{
@@ -293,4 +301,5 @@ const struct audio_output_plugin winmm_output_plugin = {
.play = winmm_output_play,
.drain = winmm_output_drain,
.cancel = winmm_output_cancel,
+ .mixer_plugin = &winmm_mixer_plugin,
};
diff --git a/src/output/winmm_output_plugin.h b/src/output/winmm_output_plugin.h
new file mode 100644
index 000000000..39507275a
--- /dev/null
+++ b/src/output/winmm_output_plugin.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2003-2010 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_WINMM_OUTPUT_PLUGIN_H
+#define MPD_WINMM_OUTPUT_PLUGIN_H
+
+#include <windows.h>
+
+struct winmm_output;
+
+HWAVEOUT winmm_output_get_handle(struct winmm_output*);
+
+#endif