[PATCH v4 6/6] wmp: IWMPSettings implement put/get volume
Anton Romanov
theli.ua at gmail.com
Thu Mar 22 00:48:14 CDT 2018
Signed-off-by: Anton Romanov <theli.ua at gmail.com>
---
dlls/wmp/player.c | 27 +++++++++++++++++++++++----
dlls/wmp/tests/media.c | 8 +++++++-
dlls/wmp/wmp_private.h | 1 +
3 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c
index 22865d6dcc..6e747b121a 100644
--- a/dlls/wmp/player.c
+++ b/dlls/wmp/player.c
@@ -938,16 +938,32 @@ static HRESULT WINAPI WMPSettings_put_balance(IWMPSettings *iface, LONG v)
static HRESULT WINAPI WMPSettings_get_volume(IWMPSettings *iface, LONG *p)
{
+ HRESULT hres;
WindowsMediaPlayer *This = impl_from_IWMPSettings(iface);
- FIXME("(%p)->(%p)\n", This, p);
- return E_NOTIMPL;
+ TRACE("(%p)->(%p)\n", This, p);
+ if (!This->pFilterGraph) {
+ return S_FALSE;
+ }
+ hres = IBasicAudio_get_Volume(This->basic_audio, p);
+ /* IBasicAudio - [-10000, 0], wmp - [0, 100] */
+ if (SUCCEEDED(hres))
+ *p = (*p + 10000) * 100 / 10000;
+ return hres;
}
static HRESULT WINAPI WMPSettings_put_volume(IWMPSettings *iface, LONG v)
{
+ HRESULT hres;
WindowsMediaPlayer *This = impl_from_IWMPSettings(iface);
- FIXME("(%p)->(%d)\n", This, v);
- return E_NOTIMPL;
+ TRACE("(%p)->(%d)\n", This, v);
+ if (!This->pFilterGraph) {
+ return S_FALSE;
+ }
+ /* IBasicAudio - [-10000, 0], wmp - [0, 100] */
+ v = 10000 * v / 100 - 10000;
+ hres = IBasicAudio_put_Volume(This->basic_audio, v);
+ TRACE("ret: %d", hres);
+ return hres;
}
static HRESULT WINAPI WMPSettings_getMode(IWMPSettings *iface, BSTR mode, VARIANT_BOOL *p)
@@ -1454,6 +1470,8 @@ static HRESULT WINAPI WMPControls_play(IWMPControls *iface)
if (SUCCEEDED(hres))
hres = IGraphBuilder_QueryInterface(This->pFilterGraph, &IID_IMediaEvent,
(void**)&This->media_event);
+ if (SUCCEEDED(hres))
+ hres = IGraphBuilder_QueryInterface(This->pFilterGraph, &IID_IBasicAudio, (void**)&This->basic_audio);
if (SUCCEEDED(hres))
This->event_thread = CreateThread(NULL, 0, WMP_event_thread, This, 0, NULL);
}
@@ -1496,6 +1514,7 @@ static HRESULT WINAPI WMPControls_stop(IWMPControls *iface)
IMediaControl_Release(This->media_control);
IMediaEvent_Release(This->media_event);
IMediaSeeking_Release(This->media_seeking);
+ IBasicAudio_Release(This->basic_audio);
This->pFilterGraph = NULL;
This->media_control = NULL;
diff --git a/dlls/wmp/tests/media.c b/dlls/wmp/tests/media.c
index 8ac2c78f5a..ad2d748af7 100644
--- a/dlls/wmp/tests/media.c
+++ b/dlls/wmp/tests/media.c
@@ -227,7 +227,6 @@ static void test_wmp(void)
hres = IWMPSettings_put_autoStart(settings, VARIANT_FALSE);
ok(hres == S_OK, "Could not put autoStart in IWMPSettings: %08x\n", hres);
- IWMPSettings_Release(settings);
controls = NULL;
hres = IWMPPlayer4_get_controls(player4, &controls);
@@ -343,7 +342,14 @@ playback_skip:
hres = IConnectionPoint_Unadvise(point, dw);
ok(hres == S_OK, "Unadvise failed: %08x\n", hres);
+ hres = IWMPSettings_put_volume(settings, 36);
+ ok(hres == S_OK, "IWMPSettings_put_volume failed: %08x\n", hres);
+ hres = IWMPSettings_get_volume(settings, &progress);
+ ok(hres == S_OK, "IWMPSettings_get_volume failed: %08x\n", hres);
+ ok(progress == 36, "unexpected value: %d\n", progress);
+
IConnectionPoint_Release(point);
+ IWMPSettings_Release(settings);
IWMPControls_Release(controls);
IWMPPlayer4_Release(player4);
IOleObject_Release(oleobj);
diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h
index 0737b5d857..f38c433b86 100644
--- a/dlls/wmp/wmp_private.h
+++ b/dlls/wmp/wmp_private.h
@@ -79,6 +79,7 @@ struct WindowsMediaPlayer {
IMediaControl* media_control;
IMediaEvent* media_event;
IMediaSeeking* media_seeking;
+ IBasicAudio* basic_audio;
/* Async event notification */
HANDLE event_thread;
--
2.16.2
More information about the wine-devel
mailing list