leyoda/cosmic-applets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

audio: Make output_icon_name/input_icon_name functions

Browse source 
There's no need to deviate from a functional pattern here.
This commit is contained in:
Ian Douglas Scott 2024-06-17 18:55:02 -07:00 • committed by Ian Douglas Scott
parent 901a70d7a1
commit 35491b80a2
1 changed files with 16 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

42
cosmic-applet-audio/src/lib.rs
View file

@ -65,8 +65,6 @@ pub struct Audio {
outputs: Vec<DeviceInfo>, outputs: Vec<DeviceInfo>,
inputs: Vec<DeviceInfo>, inputs: Vec<DeviceInfo>,
pulse_state: PulseState, pulse_state: PulseState,
icon_name: String,
input_icon_name: String,
popup: Option<window::Id>, popup: Option<window::Id>,
timeline: Timeline, timeline: Timeline,
config: AudioAppletConfig, config: AudioAppletConfig,
@ -77,51 +75,47 @@ pub struct Audio {
impl Audio { impl Audio {
fn update_output(&mut self, output: Option<DeviceInfo>) { fn update_output(&mut self, output: Option<DeviceInfo>) {
self.current_output = output; self.current_output = output;
self.apply_output_volume();
} }
fn apply_output_volume(&mut self) { fn output_icon_name(&self) -> &'static str {
let Some(output) = self.current_output.as_ref() else { let Some(output) = self.current_output.as_ref() else {
self.icon_name = "audio-volume-muted-symbolic".to_string(); return "audio-volume-muted-symbolic";
return;
}; };
let volume = output.volume.avg(); let volume = output.volume.avg();
let output_volume = volume_to_percent(volume); let output_volume = volume_to_percent(volume);
if volume.is_muted() { if volume.is_muted() {
self.icon_name = "audio-volume-muted-symbolic".to_string(); "audio-volume-muted-symbolic"
} else if output_volume < 33.0 { } else if output_volume < 33.0 {
self.icon_name = "audio-volume-low-symbolic".to_string(); "audio-volume-low-symbolic"
} else if output_volume < 66.0 { } else if output_volume < 66.0 {
self.icon_name = "audio-volume-medium-symbolic".to_string(); "audio-volume-medium-symbolic"
} else if output_volume <= 100.0 { } else if output_volume <= 100.0 {
self.icon_name = "audio-volume-high-symbolic".to_string(); "audio-volume-high-symbolic"
} else { } else {
self.icon_name = "audio-volume-overamplified-symbolic".to_string(); "audio-volume-overamplified-symbolic"
} }
} }
fn update_input(&mut self, input: Option<DeviceInfo>) { fn update_input(&mut self, input: Option<DeviceInfo>) {
self.current_input = input; self.current_input = input;
self.apply_input_volume();
} }
fn apply_input_volume(&mut self) { fn input_icon_name(&self) -> &'static str {
let Some(input) = self.current_input.as_ref() else { let Some(input) = self.current_input.as_ref() else {
self.input_icon_name = "microphone-sensitivity-muted-symbolic".to_string(); return "microphone-sensitivity-muted-symbolic";
return;
}; };
let volume = input.volume.avg(); let volume = input.volume.avg();
let input_volume = volume_to_percent(volume); let input_volume = volume_to_percent(volume);
if volume.is_muted() || input_volume == 0.0 { if volume.is_muted() || input_volume == 0.0 {
self.input_icon_name = "microphone-sensitivity-muted-symbolic".to_string(); "microphone-sensitivity-muted-symbolic"
} else if input_volume < 33.0 { } else if input_volume < 33.0 {
self.input_icon_name = "microphone-sensitivity-low-symbolic".to_string(); "microphone-sensitivity-low-symbolic"
} else if input_volume < 66.0 { } else if input_volume < 66.0 {
self.input_icon_name = "microphone-sensitivity-medium-symbolic".to_string(); "microphone-sensitivity-medium-symbolic"
} else { } else {
self.input_icon_name = "microphone-sensitivity-high-symbolic".to_string(); "microphone-sensitivity-high-symbolic"
} }
} }
} }
@ -280,8 +274,6 @@ impl cosmic::Application for Audio {
current_input: None, current_input: None,
outputs: vec![], outputs: vec![],
inputs: vec![], inputs: vec![],
icon_name: "audio-volume-high-symbolic".to_string(),
input_icon_name: "audio-input-microphone-symbolic".to_string(),
token_tx: None, token_tx: None,
..Default::default() ..Default::default()
}, },
@ -342,7 +334,6 @@ impl cosmic::Application for Audio {
self.current_output self.current_output
.as_mut() .as_mut()
.map(|o| o.volume.set(o.volume.len(), percent_to_volume(vol))); .map(|o| o.volume.set(o.volume.len(), percent_to_volume(vol)));
self.apply_output_volume();
if let PulseState::Connected(connection) = &mut self.pulse_state { if let PulseState::Connected(connection) = &mut self.pulse_state {
if let Some(device) = &self.current_output { if let Some(device) = &self.current_output {
if let Some(name) = &device.name { if let Some(name) = &device.name {
@ -358,7 +349,6 @@ impl cosmic::Application for Audio {
self.current_input self.current_input
.as_mut() .as_mut()
.map(|i| i.volume.set(i.volume.len(), percent_to_volume(vol))); .map(|i| i.volume.set(i.volume.len(), percent_to_volume(vol)));
self.apply_input_volume();
if let PulseState::Connected(connection) = &mut self.pulse_state { if let PulseState::Connected(connection) = &mut self.pulse_state {
if let Some(device) = &self.current_input { if let Some(device) = &self.current_input {
if let Some(name) = &device.name { if let Some(name) = &device.name {
@ -576,7 +566,7 @@ impl cosmic::Application for Audio {
let btn = self let btn = self
.core .core
.applet .applet
.icon_button(&self.icon_name) .icon_button(self.output_icon_name())
.on_press(Message::TogglePopup); .on_press(Message::TogglePopup);
if let Some(playback_buttons) = self.playback_buttons() { if let Some(playback_buttons) = self.playback_buttons() {
match self.core.applet.anchor { match self.core.applet.anchor {
@ -622,7 +612,7 @@ impl cosmic::Application for Audio {
column![ column![
padded_control( padded_control(
row![ row![
icon::from_name(self.icon_name.as_str()) icon::from_name(self.output_icon_name())
.size(24) .size(24)
.symbolic(true), .symbolic(true),
slider(0.0..=100.0, out_f64, Message::SetOutputVolume) slider(0.0..=100.0, out_f64, Message::SetOutputVolume)
@ -637,7 +627,7 @@ impl cosmic::Application for Audio {
), ),
padded_control( padded_control(
row![ row![
icon::from_name(self.input_icon_name.as_str()) icon::from_name(self.input_icon_name())
.size(24) .size(24)
.symbolic(true), .symbolic(true),
slider(0.0..=100.0, in_f64, Message::SetInputVolume) slider(0.0..=100.0, in_f64, Message::SetInputVolume)