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

fix: Use buffer for all audio sliders

Browse source
This commit is contained in:
Fabio Lenherr / DashieTM 2023-11-18 15:28:23 +01:00
parent 5a0e5d86bb
commit 03fc3790c0
19 changed files with 145 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
flatpak/cargo-sources.json
View file

@ -1042,14 +1042,14 @@
{
"type": "archive",
"archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/reset_daemon/reset_daemon-0.1.7.crate",
"sha256": "f7b48ba0698bdb4ead119140a557346907b40ae17cac324687a032b4d6ea9851",
"dest": "cargo/vendor/reset_daemon-0.1.7"
"url": "https://static.crates.io/crates/reset_daemon/reset_daemon-0.1.8.crate",
"sha256": "a861e230340e001757325a01fa33cfce9e29111f0228dd2abd1d62206f742803",
"dest": "cargo/vendor/reset_daemon-0.1.8"
},
{
"type": "inline",
"contents": "{\"package\": \"f7b48ba0698bdb4ead119140a557346907b40ae17cac324687a032b4d6ea9851\", \"files\": {}}",
"dest": "cargo/vendor/reset_daemon-0.1.7",
"contents": "{\"package\": \"a861e230340e001757325a01fa33cfce9e29111f0228dd2abd1d62206f742803\", \"files\": {}}",
"dest": "cargo/vendor/reset_daemon-0.1.8",
"dest-filename": ".cargo-checksum.json"
},
{

65
src/components/input/outputStreamEntry.rs
View file

@ -1,5 +1,5 @@
use std::sync::Arc;
use std::time::Duration;
use std::time::{Duration, SystemTime};
use adw::glib;
use adw::glib::Object;
@ -50,6 +50,15 @@ impl OutputStreamEntry {
let stream = stream.unwrap();
let index = stream.index;
let channels = stream.channels;
{
let mut time = imp.volumeTimeStamp.borrow_mut();
if time.is_some()
&& time.unwrap().elapsed().unwrap() < Duration::from_millis(50)
{
return Propagation::Proceed;
}
*time = Some(SystemTime::now());
}
set_outputstream_volume(value, index, channels);
Propagation::Proceed
}),
@ -127,39 +136,39 @@ impl OutputStreamEntry {
fn set_outputstream_volume(value: f64, index: u32, channels: u16) -> bool {
gio::spawn_blocking(move || {
let conn = Connection::new_session().unwrap();
let proxy = conn.with_proxy(
"org.xetibo.ReSet",
"/org/xetibo/ReSet",
Duration::from_millis(1000),
);
let _: Result<(), Error> = proxy.method_call(
"org.xetibo.ReSet",
"SetOutputStreamVolume",
(index, channels, value as u32),
);
// if res.is_err() {
// return false;
// }
// res.unwrap().0
let conn = Connection::new_session().unwrap();
let proxy = conn.with_proxy(
"org.xetibo.ReSet",
"/org/xetibo/ReSet",
Duration::from_millis(1000),
);
let _: Result<(), Error> = proxy.method_call(
"org.xetibo.ReSet",
"SetOutputStreamVolume",
(index, channels, value as u32),
);
// if res.is_err() {
// return false;
// }
// res.unwrap().0
});
true
}
fn toggle_output_stream_mute(index: u32, muted: bool) -> bool {
gio::spawn_blocking(move || {
let conn = Connection::new_session().unwrap();
let proxy = conn.with_proxy(
"org.xetibo.ReSet",
"/org/xetibo/ReSet",
Duration::from_millis(1000),
);
let _: Result<(), Error> =
proxy.method_call("org.xetibo.ReSet", "SetOutputStreamMute", (index, muted));
// if res.is_err() {
// return false;
// }
// res.unwrap().0
let conn = Connection::new_session().unwrap();
let proxy = conn.with_proxy(
"org.xetibo.ReSet",
"/org/xetibo/ReSet",
Duration::from_millis(1000),
);
let _: Result<(), Error> =
proxy.method_call("org.xetibo.ReSet", "SetOutputStreamMute", (index, muted));
// if res.is_err() {
// return false;
// }
// res.unwrap().0
});
true
}

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

@ -1,5 +1,6 @@
use std::cell::RefCell;
use std::sync::Arc;
use std::time::SystemTime;
use crate::components::input::outputStreamEntry;
use gtk::subclass::prelude::*;
@ -24,6 +25,7 @@ pub struct OutputStreamEntry {
pub resetVolumeMeter: TemplateChild<ProgressBar>,
pub stream: Arc<RefCell<OutputStream>>,
pub associatedSource: Arc<RefCell<(u32, String)>>,
pub volumeTimeStamp: RefCell<Option<SystemTime>>,
}
#[glib::object_subclass]

11
src/components/input/sourceBox.rs
View file

@ -1,6 +1,6 @@
use std::sync::atomic::Ordering;
use std::sync::Arc;
use std::time::Duration;
use std::time::{Duration, SystemTime};
use crate::components::base::listEntry::ListEntry;
use crate::components::base::utils::{
@ -151,6 +151,15 @@ pub fn populate_sources(input_box: Arc<SourceBox>) {
let source = imp.resetDefaultSource.borrow();
let index = source.index;
let channels = source.channels;
{
let mut time = imp.volumeTimeStamp.borrow_mut();
if time.is_some()
&& time.unwrap().elapsed().unwrap() < Duration::from_millis(50)
{
return Propagation::Proceed;
}
*time = Some(SystemTime::now());
}
set_source_volume(value, index, channels);
Propagation::Proceed
});

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

@ -1,6 +1,7 @@
use std::cell::RefCell;
use std::collections::HashMap;
use std::sync::{Arc, RwLock};
use std::time::SystemTime;
use crate::components::base::listEntry::ListEntry;
use crate::components::input::sourceBox;
@ -43,6 +44,7 @@ pub struct SourceBox {
// first u32 is the index of the source, the second the index in the model list and the third is
// the full name
pub resetSourceMap: Arc<RwLock<HashMap<String, (u32, u32, String)>>>,
pub volumeTimeStamp: RefCell<Option<SystemTime>>,
}
#[glib::object_subclass]

41
src/components/input/sourceEntry.rs
View file

@ -1,5 +1,5 @@
use std::sync::Arc;
use std::time::Duration;
use std::time::{Duration, SystemTime};
use adw::glib;
use adw::glib::Object;
@ -44,6 +44,15 @@ impl SourceEntry {
let source = imp.stream.borrow();
let index = source.index;
let channels = source.channels;
{
let mut time = imp.volumeTimeStamp.borrow_mut();
if time.is_some()
&& time.unwrap().elapsed().unwrap() < Duration::from_millis(50)
{
return Propagation::Proceed;
}
*time = Some(SystemTime::now());
}
set_source_volume(value, index, channels);
Propagation::Proceed
}),
@ -83,21 +92,21 @@ impl SourceEntry {
pub fn set_source_volume(value: f64, index: u32, channels: u16) -> bool {
gio::spawn_blocking(move || {
let conn = Connection::new_session().unwrap();
let proxy = conn.with_proxy(
"org.xetibo.ReSet",
"/org/xetibo/ReSet",
Duration::from_millis(1000),
);
let _: Result<(), Error> = proxy.method_call(
"org.xetibo.ReSet",
"SetSourceVolume",
(index, channels, value as u32),
);
// if res.is_err() {
// return false;
// }
// res.unwrap().0
let conn = Connection::new_session().unwrap();
let proxy = conn.with_proxy(
"org.xetibo.ReSet",
"/org/xetibo/ReSet",
Duration::from_millis(1000),
);
let _: Result<(), Error> = proxy.method_call(
"org.xetibo.ReSet",
"SetSourceVolume",
(index, channels, value as u32),
);
// if res.is_err() {
// return false;
// }
// res.unwrap().0
});
true
}

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

@ -1,5 +1,6 @@
use std::cell::RefCell;
use std::sync::Arc;
use std::time::SystemTime;
use gtk::subclass::prelude::*;
use gtk::{glib, Button, CompositeTemplate, Label, ProgressBar, Scale, CheckButton};
@ -24,6 +25,7 @@ pub struct SourceEntry {
#[template_child]
pub resetVolumeMeter: TemplateChild<ProgressBar>,
pub stream: Arc<RefCell<Source>>,
pub volumeTimeStamp: RefCell<Option<SystemTime>>,
}
#[glib::object_subclass]

4
src/components/output/inputStreamEntry.rs
View file

@ -1,4 +1,3 @@
use std::cell::RefCell;
use std::sync::Arc;
use std::time::{Duration, SystemTime};
@ -9,8 +8,7 @@ use dbus::blocking::Connection;
use dbus::Error;
use glib::subclass::types::ObjectSubclassIsExt;
use glib::{clone, Cast, Propagation};
use gtk::prelude::ScaleExt;
use gtk::{gio, PositionType, StringObject};
use gtk::{gio, StringObject};
use ReSet_Lib::audio::audio::InputStream;
use super::inputStreamEntryImpl;

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

@ -1,6 +1,6 @@
use std::sync::atomic::Ordering;
use std::sync::Arc;
use std::time::Duration;
use std::time::{Duration, SystemTime};
use crate::components::base::listEntry::ListEntry;
use crate::components::base::utils::{
@ -159,6 +159,15 @@ pub fn populate_sinks(output_box: Arc<SinkBox>) {
let sink = imp.resetDefaultSink.borrow();
let index = sink.index;
let channels = sink.channels;
{
let mut time = imp.volumeTimeStamp.borrow_mut();
if time.is_some()
&& time.unwrap().elapsed().unwrap() < Duration::from_millis(50)
{
return Propagation::Proceed;
}
*time = Some(SystemTime::now());
}
set_sink_volume(value, index, channels);
Propagation::Proceed
});

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

@ -1,6 +1,7 @@
use std::cell::RefCell;
use std::collections::HashMap;
use std::sync::{Arc, RwLock};
use std::time::SystemTime;
use crate::components::base::listEntry::ListEntry;
use crate::components::output::inputStreamEntry::InputStreamEntry;
@ -46,6 +47,7 @@ pub struct SinkBox {
// the full name
pub resetSinkMap: Arc<RwLock<HashMap<String, (u32, u32, String)>>>,
// pub : Arc<Mutex<Vec<ListEntry>>>,
pub volumeTimeStamp: RefCell<Option<SystemTime>>,
}
#[glib::object_subclass]

9
src/components/output/sinkEntry.rs
View file

@ -1,5 +1,5 @@
use std::sync::Arc;
use std::time::Duration;
use std::time::{Duration, SystemTime};
use adw::glib;
use adw::glib::Object;
@ -42,6 +42,13 @@ impl SinkEntry {
let sink = imp.stream.borrow();
let index = sink.index;
let channels = sink.channels;
{
let mut time = imp.volumeTimeStamp.borrow_mut();
if time.is_some() && time.unwrap().elapsed().unwrap() < Duration::from_millis(50) {
return Propagation::Proceed;
}
*time = Some(SystemTime::now());
}
set_sink_volume(value, index, channels);
Propagation::Proceed
}),

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

