aleleba/deckcraft
1
0
Fork 0
mirror of https://github.com/storytold/deckcraft.git synced 2026-10-24 10:37:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix up merged PRs: transition sounds and media cues pass the document uid

Browse Source 
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Brandon Thomas
2026-10-14 13:45:01 -04:00
co-authored by Claude Opus 5.5
parent 8d429a23e9
commit 7d87b6e668
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ui-egui/src/show.rs
+5 -5
View File
@@ -442,7 +442,7 @@ pub fn ui(app: &mut SlideApp, ui: &mut Ui) {
show.cue_media(&doc, step, now - show.step_start);
}
show_media(app, &mut show, doc_uid, &doc);
run_media_cues(app, &mut show, &doc);
run_media_cues(app, &mut show, doc_uid, &doc);
// Draw.
let full = ui.max_rect();
let painter = ui.painter_at(full);
@@ -792,7 +792,7 @@ fn show_media(app: &mut SlideApp, show: &mut Show, doc_uid: u64, doc: &Presentat
if let Some(media) = sound {
// Loop Until Next Sound: it repeats until another slide's sound or Stop Previous Sound.
let clip = deckcraft_model::MediaClip { media, volume: 1.0, loop_play: sound_loop, ..Default::default() };
app.media.play(doc, TRANSITION_SOUND, &clip, None, crate::media::Owner::Show);
app.media.play(doc_uid, doc, TRANSITION_SOUND, &clip, None, crate::media::Owner::Show);
}
if let Some(i) = cur {
for (id, _, clip) in crate::media::slide_media(doc, i) {
@@ -805,15 +805,15 @@ fn show_media(app: &mut SlideApp, show: &mut Show, doc_uid: u64, doc: &Presentat
/// Carry out the media effects the show's steps set off: Play starts from the beginning unless
/// the clip is already playing, Pause toggles, Stop stops.
fn run_media_cues(app: &mut SlideApp, show: &mut Show, doc: &Presentation) {
fn run_media_cues(app: &mut SlideApp, show: &mut Show, doc_uid: u64, doc: &Presentation) {
for (id, effect) in std::mem::take(&mut show.media_cues) {
let Some(clip) = crate::media::find_clip(doc, id) else { continue };
match effect.as_str() {
"pause" => app.media.toggle(doc, id, &clip, crate::media::Owner::Show),
"pause" => app.media.toggle(doc_uid, doc, id, &clip, crate::media::Owner::Show),
"stop" => app.media.stop(id),
// Already playing (it also starts automatically): leave it running.
_ if app.media.is_playing(id) => {}
_ => app.media.play(doc, id, &clip, Some(0.0), crate::media::Owner::Show),
_ => app.media.play(doc_uid, doc, id, &clip, Some(0.0), crate::media::Owner::Show),
}
}
}