diff options
| author | Max Kellermann <max@duempel.org> | 2011-03-19 09:58:07 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-03-19 09:58:07 +0100 |
| commit | 0c9fc2f8090ed225c76296088e6760630eb42779 (patch) | |
| tree | 9238436fb89ebf6a91d329eba0f5feec1ad137fd /src/mixer | |
| parent | 1a954748a027aa5b4fc6c85b0ad96c2fa25d53b8 (diff) | |
| parent | fe588a255ba713875a21bb98d3b7daf60af2844e (diff) | |
| download | mpd-0c9fc2f8090ed225c76296088e6760630eb42779.tar.gz mpd-0c9fc2f8090ed225c76296088e6760630eb42779.tar.xz mpd-0c9fc2f8090ed225c76296088e6760630eb42779.zip | |
Merge commit 'release-0.16.2'
Conflicts:
Makefile.am
NEWS
configure.ac
Diffstat (limited to 'src/mixer')
| -rw-r--r-- | src/mixer/winmm_mixer_plugin.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mixer/winmm_mixer_plugin.c b/src/mixer/winmm_mixer_plugin.c index 174c1ec04..ceddf6afd 100644 --- a/src/mixer/winmm_mixer_plugin.c +++ b/src/mixer/winmm_mixer_plugin.c @@ -58,11 +58,11 @@ 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; } @@ -79,13 +79,13 @@ winmm_mixer_get_volume(struct mixer *mixer, GError **error_r) 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); } @@ -102,7 +102,7 @@ winmm_mixer_set_volume(struct mixer *mixer, unsigned volume, GError **error_r) "Failed to set winmm volume"); return false; } - + return true; } |