Skip to content

fix : --device flag not working has been fixed. #148

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

Merged
merged 6 commits into from
Jul 6, 2025
Merged

fix : --device flag not working has been fixed. #148

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
19526af
fix : --device flag not working has been fixed.
Vizkid04 Jun 5, 2025
8b0539b
fix : --device flag not working has been fixed.
Vizkid04 Jun 5, 2025
c2d0272
Merge pull request #1 from Vizkid04/Vizkid04-patch-1
Vizkid04 Jun 5, 2025
074b0d6
Merge branch 'main' into device_flag_fix
ErikReider Jul 6, 2025
86c798e
Use default name if none is found
ErikReider Jul 6, 2025
40c1f41
Also add fix to the Source type
ErikReider Jul 6, 2025
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
22 changes: 10 additions & 12 deletions src/server/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,17 +213,16 @@ pub fn change_device_volume(
VolumeDeviceType::Sink(controller) => {
let server_info = controller.get_server_info();
let global_name = get_device_name();
let device_name: String = if global_name.is_none() {
let device_name: String = if let Some(name) = global_name {
name
} else {
match server_info {
Ok(info) => info.default_sink_name.unwrap_or("".to_string()),
Err(e) => {
eprintln!("Error getting default_sink: {}", e);
return None;
eprintln!("Error getting default_sink: {}, using default", e);
DEVICE_NAME_DEFAULT.to_string()
}
}
} else {
set_device_name(DEVICE_NAME_DEFAULT.to_string());
get_device_name().unwrap()
};
match controller.get_device_by_name(&device_name) {
Ok(device) => (device, device_name.clone()),
Expand All @@ -236,17 +235,16 @@ pub fn change_device_volume(
VolumeDeviceType::Source(controller) => {
let server_info = controller.get_server_info();
let global_name = get_device_name();
let device_name: String = if global_name.is_none() {
let device_name: String = if let Some(name) = global_name {
name
} else {
match server_info {
Ok(info) => info.default_source_name.unwrap_or("".to_string()),
Err(e) => {
eprintln!("Error getting default_source: {}", e);
return None;
eprintln!("Error getting default_sink: {}, using default", e);
DEVICE_NAME_DEFAULT.to_string()
}
}
} else {
set_device_name(DEVICE_NAME_DEFAULT.to_string());
get_device_name().unwrap()
};
match controller.get_device_by_name(&device_name) {
Ok(device) => (device, device_name.clone()),
Expand Down