diff options
author | Kevin Mitchell <kevmitch@gmail.com> | 2015-12-20 16:43:23 -0800 |
---|---|---|
committer | Kevin Mitchell <kevmitch@gmail.com> | 2015-12-21 05:03:09 -0800 |
commit | 3ae726e8dd15638b84fcd5a168134f186119f240 (patch) | |
tree | d5df22494d21bb3b2a6c218e1f7b5c896c082a09 /audio/out/ao_wasapi_changenotify.c | |
parent | c188240ab923f3e986655dfa8ef316f8d9905500 (diff) | |
download | mpv-3ae726e8dd15638b84fcd5a168134f186119f240.tar.bz2 mpv-3ae726e8dd15638b84fcd5a168134f186119f240.tar.xz |
ao_wasapi: wrap long lines and use only c99 comment style
also remove a log message in AOCONTROL_UPDATE_STREAM_TITLE since
none of the other controls have one.
Diffstat (limited to 'audio/out/ao_wasapi_changenotify.c')
-rwxr-xr-x | audio/out/ao_wasapi_changenotify.c | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/audio/out/ao_wasapi_changenotify.c b/audio/out/ao_wasapi_changenotify.c index 1521578b19..cde942fe59 100755 --- a/audio/out/ao_wasapi_changenotify.c +++ b/audio/out/ao_wasapi_changenotify.c @@ -30,7 +30,7 @@ static HRESULT STDMETHODCALLTYPE sIMMNotificationClient_QueryInterface( IMMNotificationClient* This, REFIID riid, void **ppvObject) { - /* Compatible with IMMNotificationClient and IUnknown */ + // Compatible with IMMNotificationClient and IUnknown if (IsEqualGUID(&IID_IMMNotificationClient, riid) || IsEqualGUID(&IID_IUnknown, riid)) { @@ -42,14 +42,14 @@ static HRESULT STDMETHODCALLTYPE sIMMNotificationClient_QueryInterface( } } -/* these are required, but not actually used */ +// these are required, but not actually used static ULONG STDMETHODCALLTYPE sIMMNotificationClient_AddRef( IMMNotificationClient *This) { return 1; } -/* MSDN says it should free itself, but we're static */ +// MSDN says it should free itself, but we're static static ULONG STDMETHODCALLTYPE sIMMNotificationClient_Release( IMMNotificationClient *This) { @@ -65,7 +65,8 @@ static HRESULT STDMETHODCALLTYPE sIMMNotificationClient_OnDeviceStateChanged( struct ao *ao = change->ao; if (change->is_hotplug) { - MP_VERBOSE(ao, "OnDeviceStateChanged triggered: sending hotplug event\n"); + MP_VERBOSE(ao, + "OnDeviceStateChanged triggered: sending hotplug event\n"); ao_hotplug_event(ao); } else if (pwstrDeviceId && !wcscmp(pwstrDeviceId, change->monitored)) { switch (dwNewState) { @@ -99,7 +100,7 @@ static HRESULT STDMETHODCALLTYPE sIMMNotificationClient_OnDeviceAdded( return S_OK; } -/* maybe MPV can go over to the prefered device once it is plugged in? */ +// maybe MPV can go over to the prefered device once it is plugged in? static HRESULT STDMETHODCALLTYPE sIMMNotificationClient_OnDeviceRemoved( IMMNotificationClient *This, LPCWSTR pwstrDeviceId) @@ -129,29 +130,31 @@ static HRESULT STDMETHODCALLTYPE sIMMNotificationClient_OnDefaultDeviceChanged( struct ao *ao = change->ao; struct wasapi_state *state = ao->priv; - /* don't care about "eCapture" or non-"eMultimedia" roles */ + // don't care about "eCapture" or non-"eMultimedia" roles if (flow == eCapture || role != eMultimedia) return S_OK; if (change->is_hotplug) { - MP_VERBOSE(ao, "OnDefaultDeviceChanged triggered: sending hotplug event\n"); + MP_VERBOSE(ao, + "OnDefaultDeviceChanged triggered: sending hotplug event\n"); ao_hotplug_event(ao); } else { - /* stay on the device the user specified */ + // stay on the device the user specified if (state->opt_device) { MP_VERBOSE(ao, "OnDefaultDeviceChanged triggered: " "staying on specified device %s\n", state->opt_device); return S_OK; } - /* don't reload if already on the new default */ + // don't reload if already on the new default if (pwstrDeviceId && !wcscmp(pwstrDeviceId, change->monitored)) { MP_VERBOSE(ao, "OnDefaultDeviceChanged triggered: " "already using default device, no reload required\n"); return S_OK; } - /* if we got here, we need to reload */ - MP_VERBOSE(ao, "OnDefaultDeviceChanged triggered: requesting ao reload\n"); + // if we got here, we need to reload + MP_VERBOSE(ao, + "OnDefaultDeviceChanged triggered: requesting ao reload\n"); ao_request_reload(ao); } @@ -201,24 +204,24 @@ HRESULT wasapi_change_init(struct ao *ao, bool is_hotplug) struct wasapi_state *state = ao->priv; struct change_notify *change = &state->change; HRESULT hr; - /* COM voodoo to emulate c++ class */ + // COM voodoo to emulate c++ class change->client.lpVtbl = &sIMMDeviceEnumeratorVtbl_vtbl; - /* register the change notification client */ + // register the change notification client hr = IMMDeviceEnumerator_RegisterEndpointNotificationCallback( state->pEnumerator, (IMMNotificationClient *)change); EXIT_ON_ERROR(hr); - /* so the callbacks can access the ao */ + // so the callbacks can access the ao change->ao = ao; - /* whether or not this is the hotplug instance */ + // whether or not this is the hotplug instance change->is_hotplug = is_hotplug; if (is_hotplug) { MP_DBG(ao, "Monitoring for hotplug events\n"); } else { - /* Get the device string to compare with the pwstrDeviceId */ + // Get the device string to compare with the pwstrDeviceId hr = IMMDevice_GetId(state->pDevice, &change->monitored); EXIT_ON_ERROR(hr); MP_VERBOSE(ao, "Monitoring changes in device %S\n", change->monitored); |