Skip to content

Fix default device not respecting ducking rules bug and handle leak #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SpriteOvO wants to merge 2 commits into
base: tdesktop
Choose a base branch
from
Open

Fix default device not respecting ducking rules bug and handle leak #33

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e32af2
Fix default device not respecting ducking rules bug and handle leak
SpriteOvO Sep 6, 2020
dc27119
Fix naming style
SpriteOvO Sep 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions os/windows/AudioInputWASAPI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,9 +248,9 @@ void AudioInputWASAPI::ActuallySetCurrentDevice(std::string deviceID){
//device->AddRef();
break;
}
SafeRelease(&device);
}
if (deviceCollection)
SafeRelease(&deviceCollection);
SafeRelease(&deviceCollection);

if (!device) {
LOGW("Requested device not found, using default");
Expand Down
19 changes: 16 additions & 3 deletions os/windows/AudioOutputWASAPI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,20 @@ void AudioOutputWASAPI::ActuallySetCurrentDevice(std::string deviceID){

if(deviceID=="default"){
isDefaultDevice=true;
res=enumerator->GetDefaultAudioEndpoint(eRender, eCommunications, &device);
IMMDevice* temp_device;
Copy link

@ilya-fedin ilya-fedin Sep 10, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks strange since all other variables are in camelCase

Copy link

@lokpozzta lokpozzta Jun 21, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Y

res = enumerator->GetDefaultAudioEndpoint(eRender, eCommunications, &temp_device);
CHECK_RES(res, "GetDefaultAudioEndpoint");

wchar_t* temp_devID;
res = temp_device->GetId(&temp_devID);
CHECK_RES(res, "get default device id");

res = enumerator->GetDevice(temp_devID, &device);
CHECK_RES(res, "GetDeviceByID");

CoTaskMemFree(temp_devID);
SafeRelease(&temp_device);

}else{
IMMDeviceCollection *deviceCollection = NULL;

Expand Down Expand Up @@ -245,9 +257,10 @@ void AudioOutputWASAPI::ActuallySetCurrentDevice(std::string deviceID){
this->device=device;
break;
}
SafeRelease(&device);
}
if(deviceCollection)
SafeRelease(&deviceCollection);
SafeRelease(&deviceCollection);

if (!device) {
LOGW("Requested device not found, using default");
ActuallySetCurrentDevice("default");
Expand Down