Skip to content
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

Jump to bottom

[Cubeb]Custom Implementation for Default Device selection #1017

Merged
merged 1 commit into from
Feb 18, 2024
Merged

[Cubeb]Custom Implementation for Default Device selection #1017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 9 additions & 4 deletions src/audio/CubebAPI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,15 +188,20 @@ std::vector<IAudioAPI::DeviceDescriptionPtr> CubebAPI::GetDevices()
return {};

std::vector<DeviceDescriptionPtr> result;
result.reserve(devices.count);
result.reserve(devices.count + 1); // Reserve space for the default device

// Add the default device to the list
auto defaultDevice = std::make_shared<CubebDeviceDescription>(nullptr, "default", L"Default Device");
result.emplace_back(defaultDevice);

for (size_t i = 0; i < devices.count; ++i)
{
//const auto& device = devices.device[i];
// const auto& device = devices.device[i];
if (devices.device[i].state == CUBEB_DEVICE_STATE_ENABLED)
{
auto device = std::make_shared<CubebDeviceDescription>(devices.device[i].devid, devices.device[i].device_id,
boost::nowide::widen(
devices.device[i].friendly_name));
boost::nowide::widen(
devices.device[i].friendly_name));
result.emplace_back(device);
}
}
Expand Down
13 changes: 9 additions & 4 deletions src/audio/CubebInputAPI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,15 +180,20 @@ std::vector<IAudioInputAPI::DeviceDescriptionPtr> CubebInputAPI::GetDevices()
return {};

std::vector<DeviceDescriptionPtr> result;
result.reserve(devices.count);
result.reserve(devices.count + 1); // Reserve space for the default device

// Add the default device to the list
auto defaultDevice = std::make_shared<CubebDeviceDescription>(nullptr, "default", L"Default Device");
result.emplace_back(defaultDevice);

for (size_t i = 0; i < devices.count; ++i)
{
//const auto& device = devices.device[i];
// const auto& device = devices.device[i];
if (devices.device[i].state == CUBEB_DEVICE_STATE_ENABLED)
{
auto device = std::make_shared<CubebDeviceDescription>(devices.device[i].devid, devices.device[i].device_id,
boost::nowide::widen(
devices.device[i].friendly_name));
boost::nowide::widen(
devices.device[i].friendly_name));
result.emplace_back(device);
}
}
Expand Down