chris/lumina-iced
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

audio is starting to work

Browse source
This commit is contained in:
Chris Cochrun 2024-12-11 23:29:54 -06:00
parent 2c5b28578c
commit 47f089e360
1 changed files with 58 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

92
src/ui/presenter.rs
View file

@ -2,6 +2,7 @@ use std::{
fs::File, fs::File,
io::BufReader, io::BufReader,
path::{Path, PathBuf}, path::{Path, PathBuf},
sync::Arc,
thread, thread,
time::Duration, time::Duration,
}; };
@ -49,7 +50,7 @@ pub(crate) struct Presenter {
pub video: Option<Video>, pub video: Option<Video>,
pub video_position: f32, pub video_position: f32,
pub audio: Option<PathBuf>, pub audio: Option<PathBuf>,
sink: Sink, sink: (OutputStream, Arc<Sink>),
hovered_slide: i32, hovered_slide: i32,
} }
@ -106,9 +107,12 @@ impl Presenter {
video_position: 0.0, video_position: 0.0,
hovered_slide: -1, hovered_slide: -1,
sink: { sink: {
let (_stream, stream_handle) = let (stream, stream_handle) =
OutputStream::try_default().unwrap(); OutputStream::try_default().unwrap();
Sink::try_new(&stream_handle).unwrap() (
stream,
Arc::new(Sink::try_new(&stream_handle).unwrap()),
)
}, },
} }
} }
@ -151,25 +155,34 @@ impl Presenter {
} }
self.reset_video(); self.reset_video();
if let Some(audio) = &mut self.current_slide.audio() { if let Some(audio) = &mut self.current_slide.audio() {
debug!("{:?}", audio);
let audio = audio.to_str().unwrap().to_string(); let audio = audio.to_str().unwrap().to_string();
let Some(audio) = let audio = if let Some(audio) =
audio.strip_prefix(r#"file://"#) audio.strip_prefix(r"file://")
else { {
debug!("no audio"); audio
return Task::none(); } else {
audio.as_str()
}; };
debug!("{:?}", audio);
let audio = PathBuf::from(audio); let audio = PathBuf::from(audio);
debug!("{:?}", audio); debug!("{:?}", audio);
if audio.exists() { if audio.exists() {
debug!("audio exists"); debug!("audio exists");
if self.audio != Some(audio.clone()) { match &self.audio {
self.audio = Some(audio); Some(aud) if aud != &audio => {
let _ = self.update(Message::StartAudio); self.audio = Some(audio.clone());
} else { let _ =
let _ = self.update(Message::EndAudio); self.update(Message::StartAudio);
}
Some(_) => (),
None => {
self.audio = Some(audio.clone());
let _ =
self.update(Message::StartAudio);
}
} }
} else {
self.audio = None;
let _ = self.update(Message::EndAudio);
} }
} }
Task::none() Task::none()
@ -226,19 +239,17 @@ impl Presenter {
Message::StartAudio => { Message::StartAudio => {
if let Some(audio) = &mut self.audio { if let Some(audio) = &mut self.audio {
let audio = audio.clone(); let audio = audio.clone();
Task::perform( start_audio(
self.start_audio(audio.clone()), Arc::clone(&self.sink.1),
|_| { audio.clone(),
cosmic::app::Message::App( );
Message::EndAudio,
)
},
)
} else {
Task::none()
} }
Task::none()
}
Message::EndAudio => {
self.sink.1.stop();
Task::none()
} }
Message::EndAudio => Task::none(),
} }
} }
@ -399,7 +410,10 @@ impl Presenter {
} }
}, },
blur_radius: { blur_radius: {
if hovered { if self.current_slide_index as i32 == slide_id
{
10.0
} else if hovered {
10.0 10.0
} else { } else {
0.0 0.0
@ -448,11 +462,21 @@ impl Presenter {
} }
} }
} }
}
async fn start_audio(&'static self, audio: PathBuf) {
let file = BufReader::new(File::open(audio).unwrap()); fn start_audio(sink: Arc<Sink>, audio: PathBuf) {
let source = Decoder::new(file).unwrap(); thread::spawn(move || {
self.sink.append(source); let file = BufReader::new(File::open(audio).unwrap());
self.sink.sleep_until_end(); debug!(?file);
} let source = Decoder::new(file).unwrap();
let empty = sink.empty();
let paused = sink.is_paused();
debug!(empty, paused);
sink.append(source);
let empty = sink.empty();
let paused = sink.is_paused();
debug!(empty, paused);
sink.sleep_until_end();
debug!(empty, paused, "Finished running");
});
} }