@ -1,5 +1,6 @@
use std::cell::RefCell;
use std::sync::Arc;
use std::time::SystemTime;
use crate::components::output::sinkEntry;
use gtk::subclass::prelude::*;
@ -23,6 +24,7 @@ pub struct SinkEntry {
#[template_child]
pub resetVolumeMeter: TemplateChild<ProgressBar>,
pub stream: Arc<RefCell<Sink>>,
pub volumeTimeStamp: RefCell<Option<SystemTime>>,
}
#[glib::object_subclass]

3
src/resources/resetAudioInput.ui
View file

@ -92,6 +92,9 @@
<property name="hexpand">True</property>
<property name="valign">center</property>
<property name="value-pos">bottom</property>
<marks>
<mark position="bottom" value="65536.0">100%</mark>
</marks>
</object>
</child>
<child>

3
src/resources/resetAudioOutput.ui
View file

@ -92,6 +92,9 @@
<property name="hexpand">True</property>
<property name="valign">center</property>
<property name="value-pos">bottom</property>
<marks>
<mark position="bottom" value="65536.0">100%</mark>
</marks>
</object>
</child>
<child>

2
src/resources/resetInputStreamEntry.ui
View file

@ -42,7 +42,7 @@
<object class="GtkScale" id="resetVolumeSlider">
<property name="adjustment">
<object class="GtkAdjustment">
<property name="page-increment">10000.0</property>
<property name="page-increment">2005.4016</property>
<property name="step-increment">2005.4016</property>
<property name="upper">100270.08</property>
</object>

