History

ao_wasapi: don't limit the scope of execution context

May fix broken systems like #12145 or #14314. Probably won't change anything, but it is the correct context to use anyway.

Kacper Michajłow committed 2 years ago

Commit d7ceedb1 parent 965809f2 files · +5 −5Browse files

Unified · Split

2 files
  1. audio/out/ao_wasapi_changenotify.c +1 −1
  2. audio/out/ao_wasapi_utils.c +4 −4
audio/out/ao_wasapi_changenotify.c+1−1
@@ -202,7 +202,7 @@ HRESULT wasapi_change_init(struct ao *ao, bool is_hotplug) · 201 unmodified lines
202202 {
203203 struct wasapi_state *state = ao->priv;
204204 struct change_notify *change = &state->change;
205− HRESULT hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_ALL,
205+ HRESULT hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER,
206206 &IID_IMMDeviceEnumerator,
207207 (void **)&change->pEnumerator);
208208 EXIT_ON_ERROR(hr);
audio/out/ao_wasapi_utils.c+4−4
@@ -653,7 +653,7 @@ static void init_volume_control(struct wasapi_state *state) · 652 unmodified lines
653653 MP_DBG(state, "Activating pEndpointVolume interface\n");
654654 hr = IMMDeviceActivator_Activate(state->pDevice,
655655 &IID_IAudioEndpointVolume,
656− CLSCTX_ALL, NULL,
656+ CLSCTX_INPROC_SERVER, NULL,
657657 (void **)&state->pEndpointVolume);
658658 EXIT_ON_ERROR(hr);
659659
@@ -845,7 +845,7 @@ static struct enumerator *create_enumerator(struct mp_log *log) · 185 unmodified lines
845845 struct enumerator *e = talloc_zero(NULL, struct enumerator);
846846 e->log = log;
847847 HRESULT hr = CoCreateInstance(
848− &CLSID_MMDeviceEnumerator, NULL, CLSCTX_ALL, &IID_IMMDeviceEnumerator,
848+ &CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator,
849849 (void **)&e->pEnumerator);
850850 EXIT_ON_ERROR(hr);
851851
@@ -913,7 +913,7 @@ static bool load_device(struct mp_log *l, · 61 unmodified lines
913913 IMMDevice **ppDevice, LPWSTR deviceID)
914914 {
915915 IMMDeviceEnumerator *pEnumerator = NULL;
916− HRESULT hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_ALL,
916+ HRESULT hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER,
917917 &IID_IMMDeviceEnumerator,
918918 (void **)&pEnumerator);
919919 EXIT_ON_ERROR(hr);
@@ -1027,7 +1027,7 @@ retry: · 107 unmodified lines
10271027
10281028 MP_DBG(ao, "Activating pAudioClient interface\n");
10291029 hr = IMMDeviceActivator_Activate(state->pDevice, &IID_IAudioClient,
1030− CLSCTX_ALL, NULL,
1030+ CLSCTX_INPROC_SERVER, NULL,
10311031 (void **)&state->pAudioClient);
10321032 if (FAILED(hr)) {
10331033 MP_FATAL(ao, "Error activating device: %s\n",

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t