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/output/input_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::InputStream;
use re_set_lib::audio::audio_structures::InputStream;
use super::input_stream_entry_impl;
use super::sink_box::SinkBox;

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

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

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

@ -1,5 +1,8 @@
use adw::prelude::PreferencesGroupExt;
use adw::prelude::PreferencesRowExt;
use re_set_lib::audio::audio_structures::Card;
use re_set_lib::audio::audio_structures::InputStream;
use re_set_lib::audio::audio_structures::Sink;
use std::sync::Arc;
use std::time::{Duration, SystemTime};
@ -13,7 +16,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, InputStream, Sink};
use crate::components::base::card_entry::CardEntry;
use crate::components::base::list_entry::ListEntry;
@ -458,7 +460,8 @@ pub fn start_output_box_listener(conn: Connection, sink_box: Arc<SinkBox>) -> Co
} else {
imp.reset_selected_sink.set_active(false);
}
imp.reset_sink_name.set_title(ir.sink.alias.clone().as_str());
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);
});
@ -558,7 +561,9 @@ pub fn start_output_box_listener(conn: Connection, sink_box: Arc<SinkBox>) -> Co
if entry.is_none() {
return;
}
output_box_imp.reset_input_streams.remove(&*entry.unwrap().0);
output_box_imp
.reset_input_streams
.remove(&*entry.unwrap().0);
list.remove(&ir.index);
});
});

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

@ -1,4 +1,5 @@
use adw::{ActionRow, ComboRow, PreferencesGroup};
use re_set_lib::audio::audio_structures::Sink;
use std::cell::RefCell;
use std::collections::HashMap;
use std::sync::{Arc, RwLock};
@ -9,7 +10,6 @@ use crate::components::output::input_stream_entry::InputStreamEntry;
use gtk::subclass::prelude::*;
use gtk::{glib, Box, Button, CheckButton, CompositeTemplate, Label, StringList, TemplateChild};
use gtk::{prelude::*, ProgressBar, Scale};
use ReSet_Lib::audio::audio::Sink;
use super::sink_box;
use super::sink_entry::SinkEntry;

2
src/components/output/sink_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::Sink;
use re_set_lib::audio::audio_structures::Sink;
use super::sink_entry_impl;

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

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