3
src/resources/resetOutputStreamEntry.ui
View file

@ -50,6 +50,9 @@
<property name="hexpand">True</property>
<property name="valign">center</property>
<property name="value-pos">bottom</property>
<marks>
<mark position="bottom" value="65536.0">100%</mark>
</marks>
</object>
</child>
<child>

3
src/resources/resetSinkEntry.ui
View file

@ -50,6 +50,9 @@
<property name="hexpand">True</property>
<property name="valign">center</property>
<property name="value-pos">bottom</property>
<marks>
<mark position="bottom" value="65536.0">100%</mark>
</marks>
</object>
</child>
<child>

3
src/resources/resetSourceEntry.ui
View file

@ -50,6 +50,9 @@
<property name="hexpand">True</property>
<property name="valign">center</property>
<property name="value-pos">bottom</property>
<marks>
<mark position="bottom" value="65536.0">100%</mark>
</marks>
</object>
</child>
<child>

26
src/resources/resetUI.cmb
View file

@ -438,7 +438,7 @@
(7,9,"GtkScale","value-pos","bottom",None,None,None,None,None,None,None,None,None),
(7,9,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
(7,9,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
(7,10,"GtkAdjustment","page-increment","10000.0",None,None,None,None,None,None,None,None,None),
(7,10,"GtkAdjustment","page-increment","2005.4016",None,None,None,None,None,None,None,None,None),
(7,10,"GtkAdjustment","step-increment","2005.4016",None,None,None,None,None,None,None,None,None),
(7,10,"GtkAdjustment","upper","100270.08",None,None,None,None,None,None,None,None,None),
(7,11,"GtkButton","icon-name","audio-volume-high-symbolic",None,None,None,None,None,None,None,None,None),
@ -800,11 +800,31 @@
(3,42,"GtkWidget",1,1,None,None,None,None,None,None),
(3,42,"GtkWidget",2,2,None,1,None,None,None,None),
(7,9,"GtkScale",1,1,None,None,None,None,None,None),
(7,9,"GtkScale",2,2,"100%",1,None,None,None,None)
(7,9,"GtkScale",2,2,"100%",1,None,None,None,None),
(8,99,"GtkScale",1,1,None,None,None,None,None,None),
(8,99,"GtkScale",2,2,"100%",1,None,None,None,None),
(12,25,"GtkScale",1,1,None,None,None,None,None,None),
(12,25,"GtkScale",2,2,"100%",1,None,None,None,None),
(13,17,"GtkScale",1,1,None,None,None,None,None,None),
(13,17,"GtkScale",2,2,"100%",1,None,None,None,None),
(18,7,"GtkScale",1,1,None,None,None,None,None,None),
(18,7,"GtkScale",2,2,"100%",1,None,None,None,None),
(19,7,"GtkScale",1,1,None,None,None,None,None,None),
(19,7,"GtkScale",2,2,"100%",1,None,None,None,None)
</object_data>
<object_data_arg>
(7,9,"GtkScale",2,2,"value","65536.0"),
(3,42,"GtkWidget",2,2,"name","b"),
(7,9,"GtkScale",2,2,"position","bottom")
(7,9,"GtkScale",2,2,"position","bottom"),
(8,99,"GtkScale",2,2,"position","bottom"),
(8,99,"GtkScale",2,2,"value","65536.0"),
(12,25,"GtkScale",2,2,"value","65536.0"),
(12,25,"GtkScale",2,2,"position","bottom"),
(13,17,"GtkScale",2,2,"value","65536.0"),
(13,17,"GtkScale",2,2,"position","bottom"),
(18,7,"GtkScale",2,2,"position","bottom"),
(18,7,"GtkScale",2,2,"value","65536.0"),
(19,7,"GtkScale",2,2,"position","bottom"),
(19,7,"GtkScale",2,2,"value","65536.0")
</object_data_arg>
</cambalache-project>