From 2f1099267a3d3eea087f8c0705def46c77d3b668 Mon Sep 17 00:00:00 2001
From: Fabio Lenherr <fabio.lenherr@gmail.com>
Date: Tue, 14 Nov 2023 18:22:10 +0100
Subject: [PATCH 1/4] chore: Rename UI files

---
 Cargo.toml                                    |   2 +-
 src/components/input/mod.rs                   |   6 +-
 ...putStreamEntry.rs => outputStreamEntry.rs} |   7 +-
 .../outputStreamEntryImpl.rs}                 |  24 ++--
 src/components/input/sourceBox.rs             |   2 +-
 src/components/input/sourceBoxImpl.rs         |  36 +++--
 src/components/input/sourceEntry.rs           |  72 ++++++++++
 src/components/input/sourceEntryImpl.rs       |  48 +++++++
 src/components/output/audioBox.rs             |  24 ++--
 src/components/output/audioBoxImpl.rs         |  17 ++-
 src/components/output/audioSource.rs          |  34 -----
 src/components/output/inputStreamEntry.rs     |  72 ++++++++++
 .../{input => output}/inputStreamEntryImpl.rs |  18 ++-
 src/components/output/mod.rs                  |   6 +-
 src/components/output/sinkEntry.rs            |  72 ++++++++++
 src/components/output/sinkEntryImpl.rs        |  47 +++++++
 ...{resetMicrophone.ui => resetAudioInput.ui} |  22 +---
 .../{resetAudio.ui => resetAudioOutput.ui}    |  10 +-
 src/resources/resetBluetooth.ui               |   2 +-
 src/resources/resetBluetoothEntry.ui          |   2 +-
 src/resources/resetInputStreamEntry.ui        |  15 ++-
 src/resources/resetListBoxRow.ui              |   2 +-
 src/resources/resetMainWindow.ui              |   2 +-
 ...ourceEntry.ui => resetOutpuStreamEntry.ui} |  28 ++--
 src/resources/resetOutputStreamEntry.ui       |   7 +-
 src/resources/resetPopup.ui                   |   2 +-
 src/resources/resetSavedWifiEntry.ui          |   2 +-
 src/resources/resetSettingBox.ui              |   2 +-
 src/resources/resetSidebarEntry.ui            |   2 +-
 src/resources/resetSinkEntry.ui               |  69 ++++++++++
 src/resources/resetSourceEntry.ui             |  69 ++++++++++
 src/resources/resetUI.cmb                     | 123 ++++++++++++++----
 src/resources/resetWiFi.ui                    |   2 +-
 src/resources/resetWifiEntry.ui               |   2 +-
 src/resources/resources.gresource.xml         |   5 +-
 35 files changed, 679 insertions(+), 176 deletions(-)
 rename src/components/input/{inputStreamEntry.rs => outputStreamEntry.rs} (60%)
 rename src/components/{output/audioSourceImpl.rs => input/outputStreamEntryImpl.rs} (61%)
 create mode 100644 src/components/input/sourceEntry.rs
 create mode 100644 src/components/input/sourceEntryImpl.rs
 delete mode 100644 src/components/output/audioSource.rs
 create mode 100644 src/components/output/inputStreamEntry.rs
 rename src/components/{input => output}/inputStreamEntryImpl.rs (67%)
 create mode 100644 src/components/output/sinkEntry.rs
 create mode 100644 src/components/output/sinkEntryImpl.rs
 rename src/resources/{resetMicrophone.ui => resetAudioInput.ui} (91%)
 rename src/resources/{resetAudio.ui => resetAudioOutput.ui} (97%)
 rename src/resources/{resetMicSourceEntry.ui => resetOutpuStreamEntry.ui} (66%)
 create mode 100644 src/resources/resetSinkEntry.ui
 create mode 100644 src/resources/resetSourceEntry.ui

diff --git a/Cargo.toml b/Cargo.toml
index c6a2adb..6bf4340 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,7 +6,7 @@ description = "A wip universal Linux settings application."
 
 [dependencies]
 reset_daemon = "0.1.2"
-ReSet-Lib = "0.2.6"
+ReSet-Lib = "0.2.7"
 adw = { version = "0.5.3", package = "libadwaita", features = ["v1_4"] }
 dbus = "0.9.7"
 gtk = { version = "0.7.3", package = "gtk4", features = ["v4_12"] }
diff --git a/src/components/input/mod.rs b/src/components/input/mod.rs
index 5dc57f2..83908c2 100644
--- a/src/components/input/mod.rs
+++ b/src/components/input/mod.rs
@@ -1,5 +1,7 @@
 #![allow(non_snake_case)]
-pub mod inputStreamEntry;
 pub mod sourceBox;
 pub mod sourceBoxImpl;
-pub mod inputStreamEntryImpl;
\ No newline at end of file
+pub mod outputStreamEntry;
+pub mod outputStreamEntryImpl;
+pub mod sourceEntry;
+pub mod sourceEntryImpl;
diff --git a/src/components/input/inputStreamEntry.rs b/src/components/input/outputStreamEntry.rs
similarity index 60%
rename from src/components/input/inputStreamEntry.rs
rename to src/components/input/outputStreamEntry.rs
index 97a1477..a522b12 100644
--- a/src/components/input/inputStreamEntry.rs
+++ b/src/components/input/outputStreamEntry.rs
@@ -1,14 +1,15 @@
-use crate::components::input::inputStreamEntryImpl;
 use adw::glib;
 use adw::glib::Object;
 
+use super::outputStreamEntryImpl;
+
 glib::wrapper! {
-    pub struct InputStreamEntry(ObjectSubclass<inputStreamEntryImpl::InputStreamEntry>)
+    pub struct OutputStreamEntry(ObjectSubclass<outputStreamEntryImpl::OutputStreamEntry>)
     @extends gtk::Box, gtk::Widget,
     @implements gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget, gtk::Orientable;
 }
 
