зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1545279 - Update cubeb from upstream to 3570749. r=padenot
Pick commits: 3570749 - wasapi: tie monitor lifetime with notification client lifetime. BMO 1545279 (#505) 162625a - test: add option to get the posotion of a stream (#504) Differential Revision: https://phabricator.services.mozilla.com/D28796 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Родитель
582063c263
Коммит
f0d62457c5
|
@ -19,5 +19,5 @@ origin:
|
|||
license: "ISC"
|
||||
|
||||
# update.sh will update this value
|
||||
release: "241e3c7b8a6ce76ad9e075ee5761cd4d0906bc16 (2019-04-16 17:39:01 +0200)"
|
||||
release: "3570749942a4fea2b7e372833cb8374ce42cf389 (2019-04-24 13:04:01 +1200)"
|
||||
|
||||
|
|
|
@ -163,7 +163,6 @@ struct cubeb {
|
|||
/* Collection changed for output (render) devices. */
|
||||
cubeb_device_collection_changed_callback output_collection_changed_callback = nullptr;
|
||||
void * output_collection_changed_user_ptr = nullptr;
|
||||
std::unique_ptr<monitor_device_notifications> monitor_notifications;
|
||||
};
|
||||
|
||||
class wasapi_endpoint_notification_client;
|
||||
|
@ -308,6 +307,7 @@ public:
|
|||
|
||||
void notify(EDataFlow flow)
|
||||
{
|
||||
XASSERT(cubeb_context);
|
||||
if (flow == eCapture && cubeb_context->input_collection_changed_callback) {
|
||||
bool res = SetEvent(input_changed);
|
||||
if (!res) {
|
||||
|
@ -450,6 +450,7 @@ public:
|
|||
wasapi_collection_notification_client(cubeb * context)
|
||||
: ref_count(1)
|
||||
, cubeb_context(context)
|
||||
, monitor_notifications(context)
|
||||
{
|
||||
XASSERT(cubeb_context);
|
||||
}
|
||||
|
@ -492,7 +493,7 @@ public:
|
|||
if (FAILED(hr)) {
|
||||
return hr;
|
||||
}
|
||||
cubeb_context->monitor_notifications->notify(flow);
|
||||
monitor_notifications.notify(flow);
|
||||
}
|
||||
return S_OK;
|
||||
}
|
||||
|
@ -530,6 +531,7 @@ private:
|
|||
LONG ref_count;
|
||||
|
||||
cubeb * cubeb_context = nullptr;
|
||||
monitor_device_notifications monitor_notifications;
|
||||
};
|
||||
|
||||
class wasapi_endpoint_notification_client : public IMMNotificationClient
|
||||
|
@ -1336,8 +1338,6 @@ HRESULT register_collection_notification_client(cubeb * context)
|
|||
context->device_collection_enumerator.reset();
|
||||
}
|
||||
|
||||
context->monitor_notifications.reset(new monitor_device_notifications(context));
|
||||
|
||||
return hr;
|
||||
}
|
||||
|
||||
|
@ -1352,7 +1352,6 @@ HRESULT unregister_collection_notification_client(cubeb * context)
|
|||
context->collection_notification_client = nullptr;
|
||||
context->device_collection_enumerator = nullptr;
|
||||
|
||||
context->monitor_notifications.reset();
|
||||
return hr;
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче