mirror of
https://github.com/arabianq/pipewire-soundpad.git
synced 2026-04-28 06:21:23 +00:00
feat: first attemp to support playing multiple tracks in parallel
This commit is contained in:
+33
-34
@@ -3,14 +3,43 @@ use eframe::{App, Frame as EFrame};
|
||||
use egui::{CentralPanel, Context};
|
||||
use pwsp::{
|
||||
types::socket::Request,
|
||||
utils::{
|
||||
daemon::{get_daemon_config, is_daemon_running},
|
||||
gui::make_request_sync,
|
||||
},
|
||||
utils::{daemon::is_daemon_running, gui::make_request_sync},
|
||||
};
|
||||
use std::time::{Duration, Instant};
|
||||
|
||||
impl App for SoundpadGui {
|
||||
fn update(&mut self, ctx: &Context, _frame: &mut EFrame) {
|
||||
let mut seek_requests = vec![];
|
||||
let mut volume_requests = vec![];
|
||||
|
||||
for (id, ui_state) in &mut self.app_state.track_ui_states {
|
||||
if ui_state.position_dragged {
|
||||
seek_requests.push((*id, ui_state.position_slider_value));
|
||||
}
|
||||
if ui_state.volume_dragged {
|
||||
volume_requests.push((*id, ui_state.volume_slider_value));
|
||||
ui_state.volume_dragged = false;
|
||||
}
|
||||
}
|
||||
|
||||
for (id, pos) in seek_requests {
|
||||
make_request_sync(Request::seek(pos, Some(id))).ok();
|
||||
if let Some(ui_state) = self.app_state.track_ui_states.get_mut(&id) {
|
||||
ui_state.position_dragged = false;
|
||||
ui_state.ignore_position_update_until =
|
||||
Some(Instant::now() + Duration::from_millis(200));
|
||||
}
|
||||
}
|
||||
|
||||
for (id, vol) in volume_requests {
|
||||
make_request_sync(Request::set_volume(vol, Some(id))).ok();
|
||||
if let Some(ui_state) = self.app_state.track_ui_states.get_mut(&id) {
|
||||
ui_state.volume_dragged = false;
|
||||
ui_state.ignore_volume_update_until =
|
||||
Some(Instant::now() + Duration::from_millis(200));
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
let guard = self.audio_player_state_shared.lock().unwrap();
|
||||
self.audio_player_state = guard.clone();
|
||||
@@ -49,36 +78,6 @@ impl App for SoundpadGui {
|
||||
}
|
||||
});
|
||||
|
||||
if self.app_state.position_dragged {
|
||||
make_request_sync(Request::seek(self.app_state.position_slider_value)).ok();
|
||||
let mut guard = self.audio_player_state_shared.lock().unwrap();
|
||||
guard.new_position = Some(self.app_state.position_slider_value);
|
||||
guard.position = self.app_state.position_slider_value;
|
||||
self.app_state.position_dragged = false;
|
||||
} else {
|
||||
self.app_state.position_slider_value = self.audio_player_state.position;
|
||||
}
|
||||
|
||||
if self.app_state.volume_dragged {
|
||||
let new_volume = self.app_state.volume_slider_value;
|
||||
|
||||
make_request_sync(Request::set_volume(new_volume)).ok();
|
||||
|
||||
let mut guard = self.audio_player_state_shared.lock().unwrap();
|
||||
guard.new_volume = Some(self.app_state.volume_slider_value);
|
||||
guard.volume = self.app_state.volume_slider_value;
|
||||
|
||||
self.app_state.volume_dragged = false;
|
||||
|
||||
if self.config.save_volume {
|
||||
let mut daemon_config = get_daemon_config();
|
||||
daemon_config.default_volume = Some(new_volume);
|
||||
daemon_config.save_to_file().ok();
|
||||
}
|
||||
} else {
|
||||
self.app_state.volume_slider_value = self.audio_player_state.volume;
|
||||
}
|
||||
|
||||
ctx.request_repaint_after_secs(1.0 / 60.0);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user