From ed335b256a8461d7a26dff56b5e2713d73ee8e52 Mon Sep 17 00:00:00 2001 From: Michael Aaron Murphy Date: Sat, 30 Mar 2024 13:56:16 +0100 Subject: [PATCH] chore: migrate volume change sound to cosmic-osd --- cosmic-applet-audio/src/lib.rs | 1 - cosmic-applet-audio/src/pipewire.rs | 21 --------------------- cosmic-applet-audio/src/pulse.rs | 8 -------- 3 files changed, 30 deletions(-) delete mode 100644 cosmic-applet-audio/src/pipewire.rs diff --git a/cosmic-applet-audio/src/lib.rs b/cosmic-applet-audio/src/lib.rs index 472155a8..ed2c82e3 100644 --- a/cosmic-applet-audio/src/lib.rs +++ b/cosmic-applet-audio/src/lib.rs @@ -39,7 +39,6 @@ use mpris_subscription::MprisUpdate; mod config; mod mpris_subscription; -mod pipewire; mod pulse; static SHOW_MEDIA_CONTROLS: Lazy = Lazy::new(id::Toggler::unique); diff --git a/cosmic-applet-audio/src/pipewire.rs b/cosmic-applet-audio/src/pipewire.rs deleted file mode 100644 index c7967be8..00000000 --- a/cosmic-applet-audio/src/pipewire.rs +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2023 System76 -// SPDX-License-Identifier: MPL-2.0 - -use std::path::Path; -use std::process::Stdio; - -/// Plays an audio file. -pub fn play(path: &Path) { - let _result = tokio::process::Command::new("pw-play") - .stdin(Stdio::null()) - .stdout(Stdio::null()) - .stderr(Stdio::null()) - .arg(path) - .spawn(); -} - -pub fn play_audio_volume_change() { - play(Path::new( - "/usr/share/sounds/freedesktop/stereo/audio-volume-change.oga", - )); -} diff --git a/cosmic-applet-audio/src/pulse.rs b/cosmic-applet-audio/src/pulse.rs index acc4d0d6..371d7b72 100644 --- a/cosmic-applet-audio/src/pulse.rs +++ b/cosmic-applet-audio/src/pulse.rs @@ -390,7 +390,6 @@ struct PulseServer { mainloop: Rc>, context: Rc>, introspector: Introspector, - last_playback: Instant, } #[derive(Clone, Debug)] @@ -437,7 +436,6 @@ impl PulseServer { mainloop, context, introspector, - last_playback: Instant::now(), }) } @@ -637,12 +635,6 @@ impl PulseServer { .introspector .set_sink_volume_by_name(name, volume, None); self.wait_for_result(op).ok(); - - let now = Instant::now(); - if now.duration_since(self.last_playback) > Duration::from_millis(250) { - self.last_playback = now; - crate::pipewire::play_audio_volume_change(); - } } fn set_source_volume_by_name(&mut self, name: &str, volume: &ChannelVolumes) {