-impl InputStreamEntry {
+impl OutputStreamEntry {
     pub fn new() -> Self {
         Object::builder().build()
     }
diff --git a/src/components/output/audioSourceImpl.rs b/src/components/input/outputStreamEntryImpl.rs
similarity index 61%
rename from src/components/output/audioSourceImpl.rs
rename to src/components/input/outputStreamEntryImpl.rs
index 58d3dce..c90ed5e 100644
--- a/src/components/output/audioSourceImpl.rs
+++ b/src/components/input/outputStreamEntryImpl.rs
@@ -1,17 +1,15 @@
-use std::cell::{Cell, RefCell};
-
-use crate::components::output::audioSource;
+use crate::components::input::outputStreamEntry;
 use gtk::subclass::prelude::*;
-use gtk::{glib, Button, CompositeTemplate, DropDown, Label, ProgressBar, Scale};
+use gtk::{glib, Button, CompositeTemplate, Label, ProgressBar, Scale, DropDown};
 
 #[allow(non_snake_case)]
 #[derive(Default, CompositeTemplate)]
 #[template(resource = "/org/Xetibo/ReSet/resetOutputStreamEntry.ui")]
-pub struct AudioSourceEntry {
+pub struct OutputStreamEntry {
     #[template_child]
     pub resetSourceName: TemplateChild<Label>,
     #[template_child]
-    pub resetSelectedSink: TemplateChild<DropDown>,
+    pub resetSelectedSource: TemplateChild<DropDown>,
     #[template_child]
     pub resetSourceMute: TemplateChild<Button>,
     #[template_child]
@@ -20,15 +18,12 @@ pub struct AudioSourceEntry {
     pub resetVolumePercentage: TemplateChild<Label>,
     #[template_child]
     pub resetVolumeMeter: TemplateChild<ProgressBar>,
-    pub associatedIndex: Cell<u32>,
-    pub isMuted: Cell<bool>,
-    pub volume: RefCell<Vec<u32>>,
 }
 
 #[glib::object_subclass]
-impl ObjectSubclass for AudioSourceEntry {
+impl ObjectSubclass for OutputStreamEntry {
     const NAME: &'static str = "resetOutputStreamEntry";
-    type Type = audioSource::AudioSourceEntry;
+    type Type = outputStreamEntry::OutputStreamEntry;
     type ParentType = gtk::Box;
 
     fn class_init(klass: &mut Self::Class) {
@@ -40,8 +35,9 @@ impl ObjectSubclass for AudioSourceEntry {
     }
 }
 
-impl BoxImpl for AudioSourceEntry {}
+impl BoxImpl for OutputStreamEntry {}
 
-impl ObjectImpl for AudioSourceEntry {}
+impl ObjectImpl for OutputStreamEntry {}
+
+impl WidgetImpl for OutputStreamEntry {}
 
-impl WidgetImpl for AudioSourceEntry {}
diff --git a/src/components/input/sourceBox.rs b/src/components/input/sourceBox.rs
index d6d0714..4ad1272 100644
--- a/src/components/input/sourceBox.rs
+++ b/src/components/input/sourceBox.rs
@@ -21,6 +21,6 @@ impl SourceBox {
         selfImp.resetSourceRow.set_action_name(Some("navigation.push"));
         selfImp.resetSourceRow.set_action_target_value(Some(&Variant::from("sources")));
 
-        selfImp.resetInputStreamButton.set_action_name(Some("navigation.pop"));
+        selfImp.resetOutputStreamButton.set_action_name(Some("navigation.pop"));
     }
 }
diff --git a/src/components/input/sourceBoxImpl.rs b/src/components/input/sourceBoxImpl.rs
index a70bed5..330599e 100644
--- a/src/components/input/sourceBoxImpl.rs
+++ b/src/components/input/sourceBoxImpl.rs
@@ -1,35 +1,50 @@
+use std::cell::RefCell;
 use std::sync::{Arc, Mutex};
 
 use crate::components::base::listEntry::ListEntry;
-use crate::components::input::inputStreamEntry::InputStreamEntry;
 use crate::components::input::sourceBox;
-use gtk::prelude::*;
 use gtk::subclass::prelude::*;
 use gtk::{glib, CompositeTemplate, DropDown, TemplateChild};
+use gtk::{prelude::*, Button, Label, ProgressBar, Scale};
 use ReSet_Lib::audio::audio::{OutputStream, Source};
 
+use super::outputStreamEntry::OutputStreamEntry;
+
 #[allow(non_snake_case)]
 #[derive(Default, CompositeTemplate)]
-#[template(resource = "/org/Xetibo/ReSet/resetMicrophone.ui")]
+#[template(resource = "/org/Xetibo/ReSet/resetAudioInput.ui")]
 pub struct SourceBox {
-    #[template_child]
-    pub resetSourceDropdown: TemplateChild<DropDown>,
     #[template_child]
     pub resetSourceRow: TemplateChild<ListEntry>,
     #[template_child]
-    pub resetInputStreamButton: TemplateChild<ListEntry>,
-    pub resetSources: Arc<Mutex<Vec<Source>>>,
-    pub resetOutputStreams: Arc<Mutex<Vec<OutputStream>>>,
+    pub resetSourceDropdown: TemplateChild<DropDown>,
+    #[template_child]
+    pub resetSourceMute: TemplateChild<Button>,
+    #[template_child]
+    pub resetVolumeSlider: TemplateChild<Scale>,
+    #[template_child]
+    pub resetVolumePercentage: TemplateChild<Label>,
+    #[template_child]
+    pub resetVolumeMeter: TemplateChild<ProgressBar>,
+    #[template_child]
+    pub resetSources: TemplateChild<gtk::Box>,
+    #[template_child]
+    pub resetOutputStreamButton: TemplateChild<ListEntry>,
+    #[template_child]
+    pub resetOutputStreams: TemplateChild<gtk::Box>,
+    pub resetDefaultSource: RefCell<Option<Source>>,
+    pub resetSourceList: Arc<Mutex<Vec<Source>>>,
+    pub resetOutputStreamList: Arc<Mutex<Vec<OutputStream>>>,
 }
 
 #[glib::object_subclass]
 impl ObjectSubclass for SourceBox {
-    const NAME: &'static str = "resetMicrophone";
+    const NAME: &'static str = "resetAudioInput";
     type Type = sourceBox::SourceBox;
     type ParentType = gtk::Box;
 
     fn class_init(klass: &mut Self::Class) {
-        InputStreamEntry::ensure_type();
+        OutputStreamEntry::ensure_type();
         ListEntry::ensure_type();
         klass.bind_template();
     }
@@ -55,4 +70,3 @@ impl WidgetImpl for SourceBox {}
 impl WindowImpl for SourceBox {}
 
 impl ApplicationWindowImpl for SourceBox {}
-
diff --git a/src/components/input/sourceEntry.rs b/src/components/input/sourceEntry.rs
new file mode 100644
index 0000000..00212fb
--- /dev/null
+++ b/src/components/input/sourceEntry.rs
@@ -0,0 +1,72 @@
+use std::cell::RefCell;
+use std::sync::Arc;
+use std::time::Duration;
+
+use adw::glib;
+use adw::glib::Object;
+use adw::prelude::RangeExt;
+use dbus::blocking::Connection;
+use dbus::Error;
+use glib::subclass::types::ObjectSubclassIsExt;
+use glib::{clone, Propagation};
+use ReSet_Lib::audio::audio::Source;
+
+use super::sourceEntryImpl;
+
+glib::wrapper! {
+    pub struct SourceEntry(ObjectSubclass<sourceEntryImpl::SourceEntry>)
+    @extends gtk::Box, gtk::Widget,
+    @implements gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget, gtk::Orientable;
+}
+
+impl SourceEntry {
+    pub fn new(stream: Source) -> Self {
+        let obj: Self = Object::builder().build();
+        // TODO use event callback for progress bar -> this is the "im speaking" indicator
+        // TODO map the slider to volume
+        // TODO properly use volume fraction
+        // TODO map mute to callback
+        // TODO map dropdown
+        {
+            let imp = obj.imp();
+            imp.resetSourceName.set_text(stream.name.clone().as_str());
+            let volume = stream.volume.first().unwrap_or_else(|| &(0 as 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.stream.replace(stream);
+            imp.resetVolumeSlider.connect_change_value(
+                clone!(@weak imp => @default-return Propagation::Stop, move |_, _, value| {
+                    let fraction = (value / 655.36).round();
+                    println!("{fraction}");
+                    let percentage = (fraction).to_string() + "%";
+                    imp.resetVolumePercentage.set_text(&percentage);
+                    set_inputstream_volume(value, imp.stream.clone());
+                    Propagation::Proceed
+                }),
+            );
+        }
+        obj
+    }
+}
+
+fn set_inputstream_volume(value: f64, stream: Arc<RefCell<Source>>) -> bool {
+    let mut stream = stream.borrow_mut().clone();
+    // let x = stream.volume.iter_mut().map(|_| value as u32);
+    stream.volume = vec![value as u32; stream.channels as usize];
+    dbg!(stream.volume.clone());
+
+    let conn = Connection::new_session().unwrap();
+    let proxy = conn.with_proxy(
+        "org.xetibo.ReSet",
+        "/org/xetibo/ReSet",
+        Duration::from_millis(100),
+    );
+    let res: Result<(bool,), Error> =
+        proxy.method_call("org.xetibo.ReSet", "SetSourceVolume", (stream,));
+    if res.is_err() {
+        return false;
+    }
+    res.unwrap().0
+}
diff --git a/src/components/input/sourceEntryImpl.rs b/src/components/input/sourceEntryImpl.rs
new file mode 100644
index 0000000..23c3b49
--- /dev/null
+++ b/src/components/input/sourceEntryImpl.rs
@@ -0,0 +1,48 @@
+use std::cell::RefCell;
+use std::sync::Arc;
+
+use gtk::subclass::prelude::*;
+use gtk::{glib, Button, CompositeTemplate, DropDown, Label, ProgressBar, Scale, CheckButton};
+use ReSet_Lib::audio::audio::Source;
+
+use super::sourceEntry;
+
+#[allow(non_snake_case)]
+#[derive(Default, CompositeTemplate)]
+#[template(resource = "/org/Xetibo/ReSet/resetSourceEntry.ui")]
+pub struct SourceEntry {
+    #[template_child]
+    pub resetSourceName: TemplateChild<Label>,
+    #[template_child]
+    pub resetSelectedSource: TemplateChild<CheckButton>,
+    #[template_child]
+    pub resetSourceMute: TemplateChild<Button>,
+    #[template_child]
+    pub resetVolumeSlider: TemplateChild<Scale>,
+    #[template_child]
+    pub resetVolumePercentage: TemplateChild<Label>,
+    #[template_child]
+    pub resetVolumeMeter: TemplateChild<ProgressBar>,
+    pub stream: Arc<RefCell<Source>>,
+}
+
+#[glib::object_subclass]
+impl ObjectSubclass for SourceEntry {
+    const NAME: &'static str = "resetSourceEntry";
+    type Type = sourceEntry::SourceEntry;
+    type ParentType = gtk::Box;
+
+    fn class_init(klass: &mut Self::Class) {
+        klass.bind_template();
+    }
+
+    fn instance_init(obj: &glib::subclass::InitializingObject<Self>) {
+        obj.init_template();
+    }
+}
+
+impl BoxImpl for SourceEntry {}
+
+impl ObjectImpl for SourceEntry {}
+
+impl WidgetImpl for SourceEntry {}
diff --git a/src/components/output/audioBox.rs b/src/components/output/audioBox.rs
index 75d7e72..cf938d6 100644
--- a/src/components/output/audioBox.rs
+++ b/src/components/output/audioBox.rs
@@ -15,7 +15,8 @@ use gtk::gio;
 use gtk::prelude::ActionableExt;
 use ReSet_Lib::audio::audio::{InputStream, Sink};
 
-use super::audioSource::{self, AudioSourceEntry};
+use super::inputStreamEntry::InputStreamEntry;
+use super::sinkEntry::SinkEntry;
 
 glib::wrapper! {
     pub struct AudioBox(ObjectSubclass<audioBoxImpl::AudioBox>)
@@ -41,7 +42,7 @@ impl AudioBox {
             .set_action_target_value(Some(&Variant::from("outputDevices")));
 
         selfImp
-            .resetOutputStreamButton
+            .resetInputStreamButton
             .set_action_name(Some("navigation.pop"));
     }
 }
@@ -55,16 +56,12 @@ pub fn populate_sinks(output_box: Arc<AudioBox>) {
         glib::spawn_future(async move {
             glib::idle_add_once(move || {
                 let output_box_imp = output_box_ref.imp();
-                // TODO handle default mapping 
+                // TODO handle default mapping
                 // output_box_imp.resetVolumePercentage.set_text();
                 // output_box_imp.resetVolumeSlider.let
                 for stream in sinks {
-                    let entry = ListEntry::new(&AudioSourceEntry::new(
-                        stream.name,
-                        stream.volume,
-                        stream.muted,
-                        stream.index,
-                    ));
+                    // TODO create sink handler -> currently only allows input streams
+                    let entry = ListEntry::new(&SinkEntry::new(stream));
                     entry.set_activatable(false);
                     output_box_imp.resetSinks.append(&entry);
                 }
@@ -87,14 +84,9 @@ pub fn populate_streams(listeners: Arc<Listeners>, output_box: Arc<AudioBox>) {
             glib::idle_add_once(move || {
                 let output_box_imp = output_box_ref.imp();
                 for stream in streams {
-                    let entry = ListEntry::new(&AudioSourceEntry::new(
-                        stream.name,
-                        stream.volume,
-                        stream.muted,
-                        stream.index,
-                    ));
+                    let entry = ListEntry::new(&InputStreamEntry::new(stream));
                     entry.set_activatable(false);
-                    output_box_imp.resetOutputStreams.append(&entry);
+                    output_box_imp.resetInputStreams.append(&entry);
                 }
             });
         });
diff --git a/src/components/output/audioBoxImpl.rs b/src/components/output/audioBoxImpl.rs
index 79185ae..fdf9480 100644
--- a/src/components/output/audioBoxImpl.rs
+++ b/src/components/output/audioBoxImpl.rs
@@ -3,20 +3,22 @@ use std::sync::{Arc, Mutex};
 
 use crate::components::base::listEntry::ListEntry;
 use crate::components::output::audioBox;
-use crate::components::output::audioSource::AudioSourceEntry;
+use crate::components::output::inputStreamEntry::InputStreamEntry;
 use gtk::subclass::prelude::*;
 use gtk::{glib, Box, Button, CompositeTemplate, DropDown, Label, TemplateChild};
 use gtk::{prelude::*, ProgressBar, Scale};
 use ReSet_Lib::audio::audio::{InputStream, Sink};
 
+use super::sinkEntry::SinkEntry;
+
 #[allow(non_snake_case)]
 #[derive(Default, CompositeTemplate)]
-#[template(resource = "/org/Xetibo/ReSet/resetAudio.ui")]
+#[template(resource = "/org/Xetibo/ReSet/resetAudioOutput.ui")]
 pub struct AudioBox {
     #[template_child]
     pub resetSinksRow: TemplateChild<ListEntry>,
     #[template_child]
-    pub resetOutputDevice: TemplateChild<DropDown>,
+    pub resetInputDevice: TemplateChild<DropDown>,
     #[template_child]
     pub resetSinkMute: TemplateChild<Button>,
     #[template_child]
@@ -28,9 +30,9 @@ pub struct AudioBox {
     #[template_child]
     pub resetSinks: TemplateChild<Box>,
     #[template_child]
-    pub resetOutputStreamButton: TemplateChild<ListEntry>,
+    pub resetInputStreamButton: TemplateChild<ListEntry>,
     #[template_child]
-    pub resetOutputStreams: TemplateChild<Box>,
+    pub resetInputStreams: TemplateChild<Box>,
     pub resetDefaultSink: RefCell<Option<Sink>>,
     pub resetSinkList: Arc<Mutex<Vec<Sink>>>,
     pub resetInputStreamList: Arc<Mutex<Vec<InputStream>>>,
@@ -38,12 +40,13 @@ pub struct AudioBox {
 
 #[glib::object_subclass]
 impl ObjectSubclass for AudioBox {
-    const NAME: &'static str = "resetAudio";
+    const NAME: &'static str = "resetAudioOutput";
     type Type = audioBox::AudioBox;
     type ParentType = gtk::Box;
 
     fn class_init(klass: &mut Self::Class) {
-        AudioSourceEntry::ensure_type();
+        InputStreamEntry::ensure_type();
+        SinkEntry::ensure_type();
         ListEntry::ensure_type();
         klass.bind_template();
     }
diff --git a/src/components/output/audioSource.rs b/src/components/output/audioSource.rs
deleted file mode 100644
index 0b953a0..0000000
--- a/src/components/output/audioSource.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-use crate::components::output::audioSourceImpl;
-use adw::glib;
-use adw::glib::Object;
-use glib::subclass::types::ObjectSubclassIsExt;
-
-glib::wrapper! {
-    pub struct AudioSourceEntry(ObjectSubclass<audioSourceImpl::AudioSourceEntry>)
-    @extends gtk::Box, gtk::Widget,
-    @implements gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget, gtk::Orientable;
-}
-
-impl AudioSourceEntry {
-    pub fn new(name: String, volume: Vec<u32>, muted: bool, index: u32) -> Self {
-        let obj: Self = Object::builder().build();
-        // TODO use event callback for progress bar -> this is the "im speaking" indicator 
-        // TODO map the slider to volume
-        // TODO properly use volume fraction
-        // TODO map mute to callback
-        // TODO map dropdown
-        {
-            let imp = obj.imp();
-            imp.associatedIndex.set(index);
-            imp.isMuted.set(muted);
-            let mut volume_borrow = imp.volume.borrow_mut();
-            *volume_borrow = volume;
-            imp.resetSourceName.set_text(name.as_str());
-            let fraction = (volume_borrow.first().unwrap_or_else(|| &(0 as u32)) / 100) as f64;
-            imp.resetVolumeMeter.set_fraction(fraction);
-            let percentage = (fraction * 100 as f64).to_string();
-            imp.resetVolumePercentage.set_text(&percentage);
-        }
-        obj
-    }
-}
diff --git a/src/components/output/inputStreamEntry.rs b/src/components/output/inputStreamEntry.rs
new file mode 100644
index 0000000..69d1d0d
--- /dev/null
+++ b/src/components/output/inputStreamEntry.rs
@@ -0,0 +1,72 @@
+use std::cell::RefCell;
+use std::sync::Arc;
+use std::time::Duration;
+
+use adw::glib;
+use adw::glib::Object;
+use adw::prelude::RangeExt;
+use dbus::blocking::Connection;
+use dbus::Error;
+use glib::subclass::types::ObjectSubclassIsExt;
+use glib::{clone, Propagation};
+use ReSet_Lib::audio::audio::InputStream;
+
+use super::inputStreamEntryImpl;
+
+glib::wrapper! {
+    pub struct InputStreamEntry(ObjectSubclass<inputStreamEntryImpl::InputStreamEntry>)
+    @extends gtk::Box, gtk::Widget,
+    @implements gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget, gtk::Orientable;
+}
+
+impl InputStreamEntry {
+    pub fn new(stream: InputStream) -> Self {
+        let obj: Self = Object::builder().build();
+        // TODO use event callback for progress bar -> this is the "im speaking" indicator
+        // TODO map the slider to volume
+        // TODO properly use volume fraction
+        // TODO map mute to callback
+        // TODO map dropdown
+        {
+            let imp = obj.imp();
+            imp.resetSinkName.set_text(stream.name.clone().as_str());
+            let volume = stream.volume.first().unwrap_or_else(|| &(0 as 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.stream.replace(stream);
+            imp.resetVolumeSlider.connect_change_value(
+                clone!(@weak imp => @default-return Propagation::Stop, move |_, _, value| {
+                    let fraction = (value / 655.36).round();
+                    println!("{fraction}");
+                    let percentage = (fraction).to_string() + "%";
+                    imp.resetVolumePercentage.set_text(&percentage);
+                    set_inputstream_volume(value, imp.stream.clone());
+                    Propagation::Proceed
+                }),
+            );
+        }
+        obj
+    }
+}
+
+fn set_inputstream_volume(value: f64, stream: Arc<RefCell<InputStream>>) -> bool {
+    let mut stream = stream.borrow_mut().clone();
+    // let x = stream.volume.iter_mut().map(|_| value as u32);
+    stream.volume = vec![value as u32; stream.channels as usize];
+    dbg!(stream.volume.clone());
+
+    let conn = Connection::new_session().unwrap();
+    let proxy = conn.with_proxy(
+        "org.xetibo.ReSet",
+        "/org/xetibo/ReSet",
+        Duration::from_millis(100),
+    );
+    let res: Result<(bool,), Error> =
+        proxy.method_call("org.xetibo.ReSet", "SetInputStreamVolume", (stream,));
+    if res.is_err() {
+        return false;
+    }
+    res.unwrap().0
+}
diff --git a/src/components/input/inputStreamEntryImpl.rs b/src/components/output/inputStreamEntryImpl.rs
similarity index 67%
rename from src/components/input/inputStreamEntryImpl.rs
rename to src/components/output/inputStreamEntryImpl.rs
index 34c377f..17c46e2 100644
--- a/src/components/input/inputStreamEntryImpl.rs
+++ b/src/components/output/inputStreamEntryImpl.rs
@@ -1,21 +1,29 @@
-use gtk::{Button, CompositeTemplate, glib, Label, ProgressBar, Scale};
+use std::cell::RefCell;
+use std::sync::Arc;
+
 use gtk::subclass::prelude::*;
-use crate::components::input::inputStreamEntry;
+use gtk::{glib, Button, CompositeTemplate, DropDown, Label, ProgressBar, Scale};
+use ReSet_Lib::audio::audio::InputStream;
+
+use super::inputStreamEntry;
 
 #[allow(non_snake_case)]
 #[derive(Default, CompositeTemplate)]
 #[template(resource = "/org/Xetibo/ReSet/resetInputStreamEntry.ui")]
 pub struct InputStreamEntry {
     #[template_child]
-    pub resetSourceName: TemplateChild<Label>,
+    pub resetSinkName: TemplateChild<Label>,
     #[template_child]
-    pub resetSourceMute: TemplateChild<Button>,
+    pub resetSelectedSink: TemplateChild<DropDown>,
+    #[template_child]
+    pub resetSinkMute: TemplateChild<Button>,
     #[template_child]
     pub resetVolumeSlider: TemplateChild<Scale>,
     #[template_child]
     pub resetVolumePercentage: TemplateChild<Label>,
     #[template_child]
     pub resetVolumeMeter: TemplateChild<ProgressBar>,
+    pub stream: Arc<RefCell<InputStream>>,
 }
 
 #[glib::object_subclass]
@@ -37,4 +45,4 @@ impl BoxImpl for InputStreamEntry {}
 
 impl ObjectImpl for InputStreamEntry {}
 
-impl WidgetImpl for InputStreamEntry {}
\ No newline at end of file
+impl WidgetImpl for InputStreamEntry {}
diff --git a/src/components/output/mod.rs b/src/components/output/mod.rs
index 43d33c7..dd12769 100644
--- a/src/components/output/mod.rs
+++ b/src/components/output/mod.rs
@@ -1,5 +1,7 @@
 #![allow(non_snake_case)]
-pub mod audioSource;
 pub mod audioBox;
 pub mod audioBoxImpl;
-pub mod audioSourceImpl;
\ No newline at end of file
+pub mod inputStreamEntry;
+pub mod inputStreamEntryImpl;
+pub mod sinkEntry;
+pub mod sinkEntryImpl;
diff --git a/src/components/output/sinkEntry.rs b/src/components/output/sinkEntry.rs
new file mode 100644
index 0000000..f46671e
--- /dev/null
+++ b/src/components/output/sinkEntry.rs
@@ -0,0 +1,72 @@
+use std::cell::RefCell;
+use std::sync::Arc;
+use std::time::Duration;
+
+use adw::glib;
+use adw::glib::Object;
+use adw::prelude::RangeExt;
+use dbus::blocking::Connection;
+use dbus::Error;
+use glib::subclass::types::ObjectSubclassIsExt;
+use glib::{clone, Propagation};
+use ReSet_Lib::audio::audio::Sink;
+
+use super::sinkEntryImpl;
+
+glib::wrapper! {
+    pub struct SinkEntry(ObjectSubclass<sinkEntryImpl::SinkEntry>)
+    @extends gtk::Box, gtk::Widget,
+    @implements gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget, gtk::Orientable;
+}
+
+impl SinkEntry {
+    pub fn new(stream: Sink) -> Self {
+        let obj: Self = Object::builder().build();
+        // TODO use event callback for progress bar -> this is the "im speaking" indicator
+        // TODO map the slider to volume
+        // TODO properly use volume fraction
+        // TODO map mute to callback
+        // TODO map dropdown
+        {
+            let imp = obj.imp();
+            imp.resetSinkName.set_text(stream.name.clone().as_str());
+            let volume = stream.volume.first().unwrap_or_else(|| &(0 as 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.stream.replace(stream);
+            imp.resetVolumeSlider.connect_change_value(
+                clone!(@weak imp => @default-return Propagation::Stop, move |_, _, value| {
+                    let fraction = (value / 655.36).round();
+                    println!("{fraction}");
+                    let percentage = (fraction).to_string() + "%";
+                    imp.resetVolumePercentage.set_text(&percentage);
+                    set_inputstream_volume(value, imp.stream.clone());
+                    Propagation::Proceed
+                }),
+            );
+        }
+        obj
+    }
+}
+
+fn set_inputstream_volume(value: f64, stream: Arc<RefCell<Sink>>) -> bool {
+    let mut stream = stream.borrow_mut().clone();
+    // let x = stream.volume.iter_mut().map(|_| value as u32);
+    stream.volume = vec![value as u32; stream.channels as usize];
+    dbg!(stream.volume.clone());
+
+    let conn = Connection::new_session().unwrap();
+    let proxy = conn.with_proxy(
+        "org.xetibo.ReSet",
+        "/org/xetibo/ReSet",
+        Duration::from_millis(100),
+    );
+    let res: Result<(bool,), Error> =
+        proxy.method_call("org.xetibo.ReSet", "SetSinkVolume", (stream,));
+    if res.is_err() {
+        return false;
+    }
+    res.unwrap().0
+}
diff --git a/src/components/output/sinkEntryImpl.rs b/src/components/output/sinkEntryImpl.rs
new file mode 100644
index 0000000..beb124a
--- /dev/null
+++ b/src/components/output/sinkEntryImpl.rs
@@ -0,0 +1,47 @@
+use std::cell::RefCell;
+use std::sync::Arc;
+
+use crate::components::output::sinkEntry;
+use gtk::subclass::prelude::*;
+use gtk::{glib, Button, CompositeTemplate, DropDown, Label, ProgressBar, Scale, CheckButton};
+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<Label>,
+    #[template_child]
+    pub resetSelectedSink: TemplateChild<CheckButton>,
+    #[template_child]
+    pub resetSinkMute: TemplateChild<Button>,
+    #[template_child]
+    pub resetVolumeSlider: TemplateChild<Scale>,
+    #[template_child]
+    pub resetVolumePercentage: TemplateChild<Label>,
+    #[template_child]
+    pub resetVolumeMeter: TemplateChild<ProgressBar>,
+    pub stream: Arc<RefCell<Sink>>,
+}
+
+#[glib::object_subclass]
+impl ObjectSubclass for SinkEntry {
+    const NAME: &'static str = "resetSinkEntry";
+    type Type = sinkEntry::SinkEntry;
+    type ParentType = gtk::Box;
+
+    fn class_init(klass: &mut Self::Class) {
+        klass.bind_template();
+    }
+
+    fn instance_init(obj: &glib::subclass::InitializingObject<Self>) {
+        obj.init_template();
+    }
+}
+
+impl BoxImpl for SinkEntry {}
+
+impl ObjectImpl for SinkEntry {}
+
+impl WidgetImpl for SinkEntry {}
diff --git a/src/resources/resetMicrophone.ui b/src/resources/resetAudioInput.ui
similarity index 91%
rename from src/resources/resetMicrophone.ui
rename to src/resources/resetAudioInput.ui
index 20886cf..4200e8d 100644
--- a/src/resources/resetMicrophone.ui
+++ b/src/resources/resetAudioInput.ui
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Cambalache 0.17.0 -->
+<!-- Created with Cambalache 0.16.0 -->
 <interface>
   <requires lib="gtk" version="4.12"/>
   <requires lib="libadwaita" version="1.4"/>
-  <template class="resetMicrophone" parent="GtkBox">
+  <template class="resetAudioInput" parent="GtkBox">
     <property name="orientation">vertical</property>
     <property name="valign">start</property>
     <child>
@@ -63,7 +63,7 @@
                   </object>
                 </child>
                 <child>
-                  <object class="GtkBox" id="resetDefaultSource">
+                  <object class="GtkBox">
                     <property name="margin-bottom">10</property>
                     <property name="margin-end">5</property>
                     <property name="margin-start">5</property>
@@ -122,12 +122,6 @@
                         <property name="label">Input Streams</property>
                       </object>
                     </child>
-                    <child>
-                      <object class="resetInputStreamEntry"/>
-                    </child>
-                    <child>
-                      <object class="resetInputStreamEntry"/>
-                    </child>
                   </object>
                 </child>
               </object>
@@ -150,7 +144,7 @@
                     <property name="show-separators">True</property>
                     <property name="valign">start</property>
                     <child>
-                      <object class="resetListBoxRow" id="resetInputStreamButton">
+                      <object class="resetListBoxRow" id="resetOutputStreamButton">
                         <child>
                           <object class="GtkBox">
                             <property name="height-request">40</property>
@@ -175,7 +169,7 @@
                   </object>
                 </child>
                 <child>
-                  <object class="GtkBox" id="resetSinks">
+                  <object class="GtkBox" id="resetSources">
                     <property name="margin-end">5</property>
                     <property name="margin-start">5</property>
                     <property name="margin-top">10</property>
@@ -186,12 +180,6 @@
                         <property name="label">Input Devices</property>
                       </object>
                     </child>
-                    <child>
-                      <object class="resetInputStreamEntry"/>
-                    </child>
-                    <child>
-                      <object class="resetInputStreamEntry"/>
-                    </child>
                   </object>
                 </child>
               </object>
diff --git a/src/resources/resetAudio.ui b/src/resources/resetAudioOutput.ui
similarity index 97%
rename from src/resources/resetAudio.ui
rename to src/resources/resetAudioOutput.ui
index e7c864e..74740c6 100644
--- a/src/resources/resetAudio.ui
+++ b/src/resources/resetAudioOutput.ui
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Cambalache 0.17.0 -->
+<!-- Created with Cambalache 0.16.0 -->
 <interface>
   <requires lib="gtk" version="4.12"/>
   <requires lib="libadwaita" version="1.4"/>
-  <template class="resetAudio" parent="GtkBox">
+  <template class="resetAudioOutput" parent="GtkBox">
     <property name="orientation">vertical</property>
     <property name="valign">start</property>
     <child>
@@ -43,7 +43,7 @@
                               </object>
                             </child>
                             <child>
-                              <object class="GtkDropDown" id="resetOutputDevice">
+                              <object class="GtkDropDown" id="resetInputDevice">
                                 <property name="halign">end</property>
                                 <property name="hexpand">True</property>
                                 <property name="valign">center</property>
@@ -113,7 +113,7 @@
                   <object class="GtkSeparator"/>
                 </child>
                 <child>
-                  <object class="GtkBox" id="resetOutputStreams">
+                  <object class="GtkBox" id="resetInputStreams">
                     <property name="margin-top">10</property>
                     <property name="orientation">vertical</property>
                     <child>
@@ -144,7 +144,7 @@
                     <property name="show-separators">True</property>
                     <property name="valign">start</property>
                     <child>
-                      <object class="resetListBoxRow" id="resetOutputStreamButton">
+                      <object class="resetListBoxRow" id="resetInputStreamButton">
                         <child>
                           <object class="GtkBox">
                             <property name="height-request">40</property>
diff --git a/src/resources/resetBluetooth.ui b/src/resources/resetBluetooth.ui
index 315ebdd..43d1afb 100644
--- a/src/resources/resetBluetooth.ui
+++ b/src/resources/resetBluetooth.ui
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Cambalache 0.17.0 -->
+<!-- Created with Cambalache 0.16.0 -->
 <interface>
   <requires lib="gtk" version="4.6"/>
   <requires lib="libadwaita" version="1.4"/>
diff --git a/src/resources/resetBluetoothEntry.ui b/src/resources/resetBluetoothEntry.ui
index 08232d5..92d1cb0 100644
--- a/src/resources/resetBluetoothEntry.ui
+++ b/src/resources/resetBluetoothEntry.ui
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Cambalache 0.17.0 -->
+<!-- Created with Cambalache 0.16.0 -->
 <interface>
   <requires lib="gtk" version="4.12"/>
   <template class="resetBluetoothEntry" parent="GtkBox">
diff --git a/src/resources/resetInputStreamEntry.ui b/src/resources/resetInputStreamEntry.ui
index a772a3f..1f27b67 100644
--- a/src/resources/resetInputStreamEntry.ui
+++ b/src/resources/resetInputStreamEntry.ui
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Cambalache 0.17.0 -->
+<!-- Created with Cambalache 0.16.0 -->
 <interface>
   <requires lib="gtk" version="4.12"/>
   <template class="resetInputStreamEntry" parent="GtkBox">
@@ -12,13 +12,13 @@
       <object class="GtkBox">
         <property name="margin-bottom">5</property>
         <child>
-          <object class="GtkLabel" id="resetSourceName">
+          <object class="GtkLabel" id="resetSinkName">
             <property name="label">text</property>
             <property name="margin-start">5</property>
           </object>
         </child>
         <child>
-          <object class="GtkDropDown" id="resetSelectedSource">
+          <object class="GtkDropDown" id="resetSelectedSink">
             <property name="halign">end</property>
             <property name="hexpand">True</property>
             <property name="margin-end">5</property>
@@ -31,8 +31,8 @@
         <property name="margin-bottom">5</property>
         <property name="margin-top">5</property>
         <child>
-          <object class="GtkButton" id="resetSourceMute">
-            <property name="icon-name">audio-input-microphone-symbolic</property>
+          <object class="GtkButton" id="resetSinkMute">
+            <property name="icon-name">audio-volume-high-symbolic</property>
             <property name="margin-end">5</property>
             <property name="valign">center</property>
           </object>
@@ -41,8 +41,9 @@
           <object class="GtkScale" id="resetVolumeSlider">
             <property name="adjustment">
               <object class="GtkAdjustment">
-                <property name="page-increment">5.0</property>
-                <property name="upper">100.0</property>
+                <property name="page-increment">655.36</property>
+                <property name="step-increment">65536.0</property>
+                <property name="upper">65536.0</property>
               </object>
             </property>
             <property name="hexpand">True</property>
diff --git a/src/resources/resetListBoxRow.ui b/src/resources/resetListBoxRow.ui
index 4edeb36..9a40cc7 100644
--- a/src/resources/resetListBoxRow.ui
+++ b/src/resources/resetListBoxRow.ui
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Cambalache 0.17.0 -->
+<!-- Created with Cambalache 0.16.0 -->
 <interface>
   <requires lib="gtk" version="4.0"/>
   <template class="resetListBoxRow" parent="GtkListBoxRow">
diff --git a/src/resources/resetMainWindow.ui b/src/resources/resetMainWindow.ui
index 779ed80..f358551 100644
--- a/src/resources/resetMainWindow.ui
+++ b/src/resources/resetMainWindow.ui
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Cambalache 0.17.0 -->
+<!-- Created with Cambalache 0.16.0 -->
 <interface>
   <requires lib="gtk" version="4.12"/>
   <requires lib="libadwaita" version="1.4"/>
diff --git a/src/resources/resetMicSourceEntry.ui b/src/resources/resetOutpuStreamEntry.ui
similarity index 66%
rename from src/resources/resetMicSourceEntry.ui
rename to src/resources/resetOutpuStreamEntry.ui
index 88bf752..2a506b9 100644
--- a/src/resources/resetMicSourceEntry.ui
+++ b/src/resources/resetOutpuStreamEntry.ui
@@ -1,23 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Cambalache 0.17.0 -->
+<!-- Created with Cambalache 0.16.0 -->
 <interface>
   <requires lib="gtk" version="4.12"/>
-  <template class="resetMicEntry" parent="GtkBox">
+  <template class="resetOutpuStreamEntry" parent="GtkBox">
+    <property name="margin-bottom">5</property>
     <property name="margin-end">5</property>
     <property name="margin-start">5</property>
+    <property name="margin-top">5</property>
     <property name="orientation">vertical</property>
     <child>
       <object class="GtkBox">
         <property name="margin-bottom">5</property>
         <child>
-          <object class="GtkImage" id="resetMicIcon">
-            <property name="icon-name">audio-input-microphone-symbolic</property>
-            <property name="margin-end">5</property>
+          <object class="GtkLabel" id="resetSourceName">
+            <property name="label">text</property>
+            <property name="margin-start">5</property>
           </object>
         </child>
         <child>
-          <object class="GtkLabel" id="resetMicName">
-            <property name="label">Input Volume</property>
+          <object class="GtkDropDown" id="resetSelectedSource">
+            <property name="halign">end</property>
+            <property name="hexpand">True</property>
+            <property name="margin-end">5</property>
           </object>
         </child>
       </object>
@@ -27,14 +31,14 @@
         <property name="margin-bottom">5</property>
         <property name="margin-top">5</property>
         <child>
-          <object class="GtkButton" id="resetMicMute">
+          <object class="GtkButton" id="resetSourceMute">
             <property name="icon-name">audio-input-microphone-symbolic</property>
             <property name="margin-end">5</property>
             <property name="valign">center</property>
           </object>
         </child>
         <child>
-          <object class="GtkScale" id="resetMicSlider">
+          <object class="GtkScale" id="resetVolumeSlider">
             <property name="adjustment">
               <object class="GtkAdjustment">
                 <property name="page-increment">5.0</property>
@@ -47,7 +51,7 @@
           </object>
         </child>
         <child>
-          <object class="GtkLabel" id="resetMicPercentage">
+          <object class="GtkLabel" id="resetVolumePercentage">
             <property name="label">100%</property>
             <property name="lines">1</property>
             <property name="width-request">40</property>
@@ -56,7 +60,9 @@
       </object>
     </child>
     <child>
-      <object class="GtkProgressBar" id="resetMicMeter"/>
+      <object class="GtkProgressBar" id="resetVolumeMeter">
+        <property name="margin-top">5</property>
+      </object>
     </child>
   </template>
 </interface>
diff --git a/src/resources/resetOutputStreamEntry.ui b/src/resources/resetOutputStreamEntry.ui
index 80a9b58..5eaba9f 100644
--- a/src/resources/resetOutputStreamEntry.ui
+++ b/src/resources/resetOutputStreamEntry.ui
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Cambalache 0.17.0 -->
+<!-- Created with Cambalache 0.16.0 -->
 <interface>
   <requires lib="gtk" version="4.12"/>
   <template class="resetOutputStreamEntry" parent="GtkBox">
@@ -41,8 +41,9 @@
           <object class="GtkScale" id="resetVolumeSlider">
             <property name="adjustment">
               <object class="GtkAdjustment">
-                <property name="page-increment">5.0</property>
-                <property name="upper">100.0</property>
+                <property name="page-increment">655.36</property>
+                <property name="step-increment">2.0</property>
+                <property name="upper">65536.0</property>
               </object>
             </property>
             <property name="hexpand">True</property>
diff --git a/src/resources/resetPopup.ui b/src/resources/resetPopup.ui
index ea2b49c..d8dfb97 100644
--- a/src/resources/resetPopup.ui
+++ b/src/resources/resetPopup.ui
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Cambalache 0.17.0 -->
+<!-- Created with Cambalache 0.16.0 -->
 <interface>
   <requires lib="gtk" version="4.12"/>
   <template class="resetPopup" parent="GtkPopover">
diff --git a/src/resources/resetSavedWifiEntry.ui b/src/resources/resetSavedWifiEntry.ui
index 6fbdf98..20e4503 100644
--- a/src/resources/resetSavedWifiEntry.ui
+++ b/src/resources/resetSavedWifiEntry.ui
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Cambalache 0.17.0 -->
+<!-- Created with Cambalache 0.16.0 -->
 <interface>
   <requires lib="gtk" version="4.12"/>
   <template class="resetSavedWifiEntry" parent="GtkBox">
diff --git a/src/resources/resetSettingBox.ui b/src/resources/resetSettingBox.ui
index df8b1c9..73af7c6 100644
--- a/src/resources/resetSettingBox.ui
+++ b/src/resources/resetSettingBox.ui
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Cambalache 0.17.0 -->
+<!-- Created with Cambalache 0.16.0 -->
 <interface>
   <requires lib="gtk" version="4.0"/>
   <template class="resetSettingBox" parent="GtkBox">
diff --git a/src/resources/resetSidebarEntry.ui b/src/resources/resetSidebarEntry.ui
index 9b39fe7..8ff15fd 100644
--- a/src/resources/resetSidebarEntry.ui
+++ b/src/resources/resetSidebarEntry.ui
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Cambalache 0.17.0 -->
+<!-- Created with Cambalache 0.16.0 -->
 <interface>
   <requires lib="gtk" version="4.0"/>
   <template class="resetSidebarEntry" parent="GtkListBoxRow">
diff --git a/src/resources/resetSinkEntry.ui b/src/resources/resetSinkEntry.ui
new file mode 100644
index 0000000..342d287
--- /dev/null
+++ b/src/resources/resetSinkEntry.ui
@@ -0,0 +1,69 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Created with Cambalache 0.16.0 -->
+<interface>
+  <requires lib="gtk" version="4.12"/>
+  <object class="GtkBox" id="resetSinkEntry">
+    <property name="margin-bottom">5</property>
+    <property name="margin-end">5</property>
+    <property name="margin-start">5</property>
+    <property name="margin-top">5</property>
+    <property name="orientation">vertical</property>
+    <child>
+      <object class="GtkBox">
+        <property name="margin-bottom">5</property>
+        <child>
+          <object class="GtkLabel" id="resetSinkName">
+            <property name="label">text</property>
+            <property name="margin-start">5</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkCheckButton" id="resetSelectedSink">
+            <property name="halign">end</property>
+            <property name="hexpand">True</property>
+            <property name="hexpand-set">True</property>
+          </object>
+        </child>
+      </object>
+    </child>
+    <child>
+      <object class="GtkBox">
+        <property name="margin-bottom">5</property>
+        <property name="margin-top">5</property>
+        <child>
+          <object class="GtkButton" id="resetSinkMute">
+            <property name="icon-name">audio-volume-high-symbolic</property>
+            <property name="margin-end">5</property>
+            <property name="valign">center</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkScale" id="resetVolumeSlider">
+            <property name="adjustment">
+              <object class="GtkAdjustment">
+                <property name="page-increment">655.36</property>
+                <property name="step-increment">65536.0</property>
+                <property name="upper">65536.0</property>
+              </object>
+            </property>
+            <property name="hexpand">True</property>
+            <property name="valign">center</property>
+            <property name="value-pos">bottom</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel" id="resetVolumePercentage">
+            <property name="label">100%</property>
+            <property name="lines">1</property>
+            <property name="width-request">40</property>
+          </object>
+        </child>
+      </object>
+    </child>
+    <child>
+      <object class="GtkProgressBar" id="resetVolumeMeter">
+        <property name="margin-top">5</property>
+      </object>
+    </child>
+  </object>
+</interface>
diff --git a/src/resources/resetSourceEntry.ui b/src/resources/resetSourceEntry.ui
new file mode 100644
index 0000000..02646f9
--- /dev/null
+++ b/src/resources/resetSourceEntry.ui
@@ -0,0 +1,69 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Created with Cambalache 0.16.0 -->
+<interface>
+  <requires lib="gtk" version="4.12"/>
+  <object class="GtkBox" id="resetSourceEntry">
+    <property name="margin-bottom">5</property>
+    <property name="margin-end">5</property>
+    <property name="margin-start">5</property>
+    <property name="margin-top">5</property>
+    <property name="orientation">vertical</property>
+    <child>
+      <object class="GtkBox">
+        <property name="margin-bottom">5</property>
+        <child>
+          <object class="GtkLabel" id="resetSourceName">
+            <property name="label">text</property>
+            <property name="margin-start">5</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkCheckButton" id="resetSelectedSource">
+            <property name="halign">end</property>
+            <property name="hexpand">True</property>
+            <property name="hexpand-set">True</property>
+          </object>
+        </child>
+      </object>
+    </child>
+    <child>
+      <object class="GtkBox">
+        <property name="margin-bottom">5</property>
+        <property name="margin-top">5</property>
+        <child>
+          <object class="GtkButton" id="resetSourceMute">
+            <property name="icon-name">microphone-sensitivity-high-symbolic</property>
+            <property name="margin-end">5</property>
+            <property name="valign">center</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkScale" id="resetVolumeSlider">
+            <property name="adjustment">
+              <object class="GtkAdjustment">
+                <property name="page-increment">655.36</property>
+                <property name="step-increment">65536.0</property>
+                <property name="upper">65536.0</property>
+              </object>
+            </property>
+            <property name="hexpand">True</property>
+            <property name="valign">center</property>
+            <property name="value-pos">bottom</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel" id="resetVolumePercentage">
+            <property name="label">100%</property>
+            <property name="lines">1</property>
+            <property name="width-request">40</property>
+          </object>
+        </child>
+      </object>
+    </child>
+    <child>
+      <object class="GtkProgressBar" id="resetVolumeMeter">
+        <property name="margin-top">5</property>
+      </object>
+    </child>
+  </object>
+</interface>
diff --git a/src/resources/resetUI.cmb b/src/resources/resetUI.cmb
index ce4ef36..ca48790 100644
--- a/src/resources/resetUI.cmb
+++ b/src/resources/resetUI.cmb
@@ -6,16 +6,18 @@
 	(4,7,None,"resetWiFi.ui",None,None,None,None,None,None,None),
 	(5,2,None,"resetWifiEntry.ui",None,None,None,None,None,None,None),
 	(6,1,None,"resetSidebarEntry.ui",None,None,None,None,None,None,None),
-	(7,1,None,"resetOutputStreamEntry.ui",None,None,None,None,None,None,None),
-	(8,1,None,"resetAudio.ui",None,None,None,None,None,None,None),
+	(7,1,None,"resetInputStreamEntry.ui",None,None,None,None,None,None,None),
+	(8,1,None,"resetAudioOutput.ui",None,None,None,None,None,None,None),
 	(10,1,None,"resetBluetooth.ui",None,None,None,None,None,None,None),
 	(11,2,None,"resetBluetoothEntry.ui",None,None,None,None,None,None,None),
-	(12,11,None,"resetMicrophone.ui",None,None,None,None,None,None,None),
-	(13,11,None,"resetInputStreamEntry.ui",None,None,None,None,None,None,None),
+	(12,11,None,"resetAudioInput.ui",None,None,None,None,None,None,None),
+	(13,11,None,"resetOutpuStreamEntry.ui",None,None,None,None,None,None,None),
 	(14,3,None,"resetSettingBox.ui",None,None,None,None,None,None,None),
 	(15,1,None,"resetListBoxRow.ui",None,None,None,None,None,None,None),
 	(16,6,None,"resetPopup.ui",None,None,None,None,None,None,None),
-	(17,1,None,"resetSavedWifiEntry.ui",None,None,None,None,None,None,None)
+	(17,1,None,"resetSavedWifiEntry.ui",None,None,None,None,None,None,None),
+	(18,None,None,"resetSinkEntry.ui",None,None,None,None,None,None,None),
+	(19,None,None,"resetSourceEntry.ui",None,None,None,None,None,None,None)
   </ui>
   <object>
 	(3,1,"AdwApplicationWindow","resetUI",None,None,None,None,-1,"  &lt;child&gt;\n    &lt;object id=\"resetSidebarBreakpoint\" class=\"AdwBreakpoint\"&gt;\n    &lt;/object&gt;\n  &lt;/child&gt;"),
@@ -91,17 +93,17 @@
 	(6,2,"GtkBox",None,1,None,None,None,-1,None),
 	(6,6,"GtkImage","resetSidebarImage",2,None,None,None,None,None),
 	(6,7,"GtkLabel","resetSidebarLabel",2,None,None,None,1,None),
-	(7,1,"GtkBox","resetOutputStreamEntry",None,None,None,None,-1,None),
+	(7,1,"GtkBox","resetInputStreamEntry",None,None,None,None,-1,None),
 	(7,4,"GtkProgressBar","resetVolumeMeter",1,None,None,None,2,None),
 	(7,5,"GtkBox",None,1,None,None,None,None,None),
-	(7,6,"GtkLabel","resetSourceName",5,None,None,None,None,None),
+	(7,6,"GtkLabel","resetSinkName",5,None,None,None,None,None),
 	(7,8,"GtkBox",None,1,None,None,None,1,None),
 	(7,9,"GtkScale","resetVolumeSlider",8,None,None,None,1,None),
 	(7,10,"GtkAdjustment",None,9,None,None,None,None,None),
-	(7,11,"GtkButton","resetSourceMute",8,None,None,None,None,None),
+	(7,11,"GtkButton","resetSinkMute",8,None,None,None,None,None),
 	(7,12,"GtkLabel","resetVolumePercentage",8,None,None,None,2,None),
 	(7,13,"GtkDropDown","resetSelectedSink",5,None,None,None,1,None),
-	(8,1,"GtkBox","resetAudio",None,None,None,None,None,None),
+	(8,1,"GtkBox","resetAudioOutput",None,None,None,None,None,None),
 	(8,53,"GtkLabel",None,1,None,None,None,None,None),
 	(8,54,"AdwNavigationView",None,1,None,None,None,1,None),
 	(8,55,"AdwNavigationPage",None,54,None,None,None,None,None),
@@ -112,10 +114,10 @@
 	(8,74,"resetListBoxRow","resetSinksRow",73,None,None,None,None,None),
 	(8,75,"GtkBox",None,74,None,None,None,None,None),
 	(8,76,"GtkLabel",None,75,None,None,None,None,None),
-	(8,77,"GtkDropDown","resetOutputDevice",75,None,None,None,1,None),
+	(8,77,"GtkDropDown","resetInputDevice",75,None,None,None,1,None),
 	(8,78,"GtkImage",None,75,None,None,None,2,None),
 	(8,81,"GtkLabel",None,72,None,None,None,1,None),
-	(8,85,"GtkBox","resetOutputStreams",56,None,None,None,4,None),
+	(8,85,"GtkBox","resetInputStreams",56,None,None,None,4,None),
 	(8,86,"GtkLabel",None,85,None,None,None,None,None),
 	(8,89,"GtkBox","resetSinks",72,None,None,None,3,None),
 	(8,90,"GtkLabel",None,89,None,None,None,None,None),
@@ -128,7 +130,7 @@
 	(8,102,"GtkProgressBar","resetVolumeMeter",93,None,None,None,1,None),
 	(8,103,"GtkSeparator",None,56,None,None,None,3,None),
 	(8,109,"GtkListBox",None,72,None,None,None,None,None),
-	(8,110,"resetListBoxRow","resetOutputStreamButton",109,None,None,None,None,None),
+	(8,110,"resetListBoxRow","resetInputStreamButton",109,None,None,None,None,None),
 	(8,111,"GtkBox",None,110,None,None,None,None,None),
 	(8,112,"GtkLabel",None,111,None,None,None,None,None),
 	(8,113,"GtkImage",None,111,None,None,None,1,None),
@@ -170,7 +172,7 @@
 	(11,3,"GtkImage","resetBluetoothDeviceType",2,None,None,None,None,None),
 	(11,4,"GtkLabel","resetBluetoothLabel",2,None,None,None,1,None),
 	(11,5,"GtkButton","resetBluetoothButton",2,None,None,None,2,None),
-	(12,11,"GtkBox","resetMicrophone",None,None,None,None,None,None),
+	(12,11,"GtkBox","resetAudioInput",None,None,None,None,None,None),
 	(12,12,"GtkLabel",None,11,None,None,None,None,None),
 	(12,13,"AdwNavigationView",None,11,None,None,None,1,None),
 	(12,14,"AdwNavigationPage",None,13,None,None,None,None,None),
@@ -181,7 +183,7 @@
 	(12,19,"GtkLabel",None,18,None,None,None,None,None),
 	(12,20,"GtkDropDown","resetSourceDropdown",18,None,None,None,1,None),
 	(12,21,"GtkImage",None,18,None,None,None,2,None),
-	(12,22,"GtkBox","resetDefaultSource",15,None,None,None,1,None),
+	(12,22,"GtkBox",None,15,None,None,None,1,None),
 	(12,23,"GtkBox",None,22,None,None,None,None,None),
 	(12,24,"GtkButton","resetSourceMute",23,None,None,None,None,None),
 	(12,25,"GtkScale","resetVolumeSlider",23,None,None,None,1,None),
@@ -192,19 +194,15 @@
 	(12,30,"GtkBox","resetOutputStreams",15,None,None,None,3,None),
 	(12,31,"GtkLabel",None,30,None,None,None,None,None),
 	(12,34,"AdwNavigationPage",None,13,None,None,None,1,None),
-	(12,40,"resetInputStreamEntry",None,30,None,None,None,1,None),
-	(12,41,"resetInputStreamEntry",None,30,None,None,None,2,None),
 	(12,42,"GtkBox",None,34,None,None,None,None,None),
 	(12,43,"GtkListBox",None,42,None,None,None,1,None),
-	(12,44,"resetListBoxRow","resetInputStreamButton",43,None,None,None,None,None),
+	(12,44,"resetListBoxRow","resetOutputStreamButton",43,None,None,None,None,None),
 	(12,45,"GtkBox",None,44,None,None,None,None,None),
 	(12,46,"GtkLabel",None,45,None,None,None,None,None),
 	(12,47,"GtkImage",None,45,None,None,None,1,None),
-	(12,49,"GtkBox","resetSinks",42,None,None,None,2,None),
+	(12,49,"GtkBox","resetSources",42,None,None,None,2,None),
 	(12,50,"GtkLabel",None,49,None,None,None,None,None),
-	(12,51,"resetInputStreamEntry",None,49,None,None,None,1,None),
-	(12,52,"resetInputStreamEntry",None,49,None,None,None,2,None),
-	(13,11,"GtkBox","resetInputStreamEntry",None,None,None,None,None,None),
+	(13,11,"GtkBox","resetOutpuStreamEntry",None,None,None,None,None,None),
 	(13,12,"GtkBox",None,11,None,None,None,None,None),
 	(13,13,"GtkLabel","resetSourceName",12,None,None,None,None,None),
 	(13,14,"GtkDropDown","resetSelectedSource",12,None,None,None,1,None),
@@ -225,7 +223,27 @@
 	(17,1,"GtkBox","resetSavedWifiEntry",None,None,None,None,-1,None),
 	(17,2,"GtkLabel","resetSavedWifiLabel",1,None,None,None,None,None),
 	(17,3,"GtkButton","resetEditSavedWifiButton",1,None,None,None,1,None),
-	(17,4,"GtkButton","resetDeleteSavedWifiButton",1,None,None,None,2,None)
+	(17,4,"GtkButton","resetDeleteSavedWifiButton",1,None,None,None,2,None),
+	(18,1,"GtkBox","resetSinkEntry",None,None,None,None,None,None),
+	(18,2,"GtkBox",None,1,None,None,None,None,None),
+	(18,3,"GtkLabel","resetSinkName",2,None,None,None,None,None),
+	(18,5,"GtkBox",None,1,None,None,None,1,None),
+	(18,6,"GtkButton","resetSinkMute",5,None,None,None,None,None),
+	(18,7,"GtkScale","resetVolumeSlider",5,None,None,None,1,None),
+	(18,8,"GtkAdjustment",None,7,None,None,None,None,None),
+	(18,9,"GtkLabel","resetVolumePercentage",5,None,None,None,2,None),
+	(18,10,"GtkProgressBar","resetVolumeMeter",1,None,None,None,2,None),
+	(18,11,"GtkCheckButton","resetSelectedSink",2,None,None,None,1,None),
+	(19,1,"GtkBox","resetSourceEntry",None,None,None,None,None,None),
+	(19,2,"GtkBox",None,1,None,None,None,None,None),
+	(19,3,"GtkLabel","resetSourceName",2,None,None,None,None,None),
+	(19,4,"GtkCheckButton","resetSelectedSource",2,None,None,None,1,None),
+	(19,5,"GtkBox",None,1,None,None,None,1,None),
+	(19,6,"GtkButton","resetSourceMute",5,None,None,None,None,None),
+	(19,7,"GtkScale","resetVolumeSlider",5,None,None,None,1,None),
+	(19,8,"GtkAdjustment",None,7,None,None,None,None,None),
+	(19,9,"GtkLabel","resetVolumePercentage",5,None,None,None,2,None),
+	(19,10,"GtkProgressBar","resetVolumeMeter",1,None,None,None,2,None)
   </object>
   <object_property>
 	(3,1,"GtkWidget","height-request","200",None,None,None,None,None,None,None,None,None),
@@ -419,8 +437,9 @@
 	(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","5.0",None,None,None,None,None,None,None,None,None),
-	(7,10,"GtkAdjustment","upper","100.0",None,None,None,None,None,None,None,None,None),
+	(7,10,"GtkAdjustment","page-increment","655.36",None,None,None,None,None,None,None,None,None),
+	(7,10,"GtkAdjustment","step-increment","65536.0",None,None,None,None,None,None,None,None,None),
+	(7,10,"GtkAdjustment","upper","65536.0",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),
 	(7,11,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
 	(7,11,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
@@ -714,7 +733,61 @@
 	(17,3,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
 	(17,3,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
 	(17,4,"GtkButton","has-frame","False",None,None,None,None,None,None,None,None,None),
-	(17,4,"GtkButton","icon-name","user-trash-symbolic",None,None,None,None,None,None,None,None,None)
+	(17,4,"GtkButton","icon-name","user-trash-symbolic",None,None,None,None,None,None,None,None,None),
+	(18,1,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
+	(18,1,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
+	(18,1,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(18,1,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(18,1,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
+	(18,2,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
+	(18,3,"GtkLabel","label","text",None,None,None,None,None,None,None,None,None),
+	(18,3,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(18,5,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
+	(18,5,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
+	(18,6,"GtkButton","icon-name","audio-volume-high-symbolic",None,None,None,None,None,None,None,None,None),
+	(18,6,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(18,6,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
+	(18,7,"GtkRange","adjustment",None,None,None,None,None,8,None,None,None,None),
+	(18,7,"GtkScale","value-pos","bottom",None,None,None,None,None,None,None,None,None),
+	(18,7,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
+	(18,7,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
+	(18,8,"GtkAdjustment","page-increment","655.36",None,None,None,None,None,None,None,None,None),
+	(18,8,"GtkAdjustment","step-increment","65536.0",None,None,None,None,None,None,None,None,None),
+	(18,8,"GtkAdjustment","upper","65536.0",None,None,None,None,None,None,None,None,None),
+	(18,9,"GtkLabel","label","100%",None,None,None,None,None,None,None,None,None),
+	(18,9,"GtkLabel","lines","1",None,None,None,None,None,None,None,None,None),
+	(18,9,"GtkWidget","width-request","40",None,None,None,None,None,None,None,None,None),
+	(18,10,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
+	(18,11,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
+	(18,11,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
+	(18,11,"GtkWidget","hexpand-set","True",None,None,None,None,None,None,None,None,None),
+	(19,1,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
+	(19,1,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
+	(19,1,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(19,1,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(19,1,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
+	(19,2,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
+	(19,3,"GtkLabel","label","text",None,None,None,None,None,None,None,None,None),
+	(19,3,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(19,4,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
+	(19,4,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
+	(19,4,"GtkWidget","hexpand-set","True",None,None,None,None,None,None,None,None,None),
+	(19,5,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
+	(19,5,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
+	(19,6,"GtkButton","icon-name","microphone-sensitivity-high-symbolic",None,None,None,None,None,None,None,None,None),
+	(19,6,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(19,6,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
+	(19,7,"GtkRange","adjustment",None,None,None,None,None,8,None,None,None,None),
+	(19,7,"GtkScale","value-pos","bottom",None,None,None,None,None,None,None,None,None),
+	(19,7,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
+	(19,7,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
+	(19,8,"GtkAdjustment","page-increment","655.36",None,None,None,None,None,None,None,None,None),
+	(19,8,"GtkAdjustment","step-increment","65536.0",None,None,None,None,None,None,None,None,None),
+	(19,8,"GtkAdjustment","upper","65536.0",None,None,None,None,None,None,None,None,None),
+	(19,9,"GtkLabel","label","100%",None,None,None,None,None,None,None,None,None),
+	(19,9,"GtkLabel","lines","1",None,None,None,None,None,None,None,None,None),
+	(19,9,"GtkWidget","width-request","40",None,None,None,None,None,None,None,None,None),
+	(19,10,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None)
   </object_property>
   <object_data>
 	(3,42,"GtkWidget",1,1,None,None,None,None,None,None),
diff --git a/src/resources/resetWiFi.ui b/src/resources/resetWiFi.ui
index 227b0ae..78c4655 100644
--- a/src/resources/resetWiFi.ui
+++ b/src/resources/resetWiFi.ui
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Cambalache 0.17.0 -->
+<!-- Created with Cambalache 0.16.0 -->
 <interface>
   <requires lib="gtk" version="4.6"/>
   <requires lib="libadwaita" version="1.4"/>
diff --git a/src/resources/resetWifiEntry.ui b/src/resources/resetWifiEntry.ui
index 6f9880c..c76bad2 100644
--- a/src/resources/resetWifiEntry.ui
+++ b/src/resources/resetWifiEntry.ui
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Cambalache 0.17.0 -->
+<!-- Created with Cambalache 0.16.0 -->
 <interface>
   <requires lib="gtk" version="4.12"/>
   <template class="resetWifiEntry" parent="GtkBox">
diff --git a/src/resources/resources.gresource.xml b/src/resources/resources.gresource.xml
index f92e85b..007651e 100644
--- a/src/resources/resources.gresource.xml
+++ b/src/resources/resources.gresource.xml
@@ -10,10 +10,11 @@
     <file compressed="true" preprocess="xml-stripblanks">resetSavedWifiEntry.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">resetBluetooth.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">resetBluetoothEntry.ui</file>
-    <file compressed="true" preprocess="xml-stripblanks">resetAudio.ui</file>
+    <file compressed="true" preprocess="xml-stripblanks">resetAudioOutput.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">resetOutputStreamEntry.ui</file>
-    <file compressed="true" preprocess="xml-stripblanks">resetMicrophone.ui</file>
+    <file compressed="true" preprocess="xml-stripblanks">resetAudioInput.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">resetInputStreamEntry.ui</file>
+    <file compressed="true" preprocess="xml-stripblanks">resetSinkEntry.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">resetPopup.ui</file>
   </gresource>
 </gresources>

From c1984b5b7986a304e40f240ac4d33d6ce5c7a0de Mon Sep 17 00:00:00 2001
From: Fabio Lenherr / DashieTM <fabio.lenherr@gmail.com>
Date: Tue, 14 Nov 2023 21:25:39 +0100
Subject: [PATCH 2/4] feat: Add basic functionality to all audio usecases

---
 Cargo.toml                                    |   2 +-
 src/components/input/outputStreamEntry.rs     |  58 +++++++-
 src/components/input/outputStreamEntryImpl.rs |   5 +
 src/components/input/sourceBox.rs             | 140 +++++++++++++++++-
 src/components/input/sourceBoxImpl.rs         |   4 +-
 src/components/input/sourceEntry.rs           |   6 +-
 src/components/input/sourceEntryImpl.rs       |   2 +-
 src/components/output/inputStreamEntry.rs     |   8 +-
 src/components/output/mod.rs                  |   4 +-
 .../output/{audioBox.rs => sinkBox.rs}        |  70 ++++++---
 .../{audioBoxImpl.rs => sinkBoxImpl.rs}       |  22 +--
 src/components/output/sinkEntry.rs            |   6 +-
 src/components/window/handleSidebarClick.rs   |  22 ++-
 src/resources/resetAudioInput.ui              |   7 +-
 src/resources/resetAudioOutput.ui             |   7 +-
 src/resources/resetBluetooth.ui               |   2 +-
 src/resources/resetBluetoothEntry.ui          |   2 +-
 src/resources/resetInputStreamEntry.ui        |   9 +-
 src/resources/resetListBoxRow.ui              |   2 +-
 src/resources/resetMainWindow.ui              |   2 +-
 src/resources/resetOutpuStreamEntry.ui        |  68 ---------
 src/resources/resetOutputStreamEntry.ui       |  13 +-
 src/resources/resetPopup.ui                   |   2 +-
 src/resources/resetSavedWifiEntry.ui          |   2 +-
 src/resources/resetSettingBox.ui              |   2 +-
 src/resources/resetSidebarEntry.ui            |   2 +-
 src/resources/resetSinkEntry.ui               |  13 +-
 src/resources/resetSourceEntry.ui             |  13 +-
 src/resources/resetUI.cmb                     |  69 +++++----
 src/resources/resetWiFi.ui                    |   2 +-
 src/resources/resetWifiEntry.ui               |   2 +-
 src/resources/resources.gresource.xml         |   1 +
 32 files changed, 368 insertions(+), 201 deletions(-)
 rename src/components/output/{audioBox.rs => sinkBox.rs} (58%)
 rename src/components/output/{audioBoxImpl.rs => sinkBoxImpl.rs} (82%)
 delete mode 100644 src/resources/resetOutpuStreamEntry.ui

diff --git a/Cargo.toml b/Cargo.toml
index 6bf4340..cf9d4fc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,7 +6,7 @@ description = "A wip universal Linux settings application."
 
 [dependencies]
 reset_daemon = "0.1.2"
-ReSet-Lib = "0.2.7"
+ReSet-Lib = "0.2.8"
 adw = { version = "0.5.3", package = "libadwaita", features = ["v1_4"] }
 dbus = "0.9.7"
 gtk = { version = "0.7.3", package = "gtk4", features = ["v4_12"] }
diff --git a/src/components/input/outputStreamEntry.rs b/src/components/input/outputStreamEntry.rs
index a522b12..dc7599d 100644
--- a/src/components/input/outputStreamEntry.rs
+++ b/src/components/input/outputStreamEntry.rs
@@ -1,5 +1,15 @@
+use std::cell::RefCell;
+use std::sync::Arc;
+use std::time::Duration;
+
 use adw::glib;
 use adw::glib::Object;
+use adw::prelude::RangeExt;
+use dbus::blocking::Connection;
+use dbus::Error;
+use ReSet_Lib::audio::audio::OutputStream;
+use glib::{clone, Propagation};
+use glib::subclass::types::ObjectSubclassIsExt;
 
 use super::outputStreamEntryImpl;
 
@@ -10,7 +20,51 @@ glib::wrapper! {
 }
 
 impl OutputStreamEntry {
-    pub fn new() -> Self {
-        Object::builder().build()
+    pub fn new(stream: OutputStream) -> Self {
+        let obj: Self = Object::builder().build();
+        // TODO use event callback for progress bar -> this is the "im speaking" indicator
+        // TODO map mute to callback
+        // TODO map dropdown
+        {
+            let imp = obj.imp();
+            let name = stream.application_name.clone() + ": " + stream.name.as_str();
+            imp.resetSourceName.set_text(name.as_str());
+            let volume = stream.volume.first().unwrap_or_else(|| &(0 as 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.stream.replace(stream);
+            imp.resetVolumeSlider.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);
+                    set_outputstream_volume(value, imp.stream.clone());
+                    Propagation::Proceed
+                }),
+            );
+        }
+        obj
     }
 }
+
+fn set_outputstream_volume(value: f64, stream: Arc<RefCell<OutputStream>>) -> bool {
+    let mut stream = stream.borrow_mut().clone();
+    // let x = stream.volume.iter_mut().map(|_| value as u32);
+    stream.volume = vec![value as u32; stream.channels as usize];
+    dbg!(stream.volume.clone());
+
+    let conn = Connection::new_session().unwrap();
+    let proxy = conn.with_proxy(
+        "org.xetibo.ReSet",
+        "/org/xetibo/ReSet",
+        Duration::from_millis(1000),
+    );
+    let res: Result<(bool,), Error> =
+        proxy.method_call("org.xetibo.ReSet", "SetOutputStreamVolume", (stream,));
+    if res.is_err() {
+        return false;
+    }
+    res.unwrap().0
+}
diff --git a/src/components/input/outputStreamEntryImpl.rs b/src/components/input/outputStreamEntryImpl.rs
index c90ed5e..88dccfe 100644
--- a/src/components/input/outputStreamEntryImpl.rs
+++ b/src/components/input/outputStreamEntryImpl.rs
@@ -1,4 +1,8 @@
+use std::cell::RefCell;
+use std::sync::Arc;
+
 use crate::components::input::outputStreamEntry;
+use ReSet_Lib::audio::audio::OutputStream;
 use gtk::subclass::prelude::*;
 use gtk::{glib, Button, CompositeTemplate, Label, ProgressBar, Scale, DropDown};
 
@@ -18,6 +22,7 @@ pub struct OutputStreamEntry {
     pub resetVolumePercentage: TemplateChild<Label>,
     #[template_child]
     pub resetVolumeMeter: TemplateChild<ProgressBar>,
+    pub stream: Arc<RefCell<OutputStream>>,
 }
 
 #[glib::object_subclass]
diff --git a/src/components/input/sourceBox.rs b/src/components/input/sourceBox.rs
index 4ad1272..e5e9d44 100644
--- a/src/components/input/sourceBox.rs
+++ b/src/components/input/sourceBox.rs
@@ -1,9 +1,23 @@
+use std::sync::Arc;
+use std::time::Duration;
+
+use crate::components::base::listEntry::ListEntry;
+use crate::components::base::utils::Listeners;
 use crate::components::input::sourceBoxImpl;
+use crate::components::input::sourceEntry::set_source_volume;
 use adw::glib;
 use adw::glib::Object;
+use adw::prelude::{BoxExt, ListBoxRowExt, RangeExt};
+use dbus::blocking::Connection;
+use dbus::Error;
 use glib::subclass::prelude::ObjectSubclassIsExt;
-use glib::Variant;
+use glib::{Propagation, Variant};
+use gtk::gio;
 use gtk::prelude::ActionableExt;
+use ReSet_Lib::audio::audio::{OutputStream, Source};
+
+use super::outputStreamEntry::OutputStreamEntry;
+use super::sourceEntry::SourceEntry;
 
 glib::wrapper! {
     pub struct SourceBox(ObjectSubclass<sourceBoxImpl::SourceBox>)
@@ -11,6 +25,9 @@ glib::wrapper! {
     @implements gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget, gtk::Orientable;
 }
 
+unsafe impl Send for SourceBox {}
+unsafe impl Sync for SourceBox {}
+
 impl SourceBox {
     pub fn new() -> Self {
         Object::builder().build()
@@ -18,9 +35,124 @@ impl SourceBox {
 
     pub fn setupCallbacks(&self) {
         let selfImp = self.imp();
-        selfImp.resetSourceRow.set_action_name(Some("navigation.push"));
-        selfImp.resetSourceRow.set_action_target_value(Some(&Variant::from("sources")));
+        selfImp
+            .resetSourceRow
+            .set_action_name(Some("navigation.push"));
+        selfImp
+            .resetSourceRow
+            .set_action_target_value(Some(&Variant::from("sources")));
 
-        selfImp.resetOutputStreamButton.set_action_name(Some("navigation.pop"));
+        selfImp
+            .resetOutputStreamButton
+            .set_action_name(Some("navigation.pop"));
     }
 }
+
+pub fn populate_sources(output_box: Arc<SourceBox>) {
+    gio::spawn_blocking(move || {
+        let output_box_imp = output_box.imp();
+        let sinks = get_sources();
+        output_box_imp
+            .resetDefaultSource
+            .replace(get_default_source());
+        glib::spawn_future(async move {
+            glib::idle_add_once(move || {
+                // TODO handle default mapping
+                let output_box_ref_slider = output_box.clone();
+                let output_box_ref = output_box.clone();
+                {
+                    let output_box_imp = output_box_ref.imp();
+                    let default_sink = output_box_imp.resetDefaultSource.clone(); // Clone outside closure
+                    let source = default_sink.borrow(); //
+
+                    let volume = source.volume.first().unwrap_or_else(|| &(0 as u32));
+                    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);
+                    for stream in sinks {
+                        let entry = ListEntry::new(&SourceEntry::new(stream));
+                        entry.set_activatable(false);
+                        output_box_imp.resetSources.append(&entry);
+                    }
+                }
+                output_box_ref
+                    .imp()
+                    .resetVolumeSlider
+                    .connect_change_value(move |_, _, value| {
+                        let imp = output_box_ref_slider.imp();
+                        let fraction = (value / 655.36).round();
+                        println!("{fraction}");
+                        let percentage = (fraction).to_string() + "%";
+                        imp.resetVolumePercentage.set_text(&percentage);
+                        set_source_volume(value, imp.resetDefaultSource.clone());
+                        Propagation::Proceed
+                    });
+            });
+        });
+    });
+}
+
+pub fn populate_outputstreams(listeners: Arc<Listeners>, output_box: Arc<SourceBox>) {
+    // TODO add listener
+    let output_box_ref = output_box.clone();
+
+    gio::spawn_blocking(move || {
+        let streams = get_output_streams();
+        glib::spawn_future(async move {
+            glib::idle_add_once(move || {
+                let output_box_imp = output_box_ref.imp();
+                for stream in streams {
+                    let entry = ListEntry::new(&OutputStreamEntry::new(stream));
+                    entry.set_activatable(false);
+                    output_box_imp.resetOutputStreams.append(&entry);
+                }
+            });
+        });
+    });
+}
+
+fn get_output_streams() -> Vec<OutputStream> {
+    let conn = Connection::new_session().unwrap();
+    let proxy = conn.with_proxy(
+        "org.xetibo.ReSet",
+        "/org/xetibo/ReSet",
+        Duration::from_millis(1000),
+    );
+    let res: Result<(Vec<OutputStream>,), Error> =
+        proxy.method_call("org.xetibo.ReSet", "ListOutputStreams", ());
+    if res.is_err() {
+        return Vec::new();
+    }
+    res.unwrap().0
+}
+
+fn get_sources() -> Vec<Source> {
+    let conn = Connection::new_session().unwrap();
+    let proxy = conn.with_proxy(
+        "org.xetibo.ReSet",
+        "/org/xetibo/ReSet",
+        Duration::from_millis(1000),
+    );
+    let res: Result<(Vec<Source>,), Error> =
+        proxy.method_call("org.xetibo.ReSet", "ListSources", ());
+    if res.is_err() {
+        return Vec::new();
+    }
+    res.unwrap().0
+}
+
+fn get_default_source() -> Source {
+    let conn = Connection::new_session().unwrap();
+    let proxy = conn.with_proxy(
+        "org.xetibo.ReSet",
+        "/org/xetibo/ReSet",
+        Duration::from_millis(1000),
+    );
+    let res: Result<(Source,), Error> =
+        proxy.method_call("org.xetibo.ReSet", "GetDefaultSource", ());
+    if res.is_err() {
+        return Source::default();
+    }
+    res.unwrap().0
+}
diff --git a/src/components/input/sourceBoxImpl.rs b/src/components/input/sourceBoxImpl.rs
index 330599e..6e7ba7a 100644
--- a/src/components/input/sourceBoxImpl.rs
+++ b/src/components/input/sourceBoxImpl.rs
@@ -9,6 +9,7 @@ use gtk::{prelude::*, Button, Label, ProgressBar, Scale};
 use ReSet_Lib::audio::audio::{OutputStream, Source};
 
 use super::outputStreamEntry::OutputStreamEntry;
+use super::sourceEntry::SourceEntry;
 
 #[allow(non_snake_case)]
 #[derive(Default, CompositeTemplate)]
@@ -32,7 +33,7 @@ pub struct SourceBox {
     pub resetOutputStreamButton: TemplateChild<ListEntry>,
     #[template_child]
     pub resetOutputStreams: TemplateChild<gtk::Box>,
-    pub resetDefaultSource: RefCell<Option<Source>>,
+    pub resetDefaultSource: Arc<RefCell<Source>>,
     pub resetSourceList: Arc<Mutex<Vec<Source>>>,
     pub resetOutputStreamList: Arc<Mutex<Vec<OutputStream>>>,
 }
@@ -45,6 +46,7 @@ impl ObjectSubclass for SourceBox {
 
     fn class_init(klass: &mut Self::Class) {
         OutputStreamEntry::ensure_type();
+        SourceEntry::ensure_type();
         ListEntry::ensure_type();
         klass.bind_template();
     }
diff --git a/src/components/input/sourceEntry.rs b/src/components/input/sourceEntry.rs
index 00212fb..1a1bfb3 100644
--- a/src/components/input/sourceEntry.rs
+++ b/src/components/input/sourceEntry.rs
@@ -42,7 +42,7 @@ impl SourceEntry {
                     println!("{fraction}");
                     let percentage = (fraction).to_string() + "%";
                     imp.resetVolumePercentage.set_text(&percentage);
-                    set_inputstream_volume(value, imp.stream.clone());
+                    set_source_volume(value, imp.stream.clone());
                     Propagation::Proceed
                 }),
             );
@@ -51,7 +51,7 @@ impl SourceEntry {
     }
 }
 
-fn set_inputstream_volume(value: f64, stream: Arc<RefCell<Source>>) -> bool {
+pub fn set_source_volume(value: f64, stream: Arc<RefCell<Source>>) -> bool {
     let mut stream = stream.borrow_mut().clone();
     // let x = stream.volume.iter_mut().map(|_| value as u32);
     stream.volume = vec![value as u32; stream.channels as usize];
@@ -61,7 +61,7 @@ fn set_inputstream_volume(value: f64, stream: Arc<RefCell<Source>>) -> bool {
     let proxy = conn.with_proxy(
         "org.xetibo.ReSet",
         "/org/xetibo/ReSet",
-        Duration::from_millis(100),
+        Duration::from_millis(1000),
     );
     let res: Result<(bool,), Error> =
         proxy.method_call("org.xetibo.ReSet", "SetSourceVolume", (stream,));
diff --git a/src/components/input/sourceEntryImpl.rs b/src/components/input/sourceEntryImpl.rs
index 23c3b49..57c3e44 100644
--- a/src/components/input/sourceEntryImpl.rs
+++ b/src/components/input/sourceEntryImpl.rs
@@ -2,7 +2,7 @@ use std::cell::RefCell;
 use std::sync::Arc;
 
 use gtk::subclass::prelude::*;
-use gtk::{glib, Button, CompositeTemplate, DropDown, Label, ProgressBar, Scale, CheckButton};
+use gtk::{glib, Button, CompositeTemplate, Label, ProgressBar, Scale, CheckButton};
 use ReSet_Lib::audio::audio::Source;
 
 use super::sourceEntry;
diff --git a/src/components/output/inputStreamEntry.rs b/src/components/output/inputStreamEntry.rs
index 69d1d0d..67aeb77 100644
--- a/src/components/output/inputStreamEntry.rs
+++ b/src/components/output/inputStreamEntry.rs
@@ -23,13 +23,12 @@ impl InputStreamEntry {
     pub fn new(stream: InputStream) -> Self {
         let obj: Self = Object::builder().build();
         // TODO use event callback for progress bar -> this is the "im speaking" indicator
-        // TODO map the slider to volume
-        // TODO properly use volume fraction
         // TODO map mute to callback
         // TODO map dropdown
         {
             let imp = obj.imp();
-            imp.resetSinkName.set_text(stream.name.clone().as_str());
+            let name = stream.application_name.clone() + ": " + stream.name.as_str();
+            imp.resetSinkName.set_text(name.as_str());
             let volume = stream.volume.first().unwrap_or_else(|| &(0 as u32));
             let fraction = (*volume as f64 / 655.36).round();
             let percentage = (fraction).to_string() + "%";
@@ -39,7 +38,6 @@ impl InputStreamEntry {
             imp.resetVolumeSlider.connect_change_value(
                 clone!(@weak imp => @default-return Propagation::Stop, move |_, _, value| {
                     let fraction = (value / 655.36).round();
-                    println!("{fraction}");
                     let percentage = (fraction).to_string() + "%";
                     imp.resetVolumePercentage.set_text(&percentage);
                     set_inputstream_volume(value, imp.stream.clone());
@@ -61,7 +59,7 @@ fn set_inputstream_volume(value: f64, stream: Arc<RefCell<InputStream>>) -> bool
     let proxy = conn.with_proxy(
         "org.xetibo.ReSet",
         "/org/xetibo/ReSet",
-        Duration::from_millis(100),
+        Duration::from_millis(1000),
     );
     let res: Result<(bool,), Error> =
         proxy.method_call("org.xetibo.ReSet", "SetInputStreamVolume", (stream,));
diff --git a/src/components/output/mod.rs b/src/components/output/mod.rs
index dd12769..c94e62b 100644
--- a/src/components/output/mod.rs
+++ b/src/components/output/mod.rs
@@ -1,6 +1,6 @@
 #![allow(non_snake_case)]
-pub mod audioBox;
-pub mod audioBoxImpl;
+pub mod sinkBox;
+pub mod sinkBoxImpl;
 pub mod inputStreamEntry;
 pub mod inputStreamEntryImpl;
 pub mod sinkEntry;
diff --git a/src/components/output/audioBox.rs b/src/components/output/sinkBox.rs
similarity index 58%
rename from src/components/output/audioBox.rs
rename to src/components/output/sinkBox.rs
index cf938d6..38ab7b1 100644
--- a/src/components/output/audioBox.rs
+++ b/src/components/output/sinkBox.rs
@@ -3,31 +3,32 @@ use std::time::Duration;
 
 use crate::components::base::listEntry::ListEntry;
 use crate::components::base::utils::Listeners;
-use crate::components::output::audioBoxImpl;
+use crate::components::output::sinkEntry::set_sink_volume;
 use adw::glib::Object;
-use adw::prelude::BoxExt;
+use adw::prelude::{BoxExt, RangeExt};
 use adw::{glib, prelude::ListBoxRowExt};
 use dbus::blocking::Connection;
 use dbus::Error;
 use glib::subclass::prelude::ObjectSubclassIsExt;
-use glib::Variant;
+use glib::{clone, Propagation, Variant};
 use gtk::gio;
 use gtk::prelude::ActionableExt;
 use ReSet_Lib::audio::audio::{InputStream, Sink};
 
 use super::inputStreamEntry::InputStreamEntry;
+use super::sinkBoxImpl;
 use super::sinkEntry::SinkEntry;
 
 glib::wrapper! {
-    pub struct AudioBox(ObjectSubclass<audioBoxImpl::AudioBox>)
+    pub struct SinkBox(ObjectSubclass<sinkBoxImpl::SinkBox>)
     @extends gtk::Box, gtk::Widget,
     @implements gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget, gtk::Orientable;
 }
 
-unsafe impl Send for AudioBox {}
-unsafe impl Sync for AudioBox {}
+unsafe impl Send for SinkBox {}
+unsafe impl Sync for SinkBox {}
 
-impl AudioBox {
+impl SinkBox {
     pub fn new() -> Self {
         Object::builder().build()
     }
@@ -47,30 +48,53 @@ impl AudioBox {
     }
 }
 
-pub fn populate_sinks(output_box: Arc<AudioBox>) {
-    let output_box_ref = output_box.clone();
+pub fn populate_sinks(output_box: Arc<SinkBox>) {
     gio::spawn_blocking(move || {
-        let output_box_imp = output_box.imp();
+        let output_box_ref = output_box.clone();
+        {
+            let output_box_imp = output_box.imp();
+            output_box_imp.resetDefaultSink.replace(get_default_sink());
+        }
         let sinks = get_sinks();
-        output_box_imp.resetDefaultSink.replace(get_default_sink());
         glib::spawn_future(async move {
             glib::idle_add_once(move || {
-                let output_box_imp = output_box_ref.imp();
                 // TODO handle default mapping
-                // output_box_imp.resetVolumePercentage.set_text();
-                // output_box_imp.resetVolumeSlider.let
-                for stream in sinks {
-                    // TODO create sink handler -> currently only allows input streams
-                    let entry = ListEntry::new(&SinkEntry::new(stream));
-                    entry.set_activatable(false);
-                    output_box_imp.resetSinks.append(&entry);
+                let output_box_ref_slider = output_box.clone();
+                {
+                    let output_box_imp = output_box_ref.imp();
+                    let default_sink = output_box_imp.resetDefaultSink.clone(); // Clone outside closure
+                    let sink = default_sink.borrow(); //
+
+                    let volume = sink.volume.first().unwrap_or_else(|| &(0 as u32));
+                    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);
+                    for stream in sinks {
+                        // TODO create sink handler -> currently only allows input streams
+                        let entry = ListEntry::new(&SinkEntry::new(stream));
+                        entry.set_activatable(false);
+                        output_box_imp.resetSinks.append(&entry);
+                    }
                 }
+                output_box_ref
+                    .imp()
+                    .resetVolumeSlider
+                    .connect_change_value(move |_, _, value| {
+                        let imp = output_box_ref_slider.imp();
+                        let fraction = (value / 655.36).round();
+                        println!("{fraction}");
+                        let percentage = (fraction).to_string() + "%";
+                        imp.resetVolumePercentage.set_text(&percentage);
+                        set_sink_volume(value, imp.resetDefaultSink.clone());
+                        Propagation::Proceed
+                    });
             });
         });
     });
 }
 
-pub fn populate_streams(listeners: Arc<Listeners>, output_box: Arc<AudioBox>) {
+pub fn populate_inputstreams(listeners: Arc<Listeners>, output_box: Arc<SinkBox>) {
     // TODO add listener
     let output_box_ref = output_box.clone();
     // let output_box_ref_listener = output_box.clone();
@@ -122,7 +146,7 @@ fn get_sinks() -> Vec<Sink> {
     res.unwrap().0
 }
 
-fn get_default_sink() -> Option<Sink> {
+fn get_default_sink() -> Sink {
     let conn = Connection::new_session().unwrap();
     let proxy = conn.with_proxy(
         "org.xetibo.ReSet",
@@ -131,7 +155,7 @@ fn get_default_sink() -> Option<Sink> {
     );
     let res: Result<(Sink,), Error> = proxy.method_call("org.xetibo.ReSet", "GetDefaultSink", ());
     if res.is_err() {
-        return None;
+        return Sink::default();
     }
-    Some(res.unwrap().0)
+    res.unwrap().0
 }
diff --git a/src/components/output/audioBoxImpl.rs b/src/components/output/sinkBoxImpl.rs
similarity index 82%
rename from src/components/output/audioBoxImpl.rs
rename to src/components/output/sinkBoxImpl.rs
index fdf9480..f8c79ca 100644
--- a/src/components/output/audioBoxImpl.rs
+++ b/src/components/output/sinkBoxImpl.rs
@@ -2,19 +2,19 @@ use std::cell::RefCell;
 use std::sync::{Arc, Mutex};
 
 use crate::components::base::listEntry::ListEntry;
-use crate::components::output::audioBox;
 use crate::components::output::inputStreamEntry::InputStreamEntry;
 use gtk::subclass::prelude::*;
 use gtk::{glib, Box, Button, CompositeTemplate, DropDown, Label, TemplateChild};
 use gtk::{prelude::*, ProgressBar, Scale};
 use ReSet_Lib::audio::audio::{InputStream, Sink};
 
+use super::sinkBox;
 use super::sinkEntry::SinkEntry;
 
 #[allow(non_snake_case)]
 #[derive(Default, CompositeTemplate)]
 #[template(resource = "/org/Xetibo/ReSet/resetAudioOutput.ui")]
-pub struct AudioBox {
+pub struct SinkBox {
     #[template_child]
     pub resetSinksRow: TemplateChild<ListEntry>,
     #[template_child]
@@ -33,15 +33,15 @@ pub struct AudioBox {
     pub resetInputStreamButton: TemplateChild<ListEntry>,
     #[template_child]
     pub resetInputStreams: TemplateChild<Box>,
-    pub resetDefaultSink: RefCell<Option<Sink>>,
+    pub resetDefaultSink: Arc<RefCell<Sink>>,
     pub resetSinkList: Arc<Mutex<Vec<Sink>>>,
     pub resetInputStreamList: Arc<Mutex<Vec<InputStream>>>,
 }
 
 #[glib::object_subclass]
-impl ObjectSubclass for AudioBox {
+impl ObjectSubclass for SinkBox {
     const NAME: &'static str = "resetAudioOutput";
-    type Type = audioBox::AudioBox;
+    type Type = sinkBox::SinkBox;
     type ParentType = gtk::Box;
 
     fn class_init(klass: &mut Self::Class) {
@@ -56,19 +56,19 @@ impl ObjectSubclass for AudioBox {
     }
 }
 
-impl BoxImpl for AudioBox {}
+impl BoxImpl for SinkBox {}
 
-impl ObjectImpl for AudioBox {
+impl ObjectImpl for SinkBox {
     fn constructed(&self) {
         let obj = self.obj();
         obj.setupCallbacks();
     }
 }
 
-impl ListBoxRowImpl for AudioBox {}
+impl ListBoxRowImpl for SinkBox {}
 
-impl WidgetImpl for AudioBox {}
+impl WidgetImpl for SinkBox {}
 
-impl WindowImpl for AudioBox {}
+impl WindowImpl for SinkBox {}
 
-impl ApplicationWindowImpl for AudioBox {}
+impl ApplicationWindowImpl for SinkBox {}
diff --git a/src/components/output/sinkEntry.rs b/src/components/output/sinkEntry.rs
index f46671e..7c5f478 100644
--- a/src/components/output/sinkEntry.rs
+++ b/src/components/output/sinkEntry.rs
@@ -42,7 +42,7 @@ impl SinkEntry {
                     println!("{fraction}");
                     let percentage = (fraction).to_string() + "%";
                     imp.resetVolumePercentage.set_text(&percentage);
-                    set_inputstream_volume(value, imp.stream.clone());
+                    set_sink_volume(value, imp.stream.clone());
                     Propagation::Proceed
                 }),
             );
@@ -51,7 +51,7 @@ impl SinkEntry {
     }
 }
 
-fn set_inputstream_volume(value: f64, stream: Arc<RefCell<Sink>>) -> bool {
+pub fn set_sink_volume(value: f64, stream: Arc<RefCell<Sink>>) -> bool {
     let mut stream = stream.borrow_mut().clone();
     // let x = stream.volume.iter_mut().map(|_| value as u32);
     stream.volume = vec![value as u32; stream.channels as usize];
@@ -61,7 +61,7 @@ fn set_inputstream_volume(value: f64, stream: Arc<RefCell<Sink>>) -> bool {
     let proxy = conn.with_proxy(
         "org.xetibo.ReSet",
         "/org/xetibo/ReSet",
-        Duration::from_millis(100),
+        Duration::from_millis(1000),
     );
     let res: Result<(bool,), Error> =
         proxy.method_call("org.xetibo.ReSet", "SetSinkVolume", (stream,));
diff --git a/src/components/window/handleSidebarClick.rs b/src/components/window/handleSidebarClick.rs
index 41ccbfd..3a5f062 100644
--- a/src/components/window/handleSidebarClick.rs
+++ b/src/components/window/handleSidebarClick.rs
@@ -5,8 +5,8 @@ use std::sync::Arc;
 use crate::components::base::settingBox::SettingBox;
 use crate::components::base::utils::Listeners;
 use crate::components::bluetooth::bluetoothBox::BluetoothBox;
-use crate::components::input::sourceBox::SourceBox;
-use crate::components::output::audioBox::{populate_streams, AudioBox, populate_sinks};
+use crate::components::input::sourceBox::{SourceBox, populate_outputstreams, populate_sources};
+use crate::components::output::sinkBox::{SinkBox, populate_inputstreams, populate_sinks};
 use crate::components::wifi::wifiBox::{scanForWifi, show_stored_connections, WifiBox};
 use gtk::prelude::WidgetExt;
 use gtk::{FlowBox, Frame, Label};
@@ -63,11 +63,14 @@ pub const HANDLE_AUDIO_CLICK: fn(Arc<Listeners>, FlowBox) =
         listeners.stop_network_listener();
         listeners.bluetooth_listener.store(false, Ordering::SeqCst);
         listeners.pulse_listener.store(true, Ordering::SeqCst);
-        let audioOutput = Arc::new(AudioBox::new());
-        populate_streams(listeners.clone(), audioOutput.clone());
+        let audioOutput = Arc::new(SinkBox::new());
+        populate_inputstreams(listeners.clone(), audioOutput.clone());
         populate_sinks(audioOutput.clone());
         let audioFrame = wrapInFrame(SettingBox::new(&*audioOutput));
-        let sourceFrame = wrapInFrame(SettingBox::new(&SourceBox::new()));
+        let audioInput = Arc::new(SourceBox::new());
+        populate_outputstreams(listeners.clone(), audioInput.clone());
+        populate_sources(audioInput.clone());
+        let sourceFrame = wrapInFrame(SettingBox::new(&*audioInput));
         resetMain.remove_all();
         resetMain.insert(&audioFrame, -1);
         resetMain.insert(&sourceFrame, -1);
@@ -79,8 +82,8 @@ pub const HANDLE_VOLUME_CLICK: fn(Arc<Listeners>, FlowBox) =
         listeners.stop_network_listener();
         listeners.bluetooth_listener.store(false, Ordering::SeqCst);
         listeners.pulse_listener.store(false, Ordering::SeqCst);
-        let audioOutput = Arc::new(AudioBox::new());
-        populate_streams(listeners.clone(), audioOutput.clone());
+        let audioOutput = Arc::new(SinkBox::new());
+        populate_inputstreams(listeners.clone(), audioOutput.clone());
         populate_sinks(audioOutput.clone());
         let audioFrame = wrapInFrame(SettingBox::new(&*audioOutput));
         resetMain.remove_all();
@@ -93,7 +96,10 @@ pub const HANDLE_MICROPHONE_CLICK: fn(Arc<Listeners>, FlowBox) =
         listeners.stop_network_listener();
         listeners.bluetooth_listener.store(false, Ordering::SeqCst);
         listeners.pulse_listener.store(false, Ordering::SeqCst);
-        let sourceFrame = wrapInFrame(SettingBox::new(&SourceBox::new()));
+        let audioInput = Arc::new(SourceBox::new());
+        populate_outputstreams(listeners.clone(), audioInput.clone());
+        populate_sources(audioInput.clone());
+        let sourceFrame = wrapInFrame(SettingBox::new(&*audioInput));
         resetMain.remove_all();
         resetMain.insert(&sourceFrame, -1);
         resetMain.set_max_children_per_line(1);
diff --git a/src/resources/resetAudioInput.ui b/src/resources/resetAudioInput.ui
index 4200e8d..db18217 100644
--- a/src/resources/resetAudioInput.ui
+++ b/src/resources/resetAudioInput.ui
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Cambalache 0.16.0 -->
+<!-- Created with Cambalache 0.17.0 -->
 <interface>
   <requires lib="gtk" version="4.12"/>
   <requires lib="libadwaita" version="1.4"/>
@@ -84,8 +84,9 @@
                           <object class="GtkScale" id="resetVolumeSlider">
                             <property name="adjustment">
                               <object class="GtkAdjustment">
-                                <property name="page-increment">5.0</property>
-                                <property name="upper">100.0</property>
+                                <property name="page-increment">2005.4016</property>
+                                <property name="step-increment">2005.4016</property>
+                                <property name="upper">100270.08</property>
                               </object>
                             </property>
                             <property name="hexpand">True</property>
diff --git a/src/resources/resetAudioOutput.ui b/src/resources/resetAudioOutput.ui
index 74740c6..c6e2989 100644
--- a/src/resources/resetAudioOutput.ui
+++ b/src/resources/resetAudioOutput.ui
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Cambalache 0.16.0 -->
+<!-- Created with Cambalache 0.17.0 -->
 <interface>
   <requires lib="gtk" version="4.12"/>
   <requires lib="libadwaita" version="1.4"/>
@@ -84,8 +84,9 @@
                           <object class="GtkScale" id="resetVolumeSlider">
                             <property name="adjustment">
                               <object class="GtkAdjustment">
-                                <property name="page-increment">5.0</property>
-                                <property name="upper">100.0</property>
+                                <property name="page-increment">2005.4016</property>
+                                <property name="step-increment">2005.4016</property>
+                                <property name="upper">100270.08</property>
                               </object>
                             </property>
                             <property name="hexpand">True</property>
diff --git a/src/resources/resetBluetooth.ui b/src/resources/resetBluetooth.ui
index 43d1afb..315ebdd 100644
--- a/src/resources/resetBluetooth.ui
+++ b/src/resources/resetBluetooth.ui
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Cambalache 0.16.0 -->
+<!-- Created with Cambalache 0.17.0 -->
 <interface>
   <requires lib="gtk" version="4.6"/>
   <requires lib="libadwaita" version="1.4"/>
diff --git a/src/resources/resetBluetoothEntry.ui b/src/resources/resetBluetoothEntry.ui
index 92d1cb0..08232d5 100644
--- a/src/resources/resetBluetoothEntry.ui
+++ b/src/resources/resetBluetoothEntry.ui
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Cambalache 0.16.0 -->
+<!-- Created with Cambalache 0.17.0 -->
 <interface>
   <requires lib="gtk" version="4.12"/>
   <template class="resetBluetoothEntry" parent="GtkBox">
diff --git a/src/resources/resetInputStreamEntry.ui b/src/resources/resetInputStreamEntry.ui
index 1f27b67..42b0929 100644
--- a/src/resources/resetInputStreamEntry.ui
+++ b/src/resources/resetInputStreamEntry.ui
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Cambalache 0.16.0 -->
+<!-- Created with Cambalache 0.17.0 -->
 <interface>
   <requires lib="gtk" version="4.12"/>
   <template class="resetInputStreamEntry" parent="GtkBox">
@@ -15,6 +15,7 @@
           <object class="GtkLabel" id="resetSinkName">
             <property name="label">text</property>
             <property name="margin-start">5</property>
+            <property name="wrap">True</property>
           </object>
         </child>
         <child>
@@ -41,9 +42,9 @@
           <object class="GtkScale" id="resetVolumeSlider">
             <property name="adjustment">
               <object class="GtkAdjustment">
-                <property name="page-increment">655.36</property>
-                <property name="step-increment">65536.0</property>
-                <property name="upper">65536.0</property>
+                <property name="page-increment">2005.4016</property>
+                <property name="step-increment">2005.4016</property>
+                <property name="upper">100270.08</property>
               </object>
             </property>
             <property name="hexpand">True</property>
diff --git a/src/resources/resetListBoxRow.ui b/src/resources/resetListBoxRow.ui
index 9a40cc7..4edeb36 100644
--- a/src/resources/resetListBoxRow.ui
+++ b/src/resources/resetListBoxRow.ui
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Cambalache 0.16.0 -->
+<!-- Created with Cambalache 0.17.0 -->
 <interface>
   <requires lib="gtk" version="4.0"/>
   <template class="resetListBoxRow" parent="GtkListBoxRow">
diff --git a/src/resources/resetMainWindow.ui b/src/resources/resetMainWindow.ui
index f358551..779ed80 100644
--- a/src/resources/resetMainWindow.ui
+++ b/src/resources/resetMainWindow.ui
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Cambalache 0.16.0 -->
+<!-- Created with Cambalache 0.17.0 -->
 <interface>
   <requires lib="gtk" version="4.12"/>
   <requires lib="libadwaita" version="1.4"/>
diff --git a/src/resources/resetOutpuStreamEntry.ui b/src/resources/resetOutpuStreamEntry.ui
deleted file mode 100644
index 2a506b9..0000000
--- a/src/resources/resetOutpuStreamEntry.ui
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Cambalache 0.16.0 -->
-<interface>
-  <requires lib="gtk" version="4.12"/>
-  <template class="resetOutpuStreamEntry" parent="GtkBox">
-    <property name="margin-bottom">5</property>
-    <property name="margin-end">5</property>
-    <property name="margin-start">5</property>
-    <property name="margin-top">5</property>
-    <property name="orientation">vertical</property>
-    <child>
-      <object class="GtkBox">
-        <property name="margin-bottom">5</property>
-        <child>
-          <object class="GtkLabel" id="resetSourceName">
-            <property name="label">text</property>
-            <property name="margin-start">5</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkDropDown" id="resetSelectedSource">
-            <property name="halign">end</property>
-            <property name="hexpand">True</property>
-            <property name="margin-end">5</property>
-          </object>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkBox">
-        <property name="margin-bottom">5</property>
-        <property name="margin-top">5</property>
-        <child>
-          <object class="GtkButton" id="resetSourceMute">
-            <property name="icon-name">audio-input-microphone-symbolic</property>
-            <property name="margin-end">5</property>
-            <property name="valign">center</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkScale" id="resetVolumeSlider">
-            <property name="adjustment">
-              <object class="GtkAdjustment">
-                <property name="page-increment">5.0</property>
-                <property name="upper">100.0</property>
-              </object>
-            </property>
-            <property name="hexpand">True</property>
-            <property name="valign">center</property>
-            <property name="value-pos">bottom</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel" id="resetVolumePercentage">
-            <property name="label">100%</property>
-            <property name="lines">1</property>
-            <property name="width-request">40</property>
-          </object>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkProgressBar" id="resetVolumeMeter">
-        <property name="margin-top">5</property>
-      </object>
-    </child>
-  </template>
-</interface>
diff --git a/src/resources/resetOutputStreamEntry.ui b/src/resources/resetOutputStreamEntry.ui
index 5eaba9f..6fe5643 100644
--- a/src/resources/resetOutputStreamEntry.ui
+++ b/src/resources/resetOutputStreamEntry.ui
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Cambalache 0.16.0 -->
+<!-- Created with Cambalache 0.17.0 -->
 <interface>
   <requires lib="gtk" version="4.12"/>
   <template class="resetOutputStreamEntry" parent="GtkBox">
@@ -15,10 +15,11 @@
           <object class="GtkLabel" id="resetSourceName">
             <property name="label">text</property>
             <property name="margin-start">5</property>
+            <property name="wrap">True</property>
           </object>
         </child>
         <child>
-          <object class="GtkDropDown" id="resetSelectedSink">
+          <object class="GtkDropDown" id="resetSelectedSource">
             <property name="halign">end</property>
             <property name="hexpand">True</property>
             <property name="margin-end">5</property>
@@ -32,7 +33,7 @@
         <property name="margin-top">5</property>
         <child>
           <object class="GtkButton" id="resetSourceMute">
-            <property name="icon-name">audio-volume-high-symbolic</property>
+            <property name="icon-name">audio-input-microphone-symbolic</property>
             <property name="margin-end">5</property>
             <property name="valign">center</property>
           </object>
@@ -41,9 +42,9 @@
           <object class="GtkScale" id="resetVolumeSlider">
             <property name="adjustment">
               <object class="GtkAdjustment">
-                <property name="page-increment">655.36</property>
-                <property name="step-increment">2.0</property>
-                <property name="upper">65536.0</property>
+                <property name="page-increment">2005.4016</property>
+                <property name="step-increment">2005.4016</property>
+                <property name="upper">100270.08</property>
               </object>
             </property>
             <property name="hexpand">True</property>
diff --git a/src/resources/resetPopup.ui b/src/resources/resetPopup.ui
index d8dfb97..ea2b49c 100644
--- a/src/resources/resetPopup.ui
+++ b/src/resources/resetPopup.ui
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Cambalache 0.16.0 -->
+<!-- Created with Cambalache 0.17.0 -->
 <interface>
   <requires lib="gtk" version="4.12"/>
   <template class="resetPopup" parent="GtkPopover">
diff --git a/src/resources/resetSavedWifiEntry.ui b/src/resources/resetSavedWifiEntry.ui
index 20e4503..6fbdf98 100644
--- a/src/resources/resetSavedWifiEntry.ui
+++ b/src/resources/resetSavedWifiEntry.ui
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Cambalache 0.16.0 -->
+<!-- Created with Cambalache 0.17.0 -->
 <interface>
   <requires lib="gtk" version="4.12"/>
   <template class="resetSavedWifiEntry" parent="GtkBox">
diff --git a/src/resources/resetSettingBox.ui b/src/resources/resetSettingBox.ui
index 73af7c6..df8b1c9 100644
--- a/src/resources/resetSettingBox.ui
+++ b/src/resources/resetSettingBox.ui
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Cambalache 0.16.0 -->
+<!-- Created with Cambalache 0.17.0 -->
 <interface>
   <requires lib="gtk" version="4.0"/>
   <template class="resetSettingBox" parent="GtkBox">
diff --git a/src/resources/resetSidebarEntry.ui b/src/resources/resetSidebarEntry.ui
index 8ff15fd..9b39fe7 100644
--- a/src/resources/resetSidebarEntry.ui
+++ b/src/resources/resetSidebarEntry.ui
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Cambalache 0.16.0 -->
+<!-- Created with Cambalache 0.17.0 -->
 <interface>
   <requires lib="gtk" version="4.0"/>
   <template class="resetSidebarEntry" parent="GtkListBoxRow">
diff --git a/src/resources/resetSinkEntry.ui b/src/resources/resetSinkEntry.ui
index 342d287..9102f70 100644
--- a/src/resources/resetSinkEntry.ui
+++ b/src/resources/resetSinkEntry.ui
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Cambalache 0.16.0 -->
+<!-- Created with Cambalache 0.17.0 -->
 <interface>
   <requires lib="gtk" version="4.12"/>
-  <object class="GtkBox" id="resetSinkEntry">
+  <template class="resetSinkEntry" parent="GtkBox">
     <property name="margin-bottom">5</property>
     <property name="margin-end">5</property>
     <property name="margin-start">5</property>
@@ -15,6 +15,7 @@
           <object class="GtkLabel" id="resetSinkName">
             <property name="label">text</property>
             <property name="margin-start">5</property>
+            <property name="wrap">True</property>
           </object>
         </child>
         <child>
@@ -41,9 +42,9 @@
           <object class="GtkScale" id="resetVolumeSlider">
             <property name="adjustment">
               <object class="GtkAdjustment">
-                <property name="page-increment">655.36</property>
-                <property name="step-increment">65536.0</property>
-                <property name="upper">65536.0</property>
+                <property name="page-increment">2005.4016</property>
+                <property name="step-increment">2005.4016</property>
+                <property name="upper">100270.08</property>
               </object>
             </property>
             <property name="hexpand">True</property>
@@ -65,5 +66,5 @@
         <property name="margin-top">5</property>
       </object>
     </child>
-  </object>
+  </template>
 </interface>
diff --git a/src/resources/resetSourceEntry.ui b/src/resources/resetSourceEntry.ui
index 02646f9..8fa52a2 100644
--- a/src/resources/resetSourceEntry.ui
+++ b/src/resources/resetSourceEntry.ui
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Cambalache 0.16.0 -->
+<!-- Created with Cambalache 0.17.0 -->
 <interface>
   <requires lib="gtk" version="4.12"/>
-  <object class="GtkBox" id="resetSourceEntry">
+  <template class="resetSourceEntry" parent="GtkBox">
     <property name="margin-bottom">5</property>
     <property name="margin-end">5</property>
     <property name="margin-start">5</property>
@@ -15,6 +15,7 @@
           <object class="GtkLabel" id="resetSourceName">
             <property name="label">text</property>
             <property name="margin-start">5</property>
+            <property name="wrap">True</property>
           </object>
         </child>
         <child>
@@ -41,9 +42,9 @@
           <object class="GtkScale" id="resetVolumeSlider">
             <property name="adjustment">
               <object class="GtkAdjustment">
-                <property name="page-increment">655.36</property>
-                <property name="step-increment">65536.0</property>
-                <property name="upper">65536.0</property>
+                <property name="page-increment">2005.4016</property>
+                <property name="step-increment">2005.4016</property>
+                <property name="upper">100270.08</property>
               </object>
             </property>
             <property name="hexpand">True</property>
@@ -65,5 +66,5 @@
         <property name="margin-top">5</property>
       </object>
     </child>
-  </object>
+  </template>
 </interface>
diff --git a/src/resources/resetUI.cmb b/src/resources/resetUI.cmb
index ca48790..cad2615 100644
--- a/src/resources/resetUI.cmb
+++ b/src/resources/resetUI.cmb
@@ -11,13 +11,13 @@
 	(10,1,None,"resetBluetooth.ui",None,None,None,None,None,None,None),
 	(11,2,None,"resetBluetoothEntry.ui",None,None,None,None,None,None,None),
 	(12,11,None,"resetAudioInput.ui",None,None,None,None,None,None,None),
-	(13,11,None,"resetOutpuStreamEntry.ui",None,None,None,None,None,None,None),
+	(13,11,None,"resetOutputStreamEntry.ui",None,None,None,None,None,None,None),
 	(14,3,None,"resetSettingBox.ui",None,None,None,None,None,None,None),
 	(15,1,None,"resetListBoxRow.ui",None,None,None,None,None,None,None),
 	(16,6,None,"resetPopup.ui",None,None,None,None,None,None,None),
 	(17,1,None,"resetSavedWifiEntry.ui",None,None,None,None,None,None,None),
-	(18,None,None,"resetSinkEntry.ui",None,None,None,None,None,None,None),
-	(19,None,None,"resetSourceEntry.ui",None,None,None,None,None,None,None)
+	(18,1,None,"resetSinkEntry.ui",None,None,None,None,None,None,None),
+	(19,1,None,"resetSourceEntry.ui",None,None,None,None,None,None,None)
   </ui>
   <object>
 	(3,1,"AdwApplicationWindow","resetUI",None,None,None,None,-1,"  &lt;child&gt;\n    &lt;object id=\"resetSidebarBreakpoint\" class=\"AdwBreakpoint\"&gt;\n    &lt;/object&gt;\n  &lt;/child&gt;"),
@@ -125,7 +125,6 @@
 	(8,97,"GtkBox",None,93,None,None,None,None,None),
 	(8,98,"GtkButton","resetSinkMute",97,None,None,None,None,None),
 	(8,99,"GtkScale","resetVolumeSlider",97,None,None,None,1,None),
-	(8,100,"GtkAdjustment",None,99,None,None,None,None,None),
 	(8,101,"GtkLabel","resetVolumePercentage",97,None,None,None,2,None),
 	(8,102,"GtkProgressBar","resetVolumeMeter",93,None,None,None,1,None),
 	(8,103,"GtkSeparator",None,56,None,None,None,3,None),
@@ -134,6 +133,7 @@
 	(8,111,"GtkBox",None,110,None,None,None,None,None),
 	(8,112,"GtkLabel",None,111,None,None,None,None,None),
 	(8,113,"GtkImage",None,111,None,None,None,1,None),
+	(8,115,"GtkAdjustment",None,99,None,None,None,-1,None),
 	(10,1,"GtkBox","resetBluetooth",None,None,None,None,None,None),
 	(10,119,"AdwNavigationView",None,1,None,None,None,1,None),
 	(10,120,"AdwNavigationPage",None,119,None,None,None,None,None),
@@ -187,7 +187,6 @@
 	(12,23,"GtkBox",None,22,None,None,None,None,None),
 	(12,24,"GtkButton","resetSourceMute",23,None,None,None,None,None),
 	(12,25,"GtkScale","resetVolumeSlider",23,None,None,None,1,None),
-	(12,26,"GtkAdjustment",None,25,None,None,None,None,None),
 	(12,27,"GtkLabel","resetVolumePercentage",23,None,None,None,2,None),
 	(12,28,"GtkProgressBar","resetVolumeMeter",22,None,None,None,1,None),
 	(12,29,"GtkSeparator",None,15,None,None,None,2,None),
@@ -202,16 +201,17 @@
 	(12,47,"GtkImage",None,45,None,None,None,1,None),
 	(12,49,"GtkBox","resetSources",42,None,None,None,2,None),
 	(12,50,"GtkLabel",None,49,None,None,None,None,None),
-	(13,11,"GtkBox","resetOutpuStreamEntry",None,None,None,None,None,None),
+	(12,51,"GtkAdjustment",None,25,None,None,None,-1,None),
+	(13,11,"GtkBox","resetOutputStreamEntry",None,None,None,None,None,None),
 	(13,12,"GtkBox",None,11,None,None,None,None,None),
 	(13,13,"GtkLabel","resetSourceName",12,None,None,None,None,None),
 	(13,14,"GtkDropDown","resetSelectedSource",12,None,None,None,1,None),
 	(13,15,"GtkBox",None,11,None,None,None,1,None),
 	(13,16,"GtkButton","resetSourceMute",15,None,None,None,None,None),
 	(13,17,"GtkScale","resetVolumeSlider",15,None,None,None,1,None),
-	(13,18,"GtkAdjustment",None,17,None,None,None,None,None),
 	(13,19,"GtkLabel","resetVolumePercentage",15,None,None,None,2,None),
 	(13,20,"GtkProgressBar","resetVolumeMeter",11,None,None,None,2,None),
+	(13,21,"GtkAdjustment",None,17,None,None,None,-1,None),
 	(14,3,"GtkBox","resetSettingBox",None,None,None,None,-1,None),
 	(15,1,"GtkListBoxRow","resetListBoxRow",None,None,None,None,None,None),
 	(16,6,"GtkPopover","resetPopup",None,None,None,None,-1,None),
@@ -230,10 +230,10 @@
 	(18,5,"GtkBox",None,1,None,None,None,1,None),
 	(18,6,"GtkButton","resetSinkMute",5,None,None,None,None,None),
 	(18,7,"GtkScale","resetVolumeSlider",5,None,None,None,1,None),
-	(18,8,"GtkAdjustment",None,7,None,None,None,None,None),
 	(18,9,"GtkLabel","resetVolumePercentage",5,None,None,None,2,None),
 	(18,10,"GtkProgressBar","resetVolumeMeter",1,None,None,None,2,None),
 	(18,11,"GtkCheckButton","resetSelectedSink",2,None,None,None,1,None),
+	(18,12,"GtkAdjustment",None,7,None,None,None,-1,None),
 	(19,1,"GtkBox","resetSourceEntry",None,None,None,None,None,None),
 	(19,2,"GtkBox",None,1,None,None,None,None,None),
 	(19,3,"GtkLabel","resetSourceName",2,None,None,None,None,None),
@@ -241,9 +241,9 @@
 	(19,5,"GtkBox",None,1,None,None,None,1,None),
 	(19,6,"GtkButton","resetSourceMute",5,None,None,None,None,None),
 	(19,7,"GtkScale","resetVolumeSlider",5,None,None,None,1,None),
-	(19,8,"GtkAdjustment",None,7,None,None,None,None,None),
 	(19,9,"GtkLabel","resetVolumePercentage",5,None,None,None,2,None),
-	(19,10,"GtkProgressBar","resetVolumeMeter",1,None,None,None,2,None)
+	(19,10,"GtkProgressBar","resetVolumeMeter",1,None,None,None,2,None),
+	(19,12,"GtkAdjustment",None,7,None,None,None,-1,None)
   </object>
   <object_property>
 	(3,1,"GtkWidget","height-request","200",None,None,None,None,None,None,None,None,None),
@@ -430,6 +430,7 @@
 	(7,4,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
 	(7,5,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
 	(7,6,"GtkLabel","label","text",None,None,None,None,None,None,None,None,None),
+	(7,6,"GtkLabel","wrap","True",None,None,None,None,None,None,None,None,None),
 	(7,6,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
 	(7,8,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
 	(7,8,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
@@ -437,9 +438,9 @@
 	(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","655.36",None,None,None,None,None,None,None,None,None),
-	(7,10,"GtkAdjustment","step-increment","65536.0",None,None,None,None,None,None,None,None,None),
-	(7,10,"GtkAdjustment","upper","65536.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),
 	(7,11,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
 	(7,11,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
@@ -495,12 +496,10 @@
 	(8,98,"GtkButton","icon-name","audio-volume-high-symbolic",None,None,None,None,None,None,None,None,None),
 	(8,98,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
 	(8,98,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
-	(8,99,"GtkRange","adjustment",None,None,None,None,None,100,None,None,None,None),
+	(8,99,"GtkRange","adjustment",None,None,None,None,None,115,None,None,None,None),
 	(8,99,"GtkScale","value-pos","bottom",None,None,None,None,None,None,None,None,None),
 	(8,99,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
 	(8,99,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
-	(8,100,"GtkAdjustment","page-increment","5.0",None,None,None,None,None,None,None,None,None),
-	(8,100,"GtkAdjustment","upper","100.0",None,None,None,None,None,None,None,None,None),
 	(8,101,"GtkLabel","label","100%",None,None,None,None,None,None,None,None,None),
 	(8,101,"GtkLabel","lines","1",None,None,None,None,None,None,None,None,None),
 	(8,101,"GtkWidget","width-request","40",None,None,None,None,None,None,None,None,None),
@@ -519,6 +518,9 @@
 	(8,113,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
 	(8,113,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
 	(8,113,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(8,115,"GtkAdjustment","page-increment","2005.4016",None,None,None,None,None,None,None,None,None),
+	(8,115,"GtkAdjustment","step-increment","2005.4016",None,None,None,None,None,None,None,None,None),
+	(8,115,"GtkAdjustment","upper","100270.08",None,None,None,None,None,None,None,None,None),
 	(10,1,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(10,1,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
 	(10,120,"AdwNavigationPage","tag","main",None,None,None,None,None,None,None,None,None),
@@ -644,12 +646,10 @@
 	(12,24,"GtkButton","icon-name","audio-input-microphone-symbolic",None,None,None,None,None,None,None,None,None),
 	(12,24,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
 	(12,24,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
-	(12,25,"GtkRange","adjustment",None,None,None,None,None,26,None,None,None,None),
+	(12,25,"GtkRange","adjustment",None,None,None,None,None,51,None,None,None,None),
 	(12,25,"GtkScale","value-pos","bottom",None,None,None,None,None,None,None,None,None),
 	(12,25,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
 	(12,25,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
-	(12,26,"GtkAdjustment","page-increment","5.0",None,None,None,None,None,None,None,None,None),
-	(12,26,"GtkAdjustment","upper","100.0",None,None,None,None,None,None,None,None,None),
 	(12,27,"GtkLabel","label","100%",None,None,None,None,None,None,None,None,None),
 	(12,27,"GtkLabel","lines","1",None,None,None,None,None,None,None,None,None),
 	(12,27,"GtkWidget","width-request","40",None,None,None,None,None,None,None,None,None),
@@ -680,6 +680,9 @@
 	(12,49,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
 	(12,50,"GtkLabel","label","Input Devices",None,None,None,None,None,None,None,None,None),
 	(12,50,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
+	(12,51,"GtkAdjustment","page-increment","2005.4016",None,None,None,None,None,None,None,None,None),
+	(12,51,"GtkAdjustment","step-increment","2005.4016",None,None,None,None,None,None,None,None,None),
+	(12,51,"GtkAdjustment","upper","100270.08",None,None,None,None,None,None,None,None,None),
 	(13,11,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(13,11,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
 	(13,11,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
@@ -687,6 +690,7 @@
 	(13,11,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
 	(13,12,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
 	(13,13,"GtkLabel","label","text",None,None,None,None,None,None,None,None,None),
+	(13,13,"GtkLabel","wrap","True",None,None,None,None,None,None,None,None,None),
 	(13,13,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
 	(13,14,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
 	(13,14,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
@@ -696,16 +700,17 @@
 	(13,16,"GtkButton","icon-name","audio-input-microphone-symbolic",None,None,None,None,None,None,None,None,None),
 	(13,16,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
 	(13,16,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
-	(13,17,"GtkRange","adjustment",None,None,None,None,None,18,None,None,None,None),
+	(13,17,"GtkRange","adjustment",None,None,None,None,None,21,None,None,None,None),
 	(13,17,"GtkScale","value-pos","bottom",None,None,None,None,None,None,None,None,None),
 	(13,17,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
 	(13,17,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
-	(13,18,"GtkAdjustment","page-increment","5.0",None,None,None,None,None,None,None,None,None),
-	(13,18,"GtkAdjustment","upper","100.0",None,None,None,None,None,None,None,None,None),
 	(13,19,"GtkLabel","label","100%",None,None,None,None,None,None,None,None,None),
 	(13,19,"GtkLabel","lines","1",None,None,None,None,None,None,None,None,None),
 	(13,19,"GtkWidget","width-request","40",None,None,None,None,None,None,None,None,None),
 	(13,20,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
+	(13,21,"GtkAdjustment","page-increment","2005.4016",None,None,None,None,None,None,None,None,None),
+	(13,21,"GtkAdjustment","step-increment","2005.4016",None,None,None,None,None,None,None,None,None),
+	(13,21,"GtkAdjustment","upper","100270.08",None,None,None,None,None,None,None,None,None),
 	(14,3,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(14,3,"GtkWidget","halign","center",None,None,None,None,None,None,None,None,None),
 	(14,3,"GtkWidget","width-request","500",None,None,None,None,None,None,None,None,None),
@@ -741,19 +746,17 @@
 	(18,1,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
 	(18,2,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
 	(18,3,"GtkLabel","label","text",None,None,None,None,None,None,None,None,None),
+	(18,3,"GtkLabel","wrap","True",None,None,None,None,None,None,None,None,None),
 	(18,3,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
 	(18,5,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
 	(18,5,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
 	(18,6,"GtkButton","icon-name","audio-volume-high-symbolic",None,None,None,None,None,None,None,None,None),
 	(18,6,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
 	(18,6,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
-	(18,7,"GtkRange","adjustment",None,None,None,None,None,8,None,None,None,None),
+	(18,7,"GtkRange","adjustment",None,None,None,None,None,12,None,None,None,None),
 	(18,7,"GtkScale","value-pos","bottom",None,None,None,None,None,None,None,None,None),
 	(18,7,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
 	(18,7,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
-	(18,8,"GtkAdjustment","page-increment","655.36",None,None,None,None,None,None,None,None,None),
-	(18,8,"GtkAdjustment","step-increment","65536.0",None,None,None,None,None,None,None,None,None),
-	(18,8,"GtkAdjustment","upper","65536.0",None,None,None,None,None,None,None,None,None),
 	(18,9,"GtkLabel","label","100%",None,None,None,None,None,None,None,None,None),
 	(18,9,"GtkLabel","lines","1",None,None,None,None,None,None,None,None,None),
 	(18,9,"GtkWidget","width-request","40",None,None,None,None,None,None,None,None,None),
@@ -761,6 +764,9 @@
 	(18,11,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
 	(18,11,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
 	(18,11,"GtkWidget","hexpand-set","True",None,None,None,None,None,None,None,None,None),
+	(18,12,"GtkAdjustment","page-increment","2005.4016",None,None,None,None,None,None,None,None,None),
+	(18,12,"GtkAdjustment","step-increment","2005.4016",None,None,None,None,None,None,None,None,None),
+	(18,12,"GtkAdjustment","upper","100270.08",None,None,None,None,None,None,None,None,None),
 	(19,1,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(19,1,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
 	(19,1,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
@@ -768,6 +774,7 @@
 	(19,1,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
 	(19,2,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
 	(19,3,"GtkLabel","label","text",None,None,None,None,None,None,None,None,None),
+	(19,3,"GtkLabel","wrap","True",None,None,None,None,None,None,None,None,None),
 	(19,3,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
 	(19,4,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
 	(19,4,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
@@ -777,17 +784,17 @@
 	(19,6,"GtkButton","icon-name","microphone-sensitivity-high-symbolic",None,None,None,None,None,None,None,None,None),
 	(19,6,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
 	(19,6,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
-	(19,7,"GtkRange","adjustment",None,None,None,None,None,8,None,None,None,None),
+	(19,7,"GtkRange","adjustment",None,None,None,None,None,12,None,None,None,None),
 	(19,7,"GtkScale","value-pos","bottom",None,None,None,None,None,None,None,None,None),
 	(19,7,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
 	(19,7,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
-	(19,8,"GtkAdjustment","page-increment","655.36",None,None,None,None,None,None,None,None,None),
-	(19,8,"GtkAdjustment","step-increment","65536.0",None,None,None,None,None,None,None,None,None),
-	(19,8,"GtkAdjustment","upper","65536.0",None,None,None,None,None,None,None,None,None),
 	(19,9,"GtkLabel","label","100%",None,None,None,None,None,None,None,None,None),
 	(19,9,"GtkLabel","lines","1",None,None,None,None,None,None,None,None,None),
 	(19,9,"GtkWidget","width-request","40",None,None,None,None,None,None,None,None,None),
-	(19,10,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None)
+	(19,10,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
+	(19,12,"GtkAdjustment","page-increment","2005.4016",None,None,None,None,None,None,None,None,None),
+	(19,12,"GtkAdjustment","step-increment","2005.4016",None,None,None,None,None,None,None,None,None),
+	(19,12,"GtkAdjustment","upper","100270.08",None,None,None,None,None,None,None,None,None)
   </object_property>
   <object_data>
 	(3,42,"GtkWidget",1,1,None,None,None,None,None,None),
diff --git a/src/resources/resetWiFi.ui b/src/resources/resetWiFi.ui
index 78c4655..227b0ae 100644
--- a/src/resources/resetWiFi.ui
+++ b/src/resources/resetWiFi.ui
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Cambalache 0.16.0 -->
+<!-- Created with Cambalache 0.17.0 -->
 <interface>
   <requires lib="gtk" version="4.6"/>
   <requires lib="libadwaita" version="1.4"/>
diff --git a/src/resources/resetWifiEntry.ui b/src/resources/resetWifiEntry.ui
index c76bad2..6f9880c 100644
--- a/src/resources/resetWifiEntry.ui
+++ b/src/resources/resetWifiEntry.ui
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Cambalache 0.16.0 -->
+<!-- Created with Cambalache 0.17.0 -->
 <interface>
   <requires lib="gtk" version="4.12"/>
   <template class="resetWifiEntry" parent="GtkBox">
diff --git a/src/resources/resources.gresource.xml b/src/resources/resources.gresource.xml
index 007651e..c20e7f1 100644
--- a/src/resources/resources.gresource.xml
+++ b/src/resources/resources.gresource.xml
@@ -15,6 +15,7 @@
     <file compressed="true" preprocess="xml-stripblanks">resetAudioInput.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">resetInputStreamEntry.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">resetSinkEntry.ui</file>
+    <file compressed="true" preprocess="xml-stripblanks">resetSourceEntry.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">resetPopup.ui</file>
   </gresource>
 </gresources>

From dbcf2ab6357993e361daa5706d300c1d301c21e0 Mon Sep 17 00:00:00 2001
From: Fabio Lenherr / DashieTM <fabio.lenherr@gmail.com>
Date: Tue, 14 Nov 2023 22:41:00 +0100
Subject: [PATCH 3/4] fix: Improve performance by passing smaller datatypes to
 dbus

---
 src/components/input/outputStreamEntry.rs | 52 +++++++++++++++++----
 src/components/input/sourceBox.rs         | 30 ++++++++++--
 src/components/input/sourceEntry.rs       | 48 +++++++++++++++----
 src/components/output/inputStreamEntry.rs | 57 +++++++++++++++++++----
 src/components/output/sinkBox.rs          | 29 ++++++++++--
 src/components/output/sinkEntry.rs        | 48 +++++++++++++++----
 6 files changed, 223 insertions(+), 41 deletions(-)

diff --git a/src/components/input/outputStreamEntry.rs b/src/components/input/outputStreamEntry.rs
index dc7599d..4160f97 100644
--- a/src/components/input/outputStreamEntry.rs
+++ b/src/components/input/outputStreamEntry.rs
@@ -4,12 +4,12 @@ use std::time::Duration;
 
 use adw::glib;
 use adw::glib::Object;
-use adw::prelude::RangeExt;
+use adw::prelude::{ButtonExt, RangeExt};
 use dbus::blocking::Connection;
 use dbus::Error;
-use ReSet_Lib::audio::audio::OutputStream;
-use glib::{clone, Propagation};
 use glib::subclass::types::ObjectSubclassIsExt;
+use glib::{clone, Propagation};
+use ReSet_Lib::audio::audio::OutputStream;
 
 use super::outputStreamEntryImpl;
 
@@ -40,21 +40,53 @@ impl OutputStreamEntry {
                     let fraction = (value / 655.36).round();
                     let percentage = (fraction).to_string() + "%";
                     imp.resetVolumePercentage.set_text(&percentage);
-                    set_outputstream_volume(value, imp.stream.clone());
+                    let stream = imp.stream.borrow();
+                    let index = stream.index;
+                    let channels = stream.channels;
+                    set_outputstream_volume(value, index, channels);
                     Propagation::Proceed
                 }),
             );
+            imp.resetSourceMute
+                .connect_clicked(clone!(@weak imp => move |_| {
+                    let stream = imp.stream.clone();
+                    let mut stream = stream.borrow_mut();
+                    stream.muted = !stream.muted;
+                    let muted = stream.muted;
+                    let index = stream.index;
+                    if muted {
+                        imp.resetSourceMute
+                           .set_icon_name("audio-volume-muted-symbolic");
+                    } else {
+                        imp.resetSourceMute
+                           .set_icon_name("audio-volume-high-symbolic");
+                    }
+                    toggle_output_stream_mute(index, muted);
+                }));
         }
         obj
     }
 }
 
-fn set_outputstream_volume(value: f64, stream: Arc<RefCell<OutputStream>>) -> bool {
-    let mut stream = stream.borrow_mut().clone();
-    // let x = stream.volume.iter_mut().map(|_| value as u32);
-    stream.volume = vec![value as u32; stream.channels as usize];
-    dbg!(stream.volume.clone());
+fn set_outputstream_volume(value: f64, index: u32, channels: u16) -> bool {
+    let conn = Connection::new_session().unwrap();
+    let proxy = conn.with_proxy(
+        "org.xetibo.ReSet",
+        "/org/xetibo/ReSet",
+        Duration::from_millis(1000),
+    );
+    let res: Result<(bool,), Error> = proxy.method_call(
+        "org.xetibo.ReSet",
+        "SetOutputStreamVolume",
+        (index, channels, value as u32),
+    );
+    if res.is_err() {
+        return false;
+    }
+    res.unwrap().0
+}
 
+fn toggle_output_stream_mute(index: u32, muted: bool) -> bool {
     let conn = Connection::new_session().unwrap();
     let proxy = conn.with_proxy(
         "org.xetibo.ReSet",
@@ -62,7 +94,7 @@ fn set_outputstream_volume(value: f64, stream: Arc<RefCell<OutputStream>>) -> bo
         Duration::from_millis(1000),
     );
     let res: Result<(bool,), Error> =
-        proxy.method_call("org.xetibo.ReSet", "SetOutputStreamVolume", (stream,));
+        proxy.method_call("org.xetibo.ReSet", "SetOutputStreamMute", (index, muted));
     if res.is_err() {
         return false;
     }
diff --git a/src/components/input/sourceBox.rs b/src/components/input/sourceBox.rs
index e5e9d44..e64ab96 100644
--- a/src/components/input/sourceBox.rs
+++ b/src/components/input/sourceBox.rs
@@ -7,7 +7,7 @@ use crate::components::input::sourceBoxImpl;
 use crate::components::input::sourceEntry::set_source_volume;
 use adw::glib;
 use adw::glib::Object;
-use adw::prelude::{BoxExt, ListBoxRowExt, RangeExt};
+use adw::prelude::{BoxExt, ButtonExt, ListBoxRowExt, RangeExt};
 use dbus::blocking::Connection;
 use dbus::Error;
 use glib::subclass::prelude::ObjectSubclassIsExt;
@@ -17,7 +17,7 @@ use gtk::prelude::ActionableExt;
 use ReSet_Lib::audio::audio::{OutputStream, Source};
 
 use super::outputStreamEntry::OutputStreamEntry;
-use super::sourceEntry::SourceEntry;
+use super::sourceEntry::{toggle_source_mute, SourceEntry};
 
 glib::wrapper! {
     pub struct SourceBox(ObjectSubclass<sourceBoxImpl::SourceBox>)
@@ -59,6 +59,7 @@ pub fn populate_sources(output_box: Arc<SourceBox>) {
             glib::idle_add_once(move || {
                 // TODO handle default mapping
                 let output_box_ref_slider = output_box.clone();
+                let output_box_ref_mute = output_box.clone();
                 let output_box_ref = output_box.clone();
                 {
                     let output_box_imp = output_box_ref.imp();
@@ -85,9 +86,32 @@ pub fn populate_sources(output_box: Arc<SourceBox>) {
                         println!("{fraction}");
                         let percentage = (fraction).to_string() + "%";
                         imp.resetVolumePercentage.set_text(&percentage);
-                        set_source_volume(value, imp.resetDefaultSource.clone());
+                        let source = imp.resetDefaultSource.borrow();
+                        let index = source.index;
+                        let channels = source.channels;
+                        set_source_volume(value, index, channels);
                         Propagation::Proceed
                     });
+
+                output_box_ref
+                    .imp()
+                    .resetSourceMute
+                    .connect_clicked(move |_| {
+                        let imp = output_box_ref_mute.imp();
+                        let stream = imp.resetDefaultSource.clone();
+                        let mut stream = stream.borrow_mut();
+                        stream.muted = !stream.muted;
+                        let muted = stream.muted;
+                        let index = stream.index;
+                        if muted {
+                            imp.resetSourceMute
+                                .set_icon_name("audio-volume-muted-symbolic");
+                        } else {
+                            imp.resetSourceMute
+                                .set_icon_name("audio-volume-high-symbolic");
+                        }
+                        toggle_source_mute(index, muted);
+                    });
             });
         });
     });
diff --git a/src/components/input/sourceEntry.rs b/src/components/input/sourceEntry.rs
index 1a1bfb3..7b27e2b 100644
--- a/src/components/input/sourceEntry.rs
+++ b/src/components/input/sourceEntry.rs
@@ -4,7 +4,7 @@ use std::time::Duration;
 
 use adw::glib;
 use adw::glib::Object;
-use adw::prelude::RangeExt;
+use adw::prelude::{ButtonExt, RangeExt};
 use dbus::blocking::Connection;
 use dbus::Error;
 use glib::subclass::types::ObjectSubclassIsExt;
@@ -42,21 +42,53 @@ impl SourceEntry {
                     println!("{fraction}");
                     let percentage = (fraction).to_string() + "%";
                     imp.resetVolumePercentage.set_text(&percentage);
-                    set_source_volume(value, imp.stream.clone());
+                    let source = imp.stream.borrow();
+                    let index = source.index;
+                    let channels = source.channels;
+                    set_source_volume(value, index, channels);
                     Propagation::Proceed
                 }),
             );
+            imp.resetSourceMute
+                .connect_clicked(clone!(@weak imp => move |_| {
+                    let stream = imp.stream.clone();
+                    let mut stream = stream.borrow_mut();
+                    stream.muted = !stream.muted;
+                    let muted = stream.muted;
+                    let index = stream.index;
+                    if muted {
+                        imp.resetSourceMute
+                           .set_icon_name("audio-volume-muted-symbolic");
+                    } else {
+                        imp.resetSourceMute
+                           .set_icon_name("audio-volume-high-symbolic");
+                    }
+                    toggle_source_mute(index, muted);
+                }));
         }
         obj
     }
 }
 
-pub fn set_source_volume(value: f64, stream: Arc<RefCell<Source>>) -> bool {
-    let mut stream = stream.borrow_mut().clone();
-    // let x = stream.volume.iter_mut().map(|_| value as u32);
-    stream.volume = vec![value as u32; stream.channels as usize];
-    dbg!(stream.volume.clone());
+pub fn set_source_volume(value: f64, index: u32, channels: u16) -> bool {
+    let conn = Connection::new_session().unwrap();
+    let proxy = conn.with_proxy(
+        "org.xetibo.ReSet",
+        "/org/xetibo/ReSet",
+        Duration::from_millis(1000),
+    );
+    let res: Result<(bool,), Error> = proxy.method_call(
+        "org.xetibo.ReSet",
+        "SetSourceVolume",
+        (index, channels, value as u32),
+    );
+    if res.is_err() {
+        return false;
+    }
+    res.unwrap().0
+}
 
+pub fn toggle_source_mute(index: u32, muted: bool) -> bool {
     let conn = Connection::new_session().unwrap();
     let proxy = conn.with_proxy(
         "org.xetibo.ReSet",
@@ -64,7 +96,7 @@ pub fn set_source_volume(value: f64, stream: Arc<RefCell<Source>>) -> bool {
         Duration::from_millis(1000),
     );
     let res: Result<(bool,), Error> =
-        proxy.method_call("org.xetibo.ReSet", "SetSourceVolume", (stream,));
+        proxy.method_call("org.xetibo.ReSet", "SetSourceMute", (index, muted));
     if res.is_err() {
         return false;
     }
diff --git a/src/components/output/inputStreamEntry.rs b/src/components/output/inputStreamEntry.rs
index 67aeb77..01917d9 100644
--- a/src/components/output/inputStreamEntry.rs
+++ b/src/components/output/inputStreamEntry.rs
@@ -4,10 +4,11 @@ use std::time::Duration;
 
 use adw::glib;
 use adw::glib::Object;
-use adw::prelude::RangeExt;
+use adw::prelude::{ButtonExt, RangeExt};
 use dbus::blocking::Connection;
 use dbus::Error;
 use glib::subclass::types::ObjectSubclassIsExt;
+use glib::subclass::ObjectImplRef;
 use glib::{clone, Propagation};
 use ReSet_Lib::audio::audio::InputStream;
 
@@ -23,10 +24,16 @@ impl InputStreamEntry {
     pub fn new(stream: InputStream) -> Self {
         let obj: Self = Object::builder().build();
         // TODO use event callback for progress bar -> this is the "im speaking" indicator
-        // TODO map mute to callback
         // TODO map dropdown
         {
             let imp = obj.imp();
+            if stream.muted {
+                imp.resetSinkMute
+                    .set_icon_name("audio-volume-muted-symbolic");
+            } else {
+                imp.resetSinkMute
+                    .set_icon_name("audio-volume-high-symbolic");
+            }
             let name = stream.application_name.clone() + ": " + stream.name.as_str();
             imp.resetSinkName.set_text(name.as_str());
             let volume = stream.volume.first().unwrap_or_else(|| &(0 as u32));
@@ -40,21 +47,53 @@ impl InputStreamEntry {
                     let fraction = (value / 655.36).round();
                     let percentage = (fraction).to_string() + "%";
                     imp.resetVolumePercentage.set_text(&percentage);
-                    set_inputstream_volume(value, imp.stream.clone());
+                    let stream = imp.stream.borrow();
+                    let index = stream.index;
+                    let channels = stream.channels;
+                    set_inputstream_volume(value, index, channels);
                     Propagation::Proceed
                 }),
             );
+            imp.resetSinkMute
+                .connect_clicked(clone!(@weak imp => move |_| {
+                    let stream = imp.stream.clone();
+                    let mut stream = stream.borrow_mut();
+                    stream.muted = !stream.muted;
+                    let muted = stream.muted;
+                    let index = stream.index;
+                    if muted {
+                        imp.resetSinkMute
+                           .set_icon_name("audio-volume-muted-symbolic");
+                    } else {
+                        imp.resetSinkMute
+                           .set_icon_name("audio-volume-high-symbolic");
+                    }
+                    toggle_input_stream_mute(index, muted);
+                }));
         }
         obj
     }
 }
 
-fn set_inputstream_volume(value: f64, stream: Arc<RefCell<InputStream>>) -> bool {
-    let mut stream = stream.borrow_mut().clone();
-    // let x = stream.volume.iter_mut().map(|_| value as u32);
-    stream.volume = vec![value as u32; stream.channels as usize];
-    dbg!(stream.volume.clone());
+fn set_inputstream_volume(value: f64, index: u32, channels: u16) -> bool {
+    let conn = Connection::new_session().unwrap();
+    let proxy = conn.with_proxy(
+        "org.xetibo.ReSet",
+        "/org/xetibo/ReSet",
+        Duration::from_millis(1000),
+    );
+    let res: Result<(bool,), Error> = proxy.method_call(
+        "org.xetibo.ReSet",
+        "SetInputStreamVolume",
+        (index, channels, value as u32),
+    );
+    if res.is_err() {
+        return false;
+    }
+    res.unwrap().0
+}
 
+fn toggle_input_stream_mute(index: u32, muted: bool) -> bool {
     let conn = Connection::new_session().unwrap();
     let proxy = conn.with_proxy(
         "org.xetibo.ReSet",
@@ -62,7 +101,7 @@ fn set_inputstream_volume(value: f64, stream: Arc<RefCell<InputStream>>) -> bool
         Duration::from_millis(1000),
     );
     let res: Result<(bool,), Error> =
-        proxy.method_call("org.xetibo.ReSet", "SetInputStreamVolume", (stream,));
+        proxy.method_call("org.xetibo.ReSet", "SetInputStreamMute", (index, muted));
     if res.is_err() {
         return false;
     }
diff --git a/src/components/output/sinkBox.rs b/src/components/output/sinkBox.rs
index 38ab7b1..8df1c28 100644
--- a/src/components/output/sinkBox.rs
+++ b/src/components/output/sinkBox.rs
@@ -5,7 +5,7 @@ use crate::components::base::listEntry::ListEntry;
 use crate::components::base::utils::Listeners;
 use crate::components::output::sinkEntry::set_sink_volume;
 use adw::glib::Object;
-use adw::prelude::{BoxExt, RangeExt};
+use adw::prelude::{BoxExt, ButtonExt, RangeExt};
 use adw::{glib, prelude::ListBoxRowExt};
 use dbus::blocking::Connection;
 use dbus::Error;
@@ -17,7 +17,7 @@ use ReSet_Lib::audio::audio::{InputStream, Sink};
 
 use super::inputStreamEntry::InputStreamEntry;
 use super::sinkBoxImpl;
-use super::sinkEntry::SinkEntry;
+use super::sinkEntry::{toggle_sink_mute, SinkEntry};
 
 glib::wrapper! {
     pub struct SinkBox(ObjectSubclass<sinkBoxImpl::SinkBox>)
@@ -60,6 +60,7 @@ pub fn populate_sinks(output_box: Arc<SinkBox>) {
             glib::idle_add_once(move || {
                 // TODO handle default mapping
                 let output_box_ref_slider = output_box.clone();
+                let output_box_ref_mute = output_box.clone();
                 {
                     let output_box_imp = output_box_ref.imp();
                     let default_sink = output_box_imp.resetDefaultSink.clone(); // Clone outside closure
@@ -86,9 +87,31 @@ pub fn populate_sinks(output_box: Arc<SinkBox>) {
                         println!("{fraction}");
                         let percentage = (fraction).to_string() + "%";
                         imp.resetVolumePercentage.set_text(&percentage);
-                        set_sink_volume(value, imp.resetDefaultSink.clone());
+                        let sink = imp.resetDefaultSink.borrow();
+                        let index = sink.index;
+                        let channels = sink.channels;
+                        set_sink_volume(value, index, channels);
                         Propagation::Proceed
                     });
+                output_box_ref
+                    .imp()
+                    .resetSinkMute
+                    .connect_clicked(move |_| {
+                        let imp = output_box_ref_mute.imp();
+                        let stream = imp.resetDefaultSink.clone();
+                        let mut stream = stream.borrow_mut();
+                        stream.muted = !stream.muted;
+                        let muted = stream.muted;
+                        let index = stream.index;
+                        if muted {
+                            imp.resetSinkMute
+                                .set_icon_name("audio-volume-muted-symbolic");
+                        } else {
+                            imp.resetSinkMute
+                                .set_icon_name("audio-volume-high-symbolic");
+                        }
+                        toggle_sink_mute(index, muted);
+                    });
             });
         });
     });
diff --git a/src/components/output/sinkEntry.rs b/src/components/output/sinkEntry.rs
index 7c5f478..b323319 100644
--- a/src/components/output/sinkEntry.rs
+++ b/src/components/output/sinkEntry.rs
@@ -4,7 +4,7 @@ use std::time::Duration;
 
 use adw::glib;
 use adw::glib::Object;
-use adw::prelude::RangeExt;
+use adw::prelude::{ButtonExt, RangeExt};
 use dbus::blocking::Connection;
 use dbus::Error;
 use glib::subclass::types::ObjectSubclassIsExt;
@@ -42,21 +42,53 @@ impl SinkEntry {
                     println!("{fraction}");
                     let percentage = (fraction).to_string() + "%";
                     imp.resetVolumePercentage.set_text(&percentage);
-                    set_sink_volume(value, imp.stream.clone());
+                     let sink = imp.stream.borrow();
+                     let index = sink.index;
+                     let channels = sink.channels;
+                     set_sink_volume(value, index, channels);
                     Propagation::Proceed
                 }),
             );
+            imp.resetSinkMute
+                .connect_clicked(clone!(@weak imp => move |_| {
+                    let stream = imp.stream.clone();
+                    let mut stream = stream.borrow_mut();
+                    stream.muted = !stream.muted;
+                    let muted = stream.muted;
+                    let index = stream.index;
+                    if muted {
+                        imp.resetSinkMute
+                           .set_icon_name("audio-volume-muted-symbolic");
+                    } else {
+                        imp.resetSinkMute
+                           .set_icon_name("audio-volume-high-symbolic");
+                    }
+                    toggle_sink_mute(index, muted);
+                }));
         }
         obj
     }
 }
 
-pub fn set_sink_volume(value: f64, stream: Arc<RefCell<Sink>>) -> bool {
-    let mut stream = stream.borrow_mut().clone();
-    // let x = stream.volume.iter_mut().map(|_| value as u32);
-    stream.volume = vec![value as u32; stream.channels as usize];
-    dbg!(stream.volume.clone());
+pub fn set_sink_volume(value: f64, index: u32, channels: u16) -> bool {
+    let conn = Connection::new_session().unwrap();
+    let proxy = conn.with_proxy(
+        "org.xetibo.ReSet",
+        "/org/xetibo/ReSet",
+        Duration::from_millis(1000),
+    );
+    let res: Result<(bool,), Error> = proxy.method_call(
+        "org.xetibo.ReSet",
+        "SetSinkVolume",
+        (index, channels, value as u32),
+    );
+    if res.is_err() {
+        return false;
+    }
+    res.unwrap().0
+}
 
+pub fn toggle_sink_mute(index: u32, muted: bool) -> bool {
     let conn = Connection::new_session().unwrap();
     let proxy = conn.with_proxy(
         "org.xetibo.ReSet",
@@ -64,7 +96,7 @@ pub fn set_sink_volume(value: f64, stream: Arc<RefCell<Sink>>) -> bool {
         Duration::from_millis(1000),
     );
     let res: Result<(bool,), Error> =
-        proxy.method_call("org.xetibo.ReSet", "SetSinkVolume", (stream,));
+        proxy.method_call("org.xetibo.ReSet", "SetSinkMute", (index, muted));
     if res.is_err() {
         return false;
     }

From c619284146aa68f44018166efd69490635d8ffb9 Mon Sep 17 00:00:00 2001
From: Fabio Lenherr / DashieTM <fabio.lenherr@gmail.com>
Date: Wed, 15 Nov 2023 02:35:20 +0100
Subject: [PATCH 4/4] feat: Add default Sink and Source Switching

---
 src/components/input/sourceBox.rs     |  6 +++-
 src/components/input/sourceBoxImpl.rs |  3 +-
 src/components/input/sourceEntry.rs   | 36 +++++++++++++++++++++--
 src/components/output/sinkBox.rs      |  6 +++-
 src/components/output/sinkBoxImpl.rs  |  3 +-
 src/components/output/sinkEntry.rs    | 41 +++++++++++++++++++++++----
 6 files changed, 83 insertions(+), 12 deletions(-)

diff --git a/src/components/input/sourceBox.rs b/src/components/input/sourceBox.rs
index e64ab96..4fd1ff4 100644
--- a/src/components/input/sourceBox.rs
+++ b/src/components/input/sourceBox.rs
@@ -72,7 +72,11 @@ pub fn populate_sources(output_box: Arc<SourceBox>) {
                     output_box_imp.resetVolumePercentage.set_text(&percentage);
                     output_box_imp.resetVolumeSlider.set_value(*volume as f64);
                     for stream in sinks {
-                        let entry = ListEntry::new(&SourceEntry::new(stream));
+                        let mut is_default = false;
+                        if output_box_imp.resetDefaultSource.borrow().name == stream.name {
+                            is_default = true;
+                        }
+                        let entry = ListEntry::new(&SourceEntry::new(is_default, output_box_imp.resetDefaultCheckButton.clone(), stream));
                         entry.set_activatable(false);
                         output_box_imp.resetSources.append(&entry);
                     }
diff --git a/src/components/input/sourceBoxImpl.rs b/src/components/input/sourceBoxImpl.rs
index 6e7ba7a..d127965 100644
--- a/src/components/input/sourceBoxImpl.rs
+++ b/src/components/input/sourceBoxImpl.rs
@@ -4,7 +4,7 @@ use std::sync::{Arc, Mutex};
 use crate::components::base::listEntry::ListEntry;
 use crate::components::input::sourceBox;
 use gtk::subclass::prelude::*;
-use gtk::{glib, CompositeTemplate, DropDown, TemplateChild};
+use gtk::{glib, CompositeTemplate, DropDown, TemplateChild, CheckButton};
 use gtk::{prelude::*, Button, Label, ProgressBar, Scale};
 use ReSet_Lib::audio::audio::{OutputStream, Source};
 
@@ -33,6 +33,7 @@ pub struct SourceBox {
     pub resetOutputStreamButton: TemplateChild<ListEntry>,
     #[template_child]
     pub resetOutputStreams: TemplateChild<gtk::Box>,
+    pub resetDefaultCheckButton: Arc<CheckButton>,
     pub resetDefaultSource: Arc<RefCell<Source>>,
     pub resetSourceList: Arc<Mutex<Vec<Source>>>,
     pub resetOutputStreamList: Arc<Mutex<Vec<OutputStream>>>,
diff --git a/src/components/input/sourceEntry.rs b/src/components/input/sourceEntry.rs
index 7b27e2b..d7d668a 100644
--- a/src/components/input/sourceEntry.rs
+++ b/src/components/input/sourceEntry.rs
@@ -1,15 +1,17 @@
 use std::cell::RefCell;
 use std::sync::Arc;
+use std::thread;
 use std::time::Duration;
 
 use adw::glib;
 use adw::glib::Object;
-use adw::prelude::{ButtonExt, RangeExt};
+use adw::prelude::{ButtonExt, RangeExt, CheckButtonExt};
 use dbus::blocking::Connection;
 use dbus::Error;
 use glib::subclass::types::ObjectSubclassIsExt;
 use glib::{clone, Propagation};
 use ReSet_Lib::audio::audio::Source;
+use gtk::CheckButton;
 
 use super::sourceEntryImpl;
 
@@ -20,7 +22,7 @@ glib::wrapper! {
 }
 
 impl SourceEntry {
-    pub fn new(stream: Source) -> Self {
+    pub fn new(is_default: bool, check_group: Arc<CheckButton>, stream: Source) -> Self {
         let obj: Self = Object::builder().build();
         // TODO use event callback for progress bar -> this is the "im speaking" indicator
         // TODO map the slider to volume
@@ -30,6 +32,7 @@ impl SourceEntry {
         {
             let imp = obj.imp();
             imp.resetSourceName.set_text(stream.name.clone().as_str());
+            let name = Arc::new(stream.name.clone());
             let volume = stream.volume.first().unwrap_or_else(|| &(0 as u32));
             let fraction = (*volume as f64 / 655.36).round();
             let percentage = (fraction).to_string() + "%";
@@ -49,6 +52,18 @@ impl SourceEntry {
                     Propagation::Proceed
                 }),
             );
+            imp.resetSelectedSource.set_group(Some(&*check_group));
+            // check_group.set_group(Some(&*imp.resetSelectedSink));
+            if is_default {
+                imp.resetSelectedSource.set_active(true);
+            } else {
+                imp.resetSelectedSource.set_active(false);
+            }
+            imp.resetSelectedSource.connect_toggled(move |button| {
+                if button.is_active() {
+                    set_default_source(name.clone());
+                }
+            });
             imp.resetSourceMute
                 .connect_clicked(clone!(@weak imp => move |_| {
                     let stream = imp.stream.clone();
@@ -102,3 +117,20 @@ pub fn toggle_source_mute(index: u32, muted: bool) -> bool {
     }
     res.unwrap().0
 }
+
+pub fn set_default_source(name: Arc<String>) {
+    thread::spawn(move || {
+        let conn = Connection::new_session().unwrap();
+        let proxy = conn.with_proxy(
+            "org.xetibo.ReSet",
+            "/org/xetibo/ReSet",
+            Duration::from_millis(1000),
+        );
+        let res: Result<(bool,), Error> =
+            proxy.method_call("org.xetibo.ReSet", "SetDefaultSink", (name.as_str(),));
+        if res.is_err() {
+            return;
+        }
+        // handle change
+    });
+}
diff --git a/src/components/output/sinkBox.rs b/src/components/output/sinkBox.rs
index 8df1c28..e47e2f7 100644
--- a/src/components/output/sinkBox.rs
+++ b/src/components/output/sinkBox.rs
@@ -73,7 +73,11 @@ pub fn populate_sinks(output_box: Arc<SinkBox>) {
                     output_box_imp.resetVolumeSlider.set_value(*volume as f64);
                     for stream in sinks {
                         // TODO create sink handler -> currently only allows input streams
-                        let entry = ListEntry::new(&SinkEntry::new(stream));
+                        let mut is_default = false;
+                        if output_box_imp.resetDefaultSink.borrow().name == stream.name {
+                            is_default = true;
+                        }
+                        let entry = ListEntry::new(&SinkEntry::new(is_default, output_box_imp.resetDefaultCheckButton.clone(), stream));
                         entry.set_activatable(false);
                         output_box_imp.resetSinks.append(&entry);
                     }
diff --git a/src/components/output/sinkBoxImpl.rs b/src/components/output/sinkBoxImpl.rs
index f8c79ca..3b6eac7 100644
--- a/src/components/output/sinkBoxImpl.rs
+++ b/src/components/output/sinkBoxImpl.rs
@@ -4,7 +4,7 @@ use std::sync::{Arc, Mutex};
 use crate::components::base::listEntry::ListEntry;
 use crate::components::output::inputStreamEntry::InputStreamEntry;
 use gtk::subclass::prelude::*;
-use gtk::{glib, Box, Button, CompositeTemplate, DropDown, Label, TemplateChild};
+use gtk::{glib, Box, Button, CompositeTemplate, DropDown, Label, TemplateChild, CheckButton};
 use gtk::{prelude::*, ProgressBar, Scale};
 use ReSet_Lib::audio::audio::{InputStream, Sink};
 
@@ -33,6 +33,7 @@ pub struct SinkBox {
     pub resetInputStreamButton: TemplateChild<ListEntry>,
     #[template_child]
     pub resetInputStreams: TemplateChild<Box>,
+    pub resetDefaultCheckButton: Arc<CheckButton>,
     pub resetDefaultSink: Arc<RefCell<Sink>>,
     pub resetSinkList: Arc<Mutex<Vec<Sink>>>,
     pub resetInputStreamList: Arc<Mutex<Vec<InputStream>>>,
diff --git a/src/components/output/sinkEntry.rs b/src/components/output/sinkEntry.rs
index b323319..4563c8f 100644
--- a/src/components/output/sinkEntry.rs
+++ b/src/components/output/sinkEntry.rs
@@ -1,14 +1,15 @@
-use std::cell::RefCell;
 use std::sync::Arc;
+use std::thread;
 use std::time::Duration;
 
 use adw::glib;
 use adw::glib::Object;
-use adw::prelude::{ButtonExt, RangeExt};
+use adw::prelude::{ButtonExt, CheckButtonExt, RangeExt};
 use dbus::blocking::Connection;
 use dbus::Error;
 use glib::subclass::types::ObjectSubclassIsExt;
 use glib::{clone, Propagation};
+use gtk::CheckButton;
 use ReSet_Lib::audio::audio::Sink;
 
 use super::sinkEntryImpl;
@@ -20,16 +21,14 @@ glib::wrapper! {
 }
 
 impl SinkEntry {
-    pub fn new(stream: Sink) -> Self {
+    pub fn new(is_default: bool, check_group: Arc<CheckButton>, stream: Sink) -> Self {
         let obj: Self = Object::builder().build();
         // TODO use event callback for progress bar -> this is the "im speaking" indicator
-        // TODO map the slider to volume
-        // TODO properly use volume fraction
-        // TODO map mute to callback
         // TODO map dropdown
         {
             let imp = obj.imp();
             imp.resetSinkName.set_text(stream.name.clone().as_str());
+            let name = Arc::new(stream.name.clone());
             let volume = stream.volume.first().unwrap_or_else(|| &(0 as u32));
             let fraction = (*volume as f64 / 655.36).round();
             let percentage = (fraction).to_string() + "%";
@@ -49,6 +48,18 @@ impl SinkEntry {
                     Propagation::Proceed
                 }),
             );
+            imp.resetSelectedSink.set_group(Some(&*check_group));
+            // check_group.set_group(Some(&*imp.resetSelectedSink));
+            if is_default {
+                imp.resetSelectedSink.set_active(true);
+            } else {
+                imp.resetSelectedSink.set_active(false);
+            }
+            imp.resetSelectedSink.connect_toggled(move |button| {
+                if button.is_active() {
+                    set_default_sink(name.clone());
+                }
+            });
             imp.resetSinkMute
                 .connect_clicked(clone!(@weak imp => move |_| {
                     let stream = imp.stream.clone();
@@ -102,3 +113,21 @@ pub fn toggle_sink_mute(index: u32, muted: bool) -> bool {
     }
     res.unwrap().0
 }
+
+pub fn set_default_sink(name: Arc<String>) {
+    thread::spawn(move || {
+        dbg!(name.clone());
+        let conn = Connection::new_session().unwrap();
+        let proxy = conn.with_proxy(
+            "org.xetibo.ReSet",
+            "/org/xetibo/ReSet",
+            Duration::from_millis(1000),
+        );
+        let res: Result<(bool,), Error> =
+            proxy.method_call("org.xetibo.ReSet", "SetDefaultSink", (name.as_str(),));
+        if res.is_err() {
+            return;
+        }
+        // handle change
+    });
+}