Xetibo/ReSet
1
0
Fork 0
mirror of https://github.com/Xetibo/ReSet.git synced 2025-07-01 15:57:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: make all snake_case

Browse source
This commit is contained in:
Fabio Lenherr / DashieTM 2023-12-05 16:15:24 +01:00
parent 391182607d
commit d50ee65bdd
52 changed files with 766 additions and 783 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/components/output/input_stream_entry.rs
View file

@ -33,32 +33,32 @@ impl InputStreamEntry {
let box_imp = sink_box.imp();
let imp = obj.imp();
if stream.muted {
imp.resetSinkMute
imp.reset_sink_mute
.set_icon_name("audio-volume-muted-symbolic");
} else {
imp.resetSinkMute
imp.reset_sink_mute
.set_icon_name("audio-volume-high-symbolic");
}
let name = stream.application_name.clone() + ": " + stream.name.as_str();
imp.resetSinkSelection.set_title(name.as_str());
imp.resetSinkSelection
imp.reset_sink_selection.set_title(name.as_str());
imp.reset_sink_selection
.set_factory(Some(&create_dropdown_label_factory()));
set_combo_row_ellipsis(imp.resetSinkSelection.get());
set_combo_row_ellipsis(imp.reset_sink_selection.get());
let volume = stream.volume.first().unwrap_or(&0_u32);
let fraction = (*volume as f64 / 655.36).round();
let percentage = (fraction).to_string() + "%";
imp.resetVolumePercentage.set_text(&percentage);
imp.resetVolumeSlider.set_value(*volume as f64);
imp.reset_volume_percentage.set_text(&percentage);
imp.reset_volume_slider.set_value(*volume as f64);
imp.stream.replace(stream);
{
let sink = box_imp.reset_default_sink.borrow();
imp.associated_sink.replace((sink.index, sink.name.clone()));
}
imp.resetVolumeSlider.connect_change_value(
imp.reset_volume_slider.connect_change_value(
clone!(@weak imp => @default-return Propagation::Stop, move |_, _, value| {
let fraction = (value / 655.36).round();
let percentage = (fraction).to_string() + "%";
imp.resetVolumePercentage.set_text(&percentage);
imp.reset_volume_percentage.set_text(&percentage);
let mut stream = imp.stream.try_borrow();
while stream.is_err() {
stream = imp.stream.try_borrow();
@ -83,7 +83,7 @@ impl InputStreamEntry {
// list = box_imp.resetModelList.try_borrow();
// }
// let list = list.unwrap();
imp.resetSinkSelection.set_model(Some(&*list));
imp.reset_sink_selection.set_model(Some(&*list));
let map = box_imp.reset_sink_map.read().unwrap();
let sink_list = box_imp.reset_sink_list.read().unwrap();
let name = sink_list.get(&index);
@ -91,7 +91,7 @@ impl InputStreamEntry {
let name = &name.2;
let index = map.get(name);
if let Some(index) = index {
imp.resetSinkSelection.set_selected(index.1);
imp.reset_sink_selection.set_selected(index.1);
}
} else {
let mut name = box_imp.reset_default_sink.try_borrow();
@ -101,11 +101,11 @@ impl InputStreamEntry {
let name = &name.unwrap().alias;
let index = map.get(name);
if let Some(index) = index {
imp.resetSinkSelection.set_selected(index.1);
imp.reset_sink_selection.set_selected(index.1);
}
}
}
imp.resetSinkSelection.connect_selected_notify(
imp.reset_sink_selection.connect_selected_notify(
clone!(@weak imp, @weak box_imp => move |dropdown| {
let selected = dropdown.selected_item();
if selected.is_none() {
@ -132,7 +132,7 @@ impl InputStreamEntry {
set_sink_of_input_stream(stream.index, sink);
}),
);
imp.resetSinkMute
imp.reset_sink_mute
.connect_clicked(clone!(@weak imp => move |_| {
let stream = imp.stream.clone();
let mut stream = stream.try_borrow_mut();
@ -144,10 +144,10 @@ impl InputStreamEntry {
let muted = stream.muted;
let index = stream.index;
if muted {
imp.resetSinkMute
imp.reset_sink_mute
.set_icon_name("audio-volume-muted-symbolic");
} else {
imp.resetSinkMute
imp.reset_sink_mute
.set_icon_name("audio-volume-high-symbolic");
}
toggle_input_stream_mute(index, muted);

11
src/components/output/input_stream_entry_impl.rs
View file

@ -10,20 +10,19 @@ use ReSet_Lib::audio::audio::InputStream;
use super::input_stream_entry;
#[allow(non_snake_case)]
#[derive(Default, CompositeTemplate)]
#[template(resource = "/org/Xetibo/ReSet/resetInputStreamEntry.ui")]
pub struct InputStreamEntry {
#[template_child]
pub resetSinkSelection: TemplateChild<ComboRow>,
pub reset_sink_selection: TemplateChild<ComboRow>,
#[template_child]
pub resetSinkMute: TemplateChild<Button>,
pub reset_sink_mute: TemplateChild<Button>,
#[template_child]
pub resetVolumeSlider: TemplateChild<Scale>,
pub reset_volume_slider: TemplateChild<Scale>,
#[template_child]
pub resetVolumePercentage: TemplateChild<Label>,
pub reset_volume_percentage: TemplateChild<Label>,
#[template_child]
pub resetVolumeMeter: TemplateChild<ProgressBar>,
pub reset_volume_meter: TemplateChild<ProgressBar>,
pub stream: Arc<RefCell<InputStream>>,
pub associated_sink: Arc<RefCell<(u32, String)>>,
pub volume_time_stamp: RefCell<Option<SystemTime>>,

86
src/components/output/sink_box.rs
View file

@ -49,36 +49,36 @@ impl SinkBox {
pub fn setup_callbacks(&self) {
let self_imp = self.imp();
self_imp.resetSinksRow.set_activatable(true);
self_imp.reset_sinks_row.set_activatable(true);
self_imp
.resetSinksRow
.reset_sinks_row
.set_action_name(Some("navigation.push"));
self_imp
.resetSinksRow
.reset_sinks_row
.set_action_target_value(Some(&Variant::from("outputDevices")));
self_imp.resetCardsRow.set_activatable(true);
self_imp.reset_cards_row.set_activatable(true);
self_imp
.resetCardsRow
.reset_cards_row
.set_action_name(Some("navigation.push"));
self_imp
.resetCardsRow
.reset_cards_row
.set_action_target_value(Some(&Variant::from("profileConfiguration")));
self_imp.resetCardsRow.connect_action_name_notify(|_| {});
self_imp.reset_cards_row.connect_action_name_notify(|_| {});
self_imp.resetInputStreamButton.set_activatable(true);
self_imp.reset_input_stream_button.set_activatable(true);
self_imp
.resetInputStreamButton
.reset_input_stream_button
.set_action_name(Some("navigation.pop"));
self_imp.resetInputCardsBackButton.set_activatable(true);
self_imp.reset_input_cards_back_button.set_activatable(true);
self_imp
.resetInputCardsBackButton
.reset_input_cards_back_button
.set_action_name(Some("navigation.pop"));
self_imp
.resetSinkDropdown
.reset_sink_dropdown
.set_factory(Some(&create_dropdown_label_factory()));
set_combo_row_ellipsis(self_imp.resetSinkDropdown.get());
set_combo_row_ellipsis(self_imp.reset_sink_dropdown.get());
}
}
@ -120,8 +120,8 @@ pub fn populate_sinks(output_box: Arc<SinkBox>) {
let volume = sink.volume.first().unwrap_or(&0);
let fraction = (*volume as f64 / 655.36).round();
let percentage = (fraction).to_string() + "%";
output_box_imp.resetVolumePercentage.set_text(&percentage);
output_box_imp.resetVolumeSlider.set_value(*volume as f64);
output_box_imp.reset_volume_percentage.set_text(&percentage);
output_box_imp.reset_volume_slider.set_value(*volume as f64);
let mut list = output_box_imp.reset_sink_list.write().unwrap();
for sink in sinks {
let index = sink.index;
@ -139,18 +139,18 @@ pub fn populate_sinks(output_box: Arc<SinkBox>) {
let entry = Arc::new(ListEntry::new(&*sink_entry));
entry.set_activatable(false);
list.insert(index, (entry.clone(), sink_clone, alias));
output_box_imp.resetSinks.append(&*entry);
output_box_imp.reset_sinks.append(&*entry);
}
let list = output_box_imp.reset_model_list.read().unwrap();
output_box_imp.resetSinkDropdown.set_model(Some(&*list));
output_box_imp.reset_sink_dropdown.set_model(Some(&*list));
let map = output_box_imp.reset_sink_map.read().unwrap();
let name = output_box_imp.reset_default_sink.borrow();
let name = &name.alias;
let index = map.get(name);
if let Some(index) = index {
output_box_imp.resetSinkDropdown.set_selected(index.1);
output_box_imp.reset_sink_dropdown.set_selected(index.1);
}
output_box_imp.resetSinkDropdown.connect_selected_notify(
output_box_imp.reset_sink_dropdown.connect_selected_notify(
clone!(@weak output_box_imp => move |dropdown| {
let selected = dropdown.selected_item();
if selected.is_none() {
@ -172,12 +172,12 @@ pub fn populate_sinks(output_box: Arc<SinkBox>) {
}
output_box_ref
.imp()
.resetVolumeSlider
.reset_volume_slider
.connect_change_value(move |_, _, value| {
let imp = output_box_ref_slider.imp();
let fraction = (value / 655.36).round();
let percentage = (fraction).to_string() + "%";
imp.resetVolumePercentage.set_text(&percentage);
imp.reset_volume_percentage.set_text(&percentage);
let sink = imp.reset_default_sink.borrow();
let index = sink.index;
let channels = sink.channels;
@ -195,7 +195,7 @@ pub fn populate_sinks(output_box: Arc<SinkBox>) {
});
output_box_ref
.imp()
.resetSinkMute
.reset_sink_mute
.connect_clicked(move |_| {
let imp = output_box_ref_mute.imp();
let stream = imp.reset_default_sink.clone();
@ -204,10 +204,10 @@ pub fn populate_sinks(output_box: Arc<SinkBox>) {
let muted = stream.muted;
let index = stream.index;
if muted {
imp.resetSinkMute
imp.reset_sink_mute
.set_icon_name("audio-volume-muted-symbolic");
} else {
imp.resetSinkMute
imp.reset_sink_mute
.set_icon_name("audio-volume-high-symbolic");
}
toggle_sink_mute(index, muted);
@ -232,7 +232,7 @@ pub fn populate_inputstreams(output_box: Arc<SinkBox>) {
let entry = Arc::new(ListEntry::new(&*input_stream));
entry.set_activatable(false);
list.insert(index, (entry.clone(), input_stream.clone()));
output_box_imp.resetInputStreams.append(&*entry);
output_box_imp.reset_input_streams.append(&*entry);
}
});
});
@ -247,7 +247,7 @@ pub fn populate_cards(output_box: Arc<SinkBox>) {
glib::idle_add_once(move || {
let imp = output_box_ref.imp();
for card in cards {
imp.resetCards.add(&CardEntry::new(card));
imp.reset_cards.add(&CardEntry::new(card));
}
});
});
@ -376,7 +376,7 @@ pub fn start_output_box_listener(conn: Connection, sink_box: Arc<SinkBox>) -> Co
let entry = Arc::new(ListEntry::new(&*sink_entry));
entry.set_activatable(false);
list.insert(sink_index, (entry.clone(), sink_clone, alias.clone()));
output_box_imp.resetSinks.append(&*entry);
output_box_imp.reset_sinks.append(&*entry);
let mut map = output_box_imp.reset_sink_map.write().unwrap();
let mut index = output_box_imp.reset_model_index.write().unwrap();
output_box_imp
@ -406,7 +406,7 @@ pub fn start_output_box_listener(conn: Connection, sink_box: Arc<SinkBox>) -> Co
if entry.is_none() {
return;
}
output_box_imp.resetSinks.remove(&*entry.unwrap().0);
output_box_imp.reset_sinks.remove(&*entry.unwrap().0);
let alias = list.remove(&ir.index);
if alias.is_none() {
return;
@ -452,15 +452,15 @@ pub fn start_output_box_listener(conn: Connection, sink_box: Arc<SinkBox>) -> Co
}
let imp = entry.unwrap().1.imp();
if is_default {
output_box_imp.resetVolumePercentage.set_text(&percentage);
output_box_imp.resetVolumeSlider.set_value(*volume as f64);
imp.resetSelectedSink.set_active(true);
output_box_imp.reset_volume_percentage.set_text(&percentage);
output_box_imp.reset_volume_slider.set_value(*volume as f64);
imp.reset_selected_sink.set_active(true);
} else {
imp.resetSelectedSink.set_active(false);
imp.reset_selected_sink.set_active(false);
}
imp.resetSinkName.set_title(ir.sink.alias.clone().as_str());
imp.resetVolumePercentage.set_text(&percentage);
imp.resetVolumeSlider.set_value(*volume as f64);
imp.reset_sink_name.set_title(ir.sink.alias.clone().as_str());
imp.reset_volume_percentage.set_text(&percentage);
imp.reset_volume_slider.set_value(*volume as f64);
});
});
true
@ -482,7 +482,7 @@ pub fn start_output_box_listener(conn: Connection, sink_box: Arc<SinkBox>) -> Co
let entry = Arc::new(ListEntry::new(&*input_stream));
entry.set_activatable(false);
list.insert(index, (entry.clone(), input_stream.clone()));
output_box_imp.resetInputStreams.append(&*entry);
output_box_imp.reset_input_streams.append(&*entry);
});
});
true
@ -520,23 +520,23 @@ pub fn start_output_box_listener(conn: Connection, sink_box: Arc<SinkBox>) -> Co
}
let imp = entry.imp();
if ir.stream.muted {
imp.resetSinkMute
imp.reset_sink_mute
.set_icon_name("audio-volume-muted-symbolic");
} else {
imp.resetSinkMute
imp.reset_sink_mute
.set_icon_name("audio-volume-high-symbolic");
}
let name = ir.stream.application_name.clone() + ": " + ir.stream.name.as_str();
imp.resetSinkSelection.set_title(name.as_str());
imp.reset_sink_selection.set_title(name.as_str());
let volume = ir.stream.volume.first().unwrap_or(&0_u32);
let fraction = (*volume as f64 / 655.36).round();
let percentage = (fraction).to_string() + "%";
imp.resetVolumePercentage.set_text(&percentage);
imp.resetVolumeSlider.set_value(*volume as f64);
imp.reset_volume_percentage.set_text(&percentage);
imp.reset_volume_slider.set_value(*volume as f64);
let map = output_box_imp.reset_sink_map.read().unwrap();
let index = map.get(&alias);
if let Some(index) = index {
imp.resetSinkSelection.set_selected(index.1);
imp.reset_sink_selection.set_selected(index.1);
}
});
});
@ -558,7 +558,7 @@ pub fn start_output_box_listener(conn: Connection, sink_box: Arc<SinkBox>) -> Co
if entry.is_none() {
return;
}
output_box_imp.resetInputStreams.remove(&*entry.unwrap().0);
output_box_imp.reset_input_streams.remove(&*entry.unwrap().0);
list.remove(&ir.index);
});
});

25
src/components/output/sink_box_impl.rs
View file

@ -18,34 +18,33 @@ type SinkEntryMap = Arc<RwLock<HashMap<u32, (Arc<ListEntry>, Arc<SinkEntry>, Str
type InputStreamEntryMap = Arc<RwLock<HashMap<u32, (Arc<ListEntry>, Arc<InputStreamEntry>)>>>;
type SinkMap = Arc<RwLock<HashMap<String, (u32, u32, String)>>>;
#[allow(non_snake_case)]
#[derive(Default, CompositeTemplate)]
#[template(resource = "/org/Xetibo/ReSet/resetAudioOutput.ui")]
pub struct SinkBox {
#[template_child]
pub resetSinksRow: TemplateChild<ActionRow>,
pub reset_sinks_row: TemplateChild<ActionRow>,
#[template_child]
pub resetCardsRow: TemplateChild<ActionRow>,
pub reset_cards_row: TemplateChild<ActionRow>,
#[template_child]
pub resetSinkDropdown: TemplateChild<ComboRow>,
pub reset_sink_dropdown: TemplateChild<ComboRow>,
#[template_child]
pub resetSinkMute: TemplateChild<Button>,
pub reset_sink_mute: TemplateChild<Button>,
#[template_child]
pub resetVolumeSlider: TemplateChild<Scale>,
pub reset_volume_slider: TemplateChild<Scale>,
#[template_child]
pub resetVolumePercentage: TemplateChild<Label>,
pub reset_volume_percentage: TemplateChild<Label>,
#[template_child]
pub resetVolumeMeter: TemplateChild<ProgressBar>,
pub reset_volume_meter: TemplateChild<ProgressBar>,
#[template_child]
pub resetSinks: TemplateChild<Box>,
pub reset_sinks: TemplateChild<Box>,
#[template_child]
pub resetInputStreamButton: TemplateChild<ActionRow>,
pub reset_input_stream_button: TemplateChild<ActionRow>,
#[template_child]
pub resetInputStreams: TemplateChild<Box>,
pub reset_input_streams: TemplateChild<Box>,
#[template_child]
pub resetInputCardsBackButton: TemplateChild<ActionRow>,
pub reset_input_cards_back_button: TemplateChild<ActionRow>,
#[template_child]
pub resetCards: TemplateChild<PreferencesGroup>,
pub reset_cards: TemplateChild<PreferencesGroup>,
pub reset_default_check_button: Arc<CheckButton>,
pub reset_default_sink: Arc<RefCell<Sink>>,
pub reset_sink_list: SinkEntryMap,

24
src/components/output/sink_entry.rs
View file

@ -28,19 +28,19 @@ impl SinkEntry {
// TODO use event callback for progress bar -> this is the "im speaking" indicator
{
let imp = obj.imp();
imp.resetSinkName.set_title(stream.alias.clone().as_str());
imp.reset_sink_name.set_title(stream.alias.clone().as_str());
let name = Arc::new(stream.name.clone());
let volume = stream.volume.first().unwrap_or(&0_u32);
let fraction = (*volume as f64 / 655.36).round();
let percentage = (fraction).to_string() + "%";
imp.resetVolumePercentage.set_text(&percentage);
imp.resetVolumeSlider.set_value(*volume as f64);
imp.reset_volume_percentage.set_text(&percentage);
imp.reset_volume_slider.set_value(*volume as f64);
imp.stream.replace(stream);
imp.resetVolumeSlider.connect_change_value(
imp.reset_volume_slider.connect_change_value(
clone!(@weak imp => @default-return Propagation::Stop, move |_, _, value| {
let fraction = (value / 655.36).round();
let percentage = (fraction).to_string() + "%";
imp.resetVolumePercentage.set_text(&percentage);
imp.reset_volume_percentage.set_text(&percentage);
let sink = imp.stream.borrow();
let index = sink.index;
let channels = sink.channels;
@ -55,18 +55,18 @@ impl SinkEntry {
Propagation::Proceed
}),
);
imp.resetSelectedSink.set_group(Some(&*check_group));
imp.reset_selected_sink.set_group(Some(&*check_group));
if is_default {
imp.resetSelectedSink.set_active(true);
imp.reset_selected_sink.set_active(true);
} else {
imp.resetSelectedSink.set_active(false);
imp.reset_selected_sink.set_active(false);
}
imp.resetSelectedSink.connect_toggled(move |button| {
imp.reset_selected_sink.connect_toggled(move |button| {
if button.is_active() {
set_default_sink(name.clone());
}
});
imp.resetSinkMute
imp.reset_sink_mute
.connect_clicked(clone!(@weak imp => move |_| {
let stream = imp.stream.clone();
let mut stream = stream.borrow_mut();
@ -74,10 +74,10 @@ impl SinkEntry {
let muted = stream.muted;
let index = stream.index;
if muted {
imp.resetSinkMute
imp.reset_sink_mute
.set_icon_name("audio-volume-muted-symbolic");
} else {
imp.resetSinkMute
imp.reset_sink_mute
.set_icon_name("audio-volume-high-symbolic");
}
toggle_sink_mute(index, muted);

13
src/components/output/sink_entry_impl.rs
View file

@ -9,22 +9,21 @@ use gtk::subclass::prelude::*;
use gtk::{glib, Button, CheckButton, CompositeTemplate, Label, ProgressBar, Scale};
use ReSet_Lib::audio::audio::Sink;
#[allow(non_snake_case)]
#[derive(Default, CompositeTemplate)]
#[template(resource = "/org/Xetibo/ReSet/resetSinkEntry.ui")]
pub struct SinkEntry {
#[template_child]
pub resetSinkName: TemplateChild<ActionRow>,
pub reset_sink_name: TemplateChild<ActionRow>,
#[template_child]
pub resetSelectedSink: TemplateChild<CheckButton>,
pub reset_selected_sink: TemplateChild<CheckButton>,
#[template_child]
pub resetSinkMute: TemplateChild<Button>,
pub reset_sink_mute: TemplateChild<Button>,
#[template_child]
pub resetVolumeSlider: TemplateChild<Scale>,
pub reset_volume_slider: TemplateChild<Scale>,
#[template_child]
pub resetVolumePercentage: TemplateChild<Label>,
pub reset_volume_percentage: TemplateChild<Label>,
#[template_child]
pub resetVolumeMeter: TemplateChild<ProgressBar>,
pub reset_volume_meter: TemplateChild<ProgressBar>,
pub stream: Arc<RefCell<Sink>>,
pub volume_time_stamp: RefCell<Option<SystemTime>>,
}