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: Update lib

Browse source
This commit is contained in:
Fabio Lenherr / DashieTM 2023-12-06 17:14:24 +01:00
parent 0eb85fdf7c
commit c5c5f6761e
30 changed files with 62 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/input/output_stream_entry.rs
View file

@ -10,7 +10,7 @@ use dbus::Error;
use glib::subclass::types::ObjectSubclassIsExt;
use glib::{clone, Cast, Propagation};
use gtk::{gio, StringObject};
use ReSet_Lib::audio::audio::OutputStream;
use re_set_lib::audio::audio_structures::OutputStream;
use super::output_stream_entry_impl;
use super::source_box::SourceBox;

2
src/components/input/output_stream_entry_impl.rs
View file

@ -1,5 +1,6 @@
use adw::subclass::prelude::PreferencesGroupImpl;
use adw::{ComboRow, PreferencesGroup};
use re_set_lib::audio::audio_structures::OutputStream;
use std::cell::RefCell;
use std::sync::Arc;
use std::time::SystemTime;
@ -7,7 +8,6 @@ use std::time::SystemTime;
use crate::components::input::output_stream_entry;
use gtk::subclass::prelude::*;
use gtk::{glib, Button, CompositeTemplate, Label, ProgressBar, Scale};
use ReSet_Lib::audio::audio::OutputStream;
#[derive(Default, CompositeTemplate)]
#[template(resource = "/org/Xetibo/ReSet/resetOutputStreamEntry.ui")]

14
src/components/input/source_box.rs
View file

@ -1,4 +1,5 @@
use adw::prelude::PreferencesRowExt;
use re_set_lib::audio::audio_structures::{Card, OutputStream, Source};
use std::sync::Arc;
use std::time::{Duration, SystemTime};
@ -14,7 +15,6 @@ use glib::subclass::prelude::ObjectSubclassIsExt;
use glib::{clone, Cast, Propagation, Variant};
use gtk::prelude::ActionableExt;
use gtk::{gio, StringObject};
use ReSet_Lib::audio::audio::{Card, OutputStream, Source};
use crate::components::base::card_entry::CardEntry;
use crate::components::base::list_entry::ListEntry;
@ -144,8 +144,9 @@ pub fn populate_sources(input_box: Arc<SourceBox>) {
if let Some(index) = map.get(&name.alias) {
output_box_imp.reset_source_dropdown.set_selected(index.1);
}
output_box_imp.reset_source_dropdown.connect_selected_notify(
clone!(@weak output_box_imp => move |dropdown| {
output_box_imp
.reset_source_dropdown
.connect_selected_notify(clone!(@weak output_box_imp => move |dropdown| {
let selected = dropdown.selected_item();
if selected.is_none() {
return;
@ -161,8 +162,7 @@ pub fn populate_sources(input_box: Arc<SourceBox>) {
}
let sink = Arc::new(source.unwrap().2.clone());
set_default_source(sink);
}),
);
}));
}
output_box_ref
.imp()
@ -560,7 +560,9 @@ pub fn start_input_box_listener(conn: Connection, source_box: Arc<SourceBox>) ->
if entry.is_none() {
return;
}
output_box_imp.reset_output_streams.remove(&*entry.unwrap().0);
output_box_imp
.reset_output_streams
.remove(&*entry.unwrap().0);
});
});
true

2
src/components/input/source_box_impl.rs
View file

@ -1,4 +1,5 @@
use adw::{ActionRow, ComboRow, PreferencesGroup};
use re_set_lib::audio::audio_structures::Source;
use std::cell::RefCell;
use std::collections::HashMap;
use std::sync::{Arc, RwLock};
@ -9,7 +10,6 @@ use crate::components::input::source_box;
use gtk::subclass::prelude::*;
use gtk::{glib, CheckButton, CompositeTemplate, StringList, TemplateChild};
use gtk::{prelude::*, Button, Label, ProgressBar, Scale};
use ReSet_Lib::audio::audio::Source;
use super::output_stream_entry::OutputStreamEntry;
use super::source_entry::SourceEntry;

5
src/components/input/source_entry.rs
View file

@ -9,7 +9,7 @@ use dbus::Error;
use glib::subclass::types::ObjectSubclassIsExt;
use glib::{clone, Propagation};
use gtk::{gio, CheckButton};
use ReSet_Lib::audio::audio::Source;
use re_set_lib::audio::audio_structures::Source;
use super::source_entry_impl;
@ -28,7 +28,8 @@ impl SourceEntry {
// TODO use event callback for progress bar -> this is the "im speaking" indicator
{
let imp = obj.imp();
imp.reset_source_name.set_title(stream.alias.clone().as_str());
imp.reset_source_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();

2
src/components/input/source_entry_impl.rs
View file

@ -1,12 +1,12 @@
use adw::subclass::prelude::PreferencesGroupImpl;
use adw::{ActionRow, PreferencesGroup};
use re_set_lib::audio::audio_structures::Source;
use std::cell::RefCell;
use std::sync::Arc;
use std::time::SystemTime;
use gtk::subclass::prelude::*;
use gtk::{glib, Button, CheckButton, CompositeTemplate, Label, ProgressBar, Scale};
use ReSet_Lib::audio::audio::Source;
use super::source_entry;