mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

ComSmartPtr: Make ownership more explicit

Browse source 
COM objects now always start with a refcount of 1, as is convention.
This commit is contained in:
reuk 2024-03-21 19:27:48 +00:00
parent fe9fc0c0e6
commit 1f9ba0682c
No known key found for this signature in database
GPG key ID: FCB43929F012EE5C
12 changed files with 78 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

13
modules/juce_audio_devices/native/juce_WASAPI_windows.cpp
View file

@ -623,9 +623,8 @@ private:
if (audioSessionControl != nullptr)
{
sessionEventCallback = new SessionEventCallback (*this);
sessionEventCallback = becomeComSmartPtrOwner (new SessionEventCallback (*this));
audioSessionControl->RegisterAudioSessionNotification (sessionEventCallback);
sessionEventCallback->Release(); // (required because ComBaseClassHelper objects are constructed with a ref count of 1)
}
}
@ -1831,7 +1830,7 @@ private:
{
public:
explicit ChangeNotificationClient (WASAPIAudioIODeviceType* d)
: ComBaseClassHelper (0), device (d) {}
: device (d) {}
JUCE_COMRESULT OnDeviceAdded (LPCWSTR) override { return notify(); }
JUCE_COMRESULT OnDeviceRemoved (LPCWSTR) override { return notify(); }
@ -1859,10 +1858,10 @@ private:
static String getDefaultEndpoint (IMMDeviceEnumerator* enumerator, bool forCapture)
{
String s;
IMMDevice* dev = nullptr;
ComSmartPtr<IMMDevice> dev;
if (check (enumerator->GetDefaultAudioEndpoint (forCapture ? eCapture : eRender,
eMultimedia, &dev)))
eMultimedia, dev.resetAndGetPointerAddress())))
{
WCHAR* deviceId = nullptr;
@ -1871,8 +1870,6 @@ private:
s = deviceId;
CoTaskMemFree (deviceId);
}
dev->Release();
}
return s;
@ -1886,7 +1883,7 @@ private:
if (! check (enumerator.CoCreateInstance (__uuidof (MMDeviceEnumerator))))
return {};
notifyClient = new ChangeNotificationClient (this);
notifyClient = becomeComSmartPtrOwner (new ChangeNotificationClient (this));
enumerator->RegisterEndpointNotificationCallback (notifyClient);
}