[PATCH 4/6] quartz: Rename DirectSound Renderer Filter methods to be more consistent.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/quartz/dsoundrender.c | 145 ++++++++++++++++++-------------------
 1 file changed, 70 insertions(+), 75 deletions(-)

diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c
index 2bf112c1aa9..b1172ed78cd 100644
--- a/dlls/quartz/dsoundrender.c
+++ b/dlls/quartz/dsoundrender.c
@@ -683,17 +683,16 @@ static const struct strmbase_filter_ops filter_ops =
     .filter_wait_state = dsound_render_wait_state,
 };

-/*** IUnknown methods ***/
-static HRESULT WINAPI Basicaudio_QueryInterface(IBasicAudio *iface, REFIID riid, LPVOID*ppvObj)
+static HRESULT WINAPI basic_audio_QueryInterface(IBasicAudio *iface, REFIID riid, void **out)
 {
     struct dsound_render *filter = impl_from_IBasicAudio(iface);

-    TRACE("(%p/%p)->(%s, %p)\n", filter, iface, debugstr_guid(riid), ppvObj);
+    TRACE("(%p/%p)->(%s, %p)\n", filter, iface, debugstr_guid(riid), out);

-    return IUnknown_QueryInterface(filter->filter.outer_unk, riid, ppvObj);
+    return IUnknown_QueryInterface(filter->filter.outer_unk, riid, out);
 }

-static ULONG WINAPI Basicaudio_AddRef(IBasicAudio *iface)
+static ULONG WINAPI basic_audio_AddRef(IBasicAudio *iface)
 {
     struct dsound_render *filter = impl_from_IBasicAudio(iface);

@@ -702,7 +701,7 @@ static ULONG WINAPI Basicaudio_AddRef(IBasicAudio *iface)
     return IUnknown_AddRef(filter->filter.outer_unk);
 }

