Merge pull request #29 from zWolfrost/master

added config file & remember window position & gradual audio decrease
Aurailus · Apr 15, 2024 · d75efa7 · d75efa7
2 parents 90992c4 + e859a67
commit d75efa7
Show file tree

Hide file tree

Showing 7 changed files with 194 additions and 57 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/main.rs b/src/main.rs
@@ -29,7 +29,7 @@ use shared::Shared;
 
 fn main() {
 	let pulse = Shared::new(Pulse::new());
-	
+
 	let app = gtk::Application::new(Some("com.aurailus.myxer"), Default::default())
 		.expect("Failed to initialize GTK application.");
 

diff --git a/src/meter/sink_meter.rs b/src/meter/sink_meter.rs
@@ -23,8 +23,8 @@ pub struct SinkMeter {
 	widgets: MeterWidgets,
 	pulse: Shared<Pulse>,
 
-	split: bool,
-	peak: Option<u32>,
+	pub split: bool,
+	pub peak: Option<u32>,
 
 	l_id: Option<glib::signal::SignalHandlerId>,
 	s_id: Option<glib::signal::SignalHandlerId>,
@@ -228,24 +228,22 @@ impl Meter for SinkMeter {
 	}
 
 	fn set_peak(&mut self, peak: Option<u32>) {
-		if self.peak != peak {
-			self.peak = peak;
-
-			if self.peak.is_some() {
-				for (i, s) in self.widgets.scales_inner.get_children().iter().enumerate() {
-					let s = s.clone().downcast::<gtk::Scale>().expect("Scales box has non-scale children.");
-					let peak_scaled = self.peak.unwrap() as f64 * (self.data.volume.get()[i].0 as f64 / MAX_SCALE_VOL as f64);
-					s.set_fill_level(peak_scaled as f64);
-					s.set_show_fill_level(!self.data.muted && peak_scaled > 0.5);
-					s.get_style_context().add_class("visualizer");
-				}
+		self.peak = peak;
+
+		if self.peak.is_some() {
+			for (i, s) in self.widgets.scales_inner.get_children().iter().enumerate() {
+				let s = s.clone().downcast::<gtk::Scale>().expect("Scales box has non-scale children.");
+				let peak_scaled = self.peak.unwrap() as f64 * (self.data.volume.get()[i].0 as f64 / MAX_SCALE_VOL as f64);
+				s.set_fill_level(peak_scaled as f64);
+				s.set_show_fill_level(!self.data.muted && peak_scaled > 0.5);
+				s.get_style_context().add_class("visualizer");
 			}
-			else {
-				for s in &self.widgets.scales_inner.get_children() {
-					let s = s.clone().downcast::<gtk::Scale>().expect("Scales box has non-scale children.");
-					s.set_show_fill_level(false);
-					s.get_style_context().remove_class("visualizer");
-				}
+		}
+		else {
+			for s in &self.widgets.scales_inner.get_children() {
+				let s = s.clone().downcast::<gtk::Scale>().expect("Scales box has non-scale children.");
+				s.set_show_fill_level(false);
+				s.get_style_context().remove_class("visualizer");
 			}
 		}
 	}

diff --git a/src/meter/stream_meter.rs b/src/meter/stream_meter.rs
@@ -23,8 +23,8 @@ pub struct StreamMeter {
 	widgets: MeterWidgets,
 	pulse: Shared<Pulse>,
 
-	split: bool,
-	peak: Option<u32>,
+	pub split: bool,
+	pub peak: Option<u32>,
 
 	b_id: Option<glib::signal::SignalHandlerId>,
 }
@@ -151,24 +151,22 @@ impl Meter for StreamMeter {
 	}
 
 	fn set_peak(&mut self, peak: Option<u32>) {
-		if self.peak != peak {
-			self.peak = peak;
-
-			if self.peak.is_some() {
-				for (i, s) in self.widgets.scales_inner.get_children().iter().enumerate() {
-					let s = s.clone().downcast::<gtk::Scale>().expect("Scales box has non-scale children.");
-					let peak_scaled = self.peak.unwrap() as f64 * (self.data.volume.get()[i].0 as f64 / MAX_SCALE_VOL as f64);
-					s.set_fill_level(peak_scaled as f64);
-					s.set_show_fill_level(!self.data.muted && peak_scaled > 0.5);
-					s.get_style_context().add_class("visualizer");
-				}
+		self.peak = peak;
+
+		if self.peak.is_some() {
+			for (i, s) in self.widgets.scales_inner.get_children().iter().enumerate() {
+				let s = s.clone().downcast::<gtk::Scale>().expect("Scales box has non-scale children.");
+				let peak_scaled = self.peak.unwrap() as f64 * (self.data.volume.get()[i].0 as f64 / MAX_SCALE_VOL as f64);
+				s.set_fill_level(peak_scaled as f64);
+				s.set_show_fill_level(!self.data.muted && peak_scaled > 0.5);
+				s.get_style_context().add_class("visualizer");
 			}
-			else {
-				for s in &self.widgets.scales_inner.get_children() {
-					let s = s.clone().downcast::<gtk::Scale>().expect("Scales box has non-scale children.");
-					s.set_show_fill_level(false);
-					s.get_style_context().remove_class("visualizer");
-				}
+		}
+		else {
+			for s in &self.widgets.scales_inner.get_children() {
+				let s = s.clone().downcast::<gtk::Scale>().expect("Scales box has non-scale children.");
+				s.set_show_fill_level(false);
+				s.get_style_context().remove_class("visualizer");
 			}
 		}
 	}

diff --git a/src/pulse.rs b/src/pulse.rs
@@ -76,6 +76,7 @@ pub struct StreamData {
 	pub data: MeterData,
 
 	pub peak: u32,
+	pub repetitions: u32,
 	pub monitor_index: u32,
 	pub monitor: Shared<Stream>
 }
@@ -599,7 +600,7 @@ impl Pulse {
 		else {
 			let source_str = stream.monitor_index.to_string();
 			let monitor = self.create_monitor_stream(t, if t == StreamType::SinkInput { None } else { Some(&source_str) }, index);
-			let data = StreamData { data, peak: 0, monitor, monitor_index: stream.monitor_index };
+			let data = StreamData { data, peak: 0, repetitions: 0, monitor, monitor_index: stream.monitor_index };
 			match t {
 				StreamType::Sink => self.sinks.insert(index, data),
 				StreamType::SinkInput => self.sink_inputs.insert(index, data),

diff --git a/src/window/about.rs b/src/window/about.rs
@@ -20,6 +20,7 @@ pub fn about() {
 	about.set_copyright(Some("© 2021 Auri Collings"));
 	about.set_license_type(gtk::License::Gpl30);
 	about.add_credit_section("Created by", &[ "Auri Collings" ]);
+	about.add_credit_section("With the help of", &[ "zWolfrost" ]);
 	about.add_credit_section("libpulse-binding by", &[ "Lyndon Brown" ]);
 
 	about.connect_response(|about, _| about.close());