-static ULONG WINAPI Basicaudio_Release(IBasicAudio *iface)
+static ULONG WINAPI basic_audio_Release(IBasicAudio *iface)
 {
     struct dsound_render *filter = impl_from_IBasicAudio(iface);

@@ -759,92 +758,89 @@ static HRESULT WINAPI basic_audio_Invoke(IBasicAudio *iface, DISPID id, REFIID i
     return hr;
 }

-static HRESULT WINAPI Basicaudio_put_Volume(IBasicAudio *iface, LONG lVolume)
+static HRESULT WINAPI basic_audio_put_Volume(IBasicAudio *iface, LONG volume)
 {
     struct dsound_render *filter = impl_from_IBasicAudio(iface);

-    TRACE("filter %p, volume %ld.\n", filter, lVolume);
+    TRACE("filter %p, volume %ld.\n", filter, volume);

-    if (lVolume > DSBVOLUME_MAX || lVolume < DSBVOLUME_MIN)
+    if (volume > DSBVOLUME_MAX || volume < DSBVOLUME_MIN)
         return E_INVALIDARG;

-    if (filter->dsbuffer && FAILED(IDirectSoundBuffer_SetVolume(filter->dsbuffer, lVolume)))
+    if (filter->dsbuffer && FAILED(IDirectSoundBuffer_SetVolume(filter->dsbuffer, volume)))
         return E_FAIL;

-    filter->volume = lVolume;
+    filter->volume = volume;
     return S_OK;
 }

-static HRESULT WINAPI Basicaudio_get_Volume(IBasicAudio *iface, LONG *plVolume)
+static HRESULT WINAPI basic_audio_get_Volume(IBasicAudio *iface, LONG *volume)
 {
     struct dsound_render *filter = impl_from_IBasicAudio(iface);

-    TRACE("(%p/%p)->(%p)\n", filter, iface, plVolume);
+    TRACE("(%p/%p)->(%p)\n", filter, iface, volume);

-    if (!plVolume)
+    if (!volume)
         return E_POINTER;

-    *plVolume = filter->volume;
+    *volume = filter->volume;
     return S_OK;
 }

-static HRESULT WINAPI Basicaudio_put_Balance(IBasicAudio *iface, LONG lBalance)
+static HRESULT WINAPI basic_audio_put_Balance(IBasicAudio *iface, LONG balance)
 {
     struct dsound_render *filter = impl_from_IBasicAudio(iface);

-    TRACE("filter %p, balance %ld.\n", filter, lBalance);
+    TRACE("filter %p, balance %ld.\n", filter, balance);

-    if (lBalance < DSBPAN_LEFT || lBalance > DSBPAN_RIGHT)
+    if (balance < DSBPAN_LEFT || balance > DSBPAN_RIGHT)
         return E_INVALIDARG;

-    if (filter->dsbuffer && FAILED(IDirectSoundBuffer_SetPan(filter->dsbuffer, lBalance)))
+    if (filter->dsbuffer && FAILED(IDirectSoundBuffer_SetPan(filter->dsbuffer, balance)))
         return E_FAIL;

-    filter->pan = lBalance;
+    filter->pan = balance;
     return S_OK;
 }

-static HRESULT WINAPI Basicaudio_get_Balance(IBasicAudio *iface, LONG *plBalance)
+static HRESULT WINAPI basic_audio_get_Balance(IBasicAudio *iface, LONG *balance)
 {
     struct dsound_render *filter = impl_from_IBasicAudio(iface);

-    TRACE("(%p/%p)->(%p)\n", filter, iface, plBalance);
+    TRACE("(%p/%p)->(%p)\n", filter, iface, balance);

-    if (!plBalance)
+    if (!balance)
         return E_POINTER;

-    *plBalance = filter->pan;
+    *balance = filter->pan;
     return S_OK;
 }

-static const IBasicAudioVtbl IBasicAudio_Vtbl =
+static const IBasicAudioVtbl basic_audio_vtbl =
 {
-    Basicaudio_QueryInterface,
-    Basicaudio_AddRef,
-    Basicaudio_Release,
+    basic_audio_QueryInterface,
+    basic_audio_AddRef,
+    basic_audio_Release,
     basic_audio_GetTypeInfoCount,
     basic_audio_GetTypeInfo,
     basic_audio_GetIDsOfNames,
     basic_audio_Invoke,
-    Basicaudio_put_Volume,
-    Basicaudio_get_Volume,
-    Basicaudio_put_Balance,
-    Basicaudio_get_Balance
+    basic_audio_put_Volume,
+    basic_audio_get_Volume,
+    basic_audio_put_Balance,
+    basic_audio_get_Balance,
 };

-/*** IUnknown methods ***/
-static HRESULT WINAPI AMDirectSound_QueryInterface(IAMDirectSound *iface,
-						REFIID riid,
-						LPVOID*ppvObj)
+static HRESULT WINAPI am_direct_sound_QueryInterface(IAMDirectSound *iface, REFIID riid, void **out)
 {
     struct dsound_render *filter = impl_from_IAMDirectSound(iface);

-    TRACE("(%p/%p)->(%s, %p)\n", filter, iface, debugstr_guid(riid), ppvObj);
+    TRACE("(%p/%p)->(%s, %p)\n", filter, iface, debugstr_guid(riid), out);

-    return IUnknown_QueryInterface(filter->filter.outer_unk, riid, ppvObj);
+    return IUnknown_QueryInterface(filter->filter.outer_unk, riid, out);
 }

-static ULONG WINAPI AMDirectSound_AddRef(IAMDirectSound *iface)
+static ULONG WINAPI am_direct_sound_AddRef(IAMDirectSound *iface)
 {
     struct dsound_render *filter = impl_from_IAMDirectSound(iface);

@@ -853,7 +849,7 @@ static ULONG WINAPI AMDirectSound_AddRef(IAMDirectSound *iface)
     return IUnknown_AddRef(filter->filter.outer_unk);
 }

-static ULONG WINAPI AMDirectSound_Release(IAMDirectSound *iface)
+static ULONG WINAPI am_direct_sound_Release(IAMDirectSound *iface)
 {
     struct dsound_render *filter = impl_from_IAMDirectSound(iface);

@@ -862,8 +858,7 @@ static ULONG WINAPI AMDirectSound_Release(IAMDirectSound *iface)
     return IUnknown_Release(filter->filter.outer_unk);
 }

-/*** IAMDirectSound methods ***/
-static HRESULT WINAPI AMDirectSound_GetDirectSoundInterface(IAMDirectSound *iface,  IDirectSound **ds)
+static HRESULT WINAPI am_direct_sound_GetDirectSoundInterface(IAMDirectSound *iface,  IDirectSound **ds)
 {
     struct dsound_render *filter = impl_from_IAMDirectSound(iface);

@@ -872,7 +867,7 @@ static HRESULT WINAPI AMDirectSound_GetDirectSoundInterface(IAMDirectSound *ifac
     return E_NOTIMPL;
 }

-static HRESULT WINAPI AMDirectSound_GetPrimaryBufferInterface(IAMDirectSound *iface, IDirectSoundBuffer **buf)
+static HRESULT WINAPI am_direct_sound_GetPrimaryBufferInterface(IAMDirectSound *iface, IDirectSoundBuffer **buf)
 {
     struct dsound_render *filter = impl_from_IAMDirectSound(iface);

@@ -881,7 +876,7 @@ static HRESULT WINAPI AMDirectSound_GetPrimaryBufferInterface(IAMDirectSound *if
     return E_NOTIMPL;
 }

-static HRESULT WINAPI AMDirectSound_GetSecondaryBufferInterface(IAMDirectSound *iface, IDirectSoundBuffer **buf)
+static HRESULT WINAPI am_direct_sound_GetSecondaryBufferInterface(IAMDirectSound *iface, IDirectSoundBuffer **buf)
 {
     struct dsound_render *filter = impl_from_IAMDirectSound(iface);

@@ -890,7 +885,7 @@ static HRESULT WINAPI AMDirectSound_GetSecondaryBufferInterface(IAMDirectSound *
     return E_NOTIMPL;
 }

-static HRESULT WINAPI AMDirectSound_ReleaseDirectSoundInterface(IAMDirectSound *iface, IDirectSound *ds)
+static HRESULT WINAPI am_direct_sound_ReleaseDirectSoundInterface(IAMDirectSound *iface, IDirectSound *ds)
 {
     struct dsound_render *filter = impl_from_IAMDirectSound(iface);

@@ -899,7 +894,7 @@ static HRESULT WINAPI AMDirectSound_ReleaseDirectSoundInterface(IAMDirectSound *
     return E_NOTIMPL;
 }

-static HRESULT WINAPI AMDirectSound_ReleasePrimaryBufferInterface(IAMDirectSound *iface, IDirectSoundBuffer *buf)
+static HRESULT WINAPI am_direct_sound_ReleasePrimaryBufferInterface(IAMDirectSound *iface, IDirectSoundBuffer *buf)
 {
     struct dsound_render *filter = impl_from_IAMDirectSound(iface);

@@ -908,7 +903,7 @@ static HRESULT WINAPI AMDirectSound_ReleasePrimaryBufferInterface(IAMDirectSound
     return E_NOTIMPL;
 }

-static HRESULT WINAPI AMDirectSound_ReleaseSecondaryBufferInterface(IAMDirectSound *iface, IDirectSoundBuffer *buf)
+static HRESULT WINAPI am_direct_sound_ReleaseSecondaryBufferInterface(IAMDirectSound *iface, IDirectSoundBuffer *buf)
 {
     struct dsound_render *filter = impl_from_IAMDirectSound(iface);

@@ -917,7 +912,7 @@ static HRESULT WINAPI AMDirectSound_ReleaseSecondaryBufferInterface(IAMDirectSou
     return E_NOTIMPL;
 }

-static HRESULT WINAPI AMDirectSound_SetFocusWindow(IAMDirectSound *iface, HWND hwnd, BOOL bgaudible)
+static HRESULT WINAPI am_direct_sound_SetFocusWindow(IAMDirectSound *iface, HWND hwnd, BOOL bgaudible)
 {
     struct dsound_render *filter = impl_from_IAMDirectSound(iface);

@@ -926,7 +921,7 @@ static HRESULT WINAPI AMDirectSound_SetFocusWindow(IAMDirectSound *iface, HWND h
     return E_NOTIMPL;
 }

-static HRESULT WINAPI AMDirectSound_GetFocusWindow(IAMDirectSound *iface, HWND *hwnd, BOOL *bgaudible)
+static HRESULT WINAPI am_direct_sound_GetFocusWindow(IAMDirectSound *iface, HWND *hwnd, BOOL *bgaudible)
 {
     struct dsound_render *filter = impl_from_IAMDirectSound(iface);

@@ -935,19 +930,19 @@ static HRESULT WINAPI AMDirectSound_GetFocusWindow(IAMDirectSound *iface, HWND *
     return E_NOTIMPL;
 }

-static const IAMDirectSoundVtbl IAMDirectSound_Vtbl =
+static const IAMDirectSoundVtbl am_direct_sound_vtbl =
 {
-    AMDirectSound_QueryInterface,
-    AMDirectSound_AddRef,
-    AMDirectSound_Release,
-    AMDirectSound_GetDirectSoundInterface,
-    AMDirectSound_GetPrimaryBufferInterface,
-    AMDirectSound_GetSecondaryBufferInterface,
-    AMDirectSound_ReleaseDirectSoundInterface,
-    AMDirectSound_ReleasePrimaryBufferInterface,
-    AMDirectSound_ReleaseSecondaryBufferInterface,
-    AMDirectSound_SetFocusWindow,
-    AMDirectSound_GetFocusWindow
+    am_direct_sound_QueryInterface,
+    am_direct_sound_AddRef,
+    am_direct_sound_Release,
+    am_direct_sound_GetDirectSoundInterface,
+    am_direct_sound_GetPrimaryBufferInterface,
+    am_direct_sound_GetSecondaryBufferInterface,
+    am_direct_sound_ReleaseDirectSoundInterface,
+    am_direct_sound_ReleasePrimaryBufferInterface,
+    am_direct_sound_ReleaseSecondaryBufferInterface,
+    am_direct_sound_SetFocusWindow,
+    am_direct_sound_GetFocusWindow,
 };

static struct dsound_render *impl_from_IQualityControl(IQualityControl *iface)
@@ -955,26 +950,26 @@ static struct dsound_render *impl_from_IQualityControl(IQualityControl *iface)
     return CONTAINING_RECORD(iface, struct dsound_render, IQualityControl_iface);
 }

-static HRESULT WINAPI dsound_render_qc_QueryInterface(IQualityControl *iface,
+static HRESULT WINAPI quality_control_QueryInterface(IQualityControl *iface,
         REFIID iid, void **out)
 {
     struct dsound_render *filter = impl_from_IQualityControl(iface);
     return IUnknown_QueryInterface(filter->filter.outer_unk, iid, out);
 }

-static ULONG WINAPI dsound_render_qc_AddRef(IQualityControl *iface)
+static ULONG WINAPI quality_control_AddRef(IQualityControl *iface)
 {
     struct dsound_render *filter = impl_from_IQualityControl(iface);
     return IUnknown_AddRef(filter->filter.outer_unk);
 }

-static ULONG WINAPI dsound_render_qc_Release(IQualityControl *iface)
+static ULONG WINAPI quality_control_Release(IQualityControl *iface)
 {
     struct dsound_render *filter = impl_from_IQualityControl(iface);
     return IUnknown_Release(filter->filter.outer_unk);
 }

-static HRESULT WINAPI dsound_render_qc_Notify(IQualityControl *iface,
+static HRESULT WINAPI quality_control_Notify(IQualityControl *iface,
         IBaseFilter *sender, Quality q)
 {
     struct dsound_render *filter = impl_from_IQualityControl(iface);
@@ -985,7 +980,7 @@ static HRESULT WINAPI dsound_render_qc_Notify(IQualityControl *iface,
     return E_NOTIMPL;
 }

-static HRESULT WINAPI dsound_render_qc_SetSink(IQualityControl *iface, IQualityControl *sink)
+static HRESULT WINAPI quality_control_SetSink(IQualityControl *iface, IQualityControl *sink)
 {
     struct dsound_render *filter = impl_from_IQualityControl(iface);

@@ -994,13 +989,13 @@ static HRESULT WINAPI dsound_render_qc_SetSink(IQualityControl *iface, IQualityC
     return E_NOTIMPL;
 }

-static const IQualityControlVtbl dsound_render_qc_vtbl =
+static const IQualityControlVtbl quality_control_vtbl =
 {
-    dsound_render_qc_QueryInterface,
-    dsound_render_qc_AddRef,
-    dsound_render_qc_Release,
-    dsound_render_qc_Notify,
-    dsound_render_qc_SetSink,
+    quality_control_QueryInterface,
+    quality_control_AddRef,
+    quality_control_Release,
+    quality_control_Notify,
+    quality_control_SetSink,
 };

HRESULT dsound_render_create(IUnknown *outer, IUnknown **out)
@@ -1059,9 +1054,9 @@ HRESULT dsound_render_create(IUnknown *outer, IUnknown **out)
     object->state_event = CreateEventW(NULL, TRUE, TRUE, NULL);
     object->flush_event = CreateEventW(NULL, TRUE, TRUE, NULL);

-    object->IBasicAudio_iface.lpVtbl = &IBasicAudio_Vtbl;
-    object->IAMDirectSound_iface.lpVtbl = &IAMDirectSound_Vtbl;
-    object->IQualityControl_iface.lpVtbl = &dsound_render_qc_vtbl;
+    object->IBasicAudio_iface.lpVtbl = &basic_audio_vtbl;
+    object->IAMDirectSound_iface.lpVtbl = &am_direct_sound_vtbl;
+    object->IQualityControl_iface.lpVtbl = &quality_control_vtbl;

TRACE("Created DirectSound renderer %p.\n", object);
     *out = &object->filter.IUnknown_inner;