Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
145 changes: 121 additions & 24 deletions crates/app/src/app.rs

Large diffs are not rendered by default.

39 changes: 37 additions & 2 deletions crates/app/src/library_view.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ impl Default for LibraryView {
/// What the user asked to do with tracks from the table.
#[derive(Debug, Clone)]
pub enum LibraryAction {
Preview(crate::preview::PreviewItem),
LoadDeck(TrackId, usize),
AddToMix(Vec<TrackId>),
Process(Vec<TrackId>),
Expand Down Expand Up @@ -136,13 +137,18 @@ impl LibraryView {
let n = if self.mix.is_some() || self.playlist.is_some() || !self.search.is_empty() { self.visible(sh).len() } else { sh.tracks.len() };
ui.label(RichText::new(format!("{n} tracks")).color(theme::TEXT_DIM));
});
sh.preview.label(ui);
let source = if compact {
crate::preview::PreviewSource::LiveBrowser { playlist: self.playlist, mix: self.mix }
} else { crate::preview::PreviewSource::Library { playlist: self.playlist, mix: self.mix } };
let rows = self.visible(sh);
let row_ids: Vec<TrackId> = rows.iter().map(|t| t.id).collect();
let mut table = TableBuilder::new(ui)
.striped(true)
.resizable(true)
.sense(egui::Sense::click_and_drag())
.cell_layout(egui::Layout::left_to_right(egui::Align::Center))
.column(Column::exact(24.0))
.column(Column::exact(18.0))
.column(Column::initial(if compact { 260.0 } else { 300.0 }).at_least(80.0).clip(true))
.column(Column::initial(if compact { 180.0 } else { 220.0 }).at_least(60.0).clip(true))
Expand Down Expand Up @@ -172,6 +178,7 @@ impl LibraryView {
};
table
.header(20.0, |mut h| {
h.col(|ui| header(ui, "", None));
h.col(|ui| header(ui, "", None));
h.col(|ui| header(ui, "Title", Some(SortBy::Title)));
h.col(|ui| header(ui, "Artist", Some(SortBy::Artist)));
Expand All @@ -190,6 +197,12 @@ impl LibraryView {
let a: Option<&Analysis> = sh.analyses.get(&t.id);
let sel = self.selected.contains(&t.id);
row.set_selected(sel);
let mut preview_click = false;
row.col(|ui| {
let item = crate::preview::PreviewItem { source, track: t.id, row: 0 };
preview_click = sh.preview.button(ui, item, true).clicked();
if preview_click { actions.push(LibraryAction::Preview(item)); }
});
row.col(|ui| {
let has_stems = a.and_then(|a| a.stems_model.as_ref()).is_some();
let c = if has_stems { theme::OK } else if a.is_some_and(|a| a.version > 0) { theme::TEXT_DIM } else { theme::LINE };
Expand Down Expand Up @@ -238,7 +251,7 @@ impl LibraryView {
}
});
let resp = row.response();
if resp.clicked() {
if resp.clicked() && !preview_click {
let (cmd, shift) = ui_mods(&resp.ctx);
if shift {
if let Some(last) = self.last_clicked {
Expand All @@ -258,7 +271,7 @@ impl LibraryView {
}
self.last_clicked = Some(t.id);
}
if resp.double_clicked() {
if resp.double_clicked() && !preview_click {
actions.push(LibraryAction::LoadDeck(t.id, usize::MAX));
}
if resp.drag_started() {
Expand Down Expand Up @@ -314,3 +327,25 @@ impl LibraryView {
fn ui_mods(ctx: &egui::Context) -> (bool, bool) {
ctx.input(|i| (i.modifiers.command, i.modifiers.shift))
}

#[cfg(test)]
mod preview_tests {
use super::*;

#[test]
fn preview_click_in_library_and_live_does_not_select_or_load_a_deck() {
for compact in [false, true] {
let sh = Shared { tracks: vec![Track { id: 1, title: "First".into(), duration: 120.0, ..Default::default() }, Track { id: 2, title: "Second".into(), duration: 120.0, ..Default::default() }], ..Default::default() };
let mut view = LibraryView::default();
view.selected.insert(2);
let mut actions = Vec::new();
crate::preview::test_ui::click_preview(|ui| view.ui(ui, &sh, compact, &mut actions));
assert_eq!(view.selected, HashSet::from([2]));
assert_eq!(actions.len(), 1);
let LibraryAction::Preview(item) = &actions[0] else { panic!("only preview should run") };
assert_eq!(item.track, 1);
let expected = if compact { crate::preview::PreviewSource::LiveBrowser { playlist: None, mix: None } } else { crate::preview::PreviewSource::Library { playlist: None, mix: None } };
assert_eq!(item.source, expected);
}
}
}
58 changes: 44 additions & 14 deletions crates/app/src/live/adapter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -379,8 +379,9 @@ pub struct LiveEngine {
/// Mix player per deck pair (studio preview on C/D, live mix on A/B).
pub studio_player: Option<MixPlayer>,
pub live_player: Option<MixPlayer>,
/// Mashup finder preview (on the studio decks, independent of the studio mix).
/// Independent browser/mashup preview (private decks, separate transport).
pub preview_player: Option<MixPlayer>,
pub preview_output: clubcraft_engine::command::PreviewOutput,
pub loading_mix: Option<u64>,
pub export: Option<Export>,
pub automix_queue: Vec<TrackId>,
Expand Down Expand Up @@ -526,6 +527,7 @@ impl LiveEngine {
studio_player: None,
live_player: None,
preview_player: None,
preview_output: clubcraft_engine::command::PreviewOutput::Headphones,
loading_mix: None,
export: None,
automix_queue: Vec::new(),
Expand Down Expand Up @@ -563,7 +565,6 @@ impl LiveEngine {
/// Start playing `mix` on `decks`. Tracks are loaded just in time (only the current and the
/// next couple of tracks are kept in memory).
pub fn play_mix(&mut self, mix: &Mix, decks: [usize; 2], from: f64, sh: &Shared) {
self.stop_preview();
self.stop_mix(STUDIO_DECKS);
self.stop_mix(LIVE_DECKS);
let mut p = MixPlayer::lazy(mix, &|id| sh.analyses.get(&id).cloned(), decks);
Expand All @@ -579,23 +580,29 @@ impl LiveEngine {
}
}

/// Play a short mix (a mashup preview) on the studio decks from `from` seconds.
pub fn play_preview(&mut self, mix: &Mix, from: f64, sh: &Shared) {
/// Play a browser/mashup preview on its private decks from `from` seconds.
pub fn play_preview(&mut self, mix: &Mix, from: f64, sh: &Shared, expected_output: clubcraft_engine::command::PreviewOutput) -> Result<()> {
use clubcraft_engine::player::PreviewSink;
let h = self.handle.as_ref().context("Audio output is unavailable")?;
let output = crate::preview::resolve_output(self.prefs.preview_output, &h.audio_config(), &h.stream_info())?;
if output != expected_output { anyhow::bail!("Preview output changed; try preview again."); }
self.stop_preview();
self.stop_mix(STUDIO_DECKS);
self.stop_mix(LIVE_DECKS);
let mut p = MixPlayer::lazy(mix, &|id| sh.analyses.get(&id).cloned(), STUDIO_DECKS);
self.preview_output = output;
let mut p = MixPlayer::lazy(mix, &|id| {
let mut a = sh.analyses.get(&id).cloned().unwrap_or_default();
if a.duration <= 0.0 { a.duration = sh.track(id).map(|t| t.duration).unwrap_or(0.0); }
Some(a)
}, [0, 1]);
if let Some(h) = self.handle.as_mut() {
if let Err(e) = p.play(h, from) {
log::warn!("preview: {e:#}");
}
p.play(&mut PreviewSink { sink: h, output }, from)?;
}
self.preview_player = Some(p);
Ok(())
}

pub fn stop_preview(&mut self) {
if let (Some(mut p), Some(h)) = (self.preview_player.take(), self.handle.as_mut()) {
let _ = p.stop(h);
let _ = p.stop(&mut clubcraft_engine::player::PreviewSink { sink: h, output: self.preview_output });
}
}

Expand Down Expand Up @@ -702,11 +709,10 @@ impl LiveEngine {
// Prefetch upcoming tracks of a playing mix.
let st = self.state();
let loader = self.loader();
for which in 0..3 {
for which in 0..2 {
let player = match which {
0 => self.studio_player.as_mut(),
1 => self.live_player.as_mut(),
_ => self.preview_player.as_mut(),
_ => self.live_player.as_mut(),
};
let h = self.handle.as_mut();
if let (Some(p), Some(h)) = (player, h) {
Expand All @@ -721,6 +727,29 @@ impl LiveEngine {
}
}
}
let mut stop_preview = false;
let output = self.preview_output;
if let (Some(p), Some(h)) = (self.preview_player.as_mut(), self.handle.as_mut()) {
let mut preview_state = st;
preview_state.mix = st.preview;
if !crate::preview::output_available(output, &h.stream_info()) {
messages.push(format!("{} is unavailable; preview stopped", output.label()));
stop_preview = true;
} else if st.preview.schedule_id == p.schedule_id() && st.preview.finished {
stop_preview = true;
} else {
let mut sink = clubcraft_engine::player::PreviewSink { sink: h, output };
match p.poll(&mut sink, &preview_state, &loader) {
Ok(status) if !status.failed.is_empty() => {
messages.push("Preview could not be loaded".into());
stop_preview = true;
}
Err(e) => { messages.push(format!("Preview: {e:#}")); stop_preview = true; }
_ => {}
}
}
}
if stop_preview { self.stop_preview(); }
// Persist hot cues the user set or moved.
for d in 0..2 {
let ds = &st.decks[d];
Expand Down Expand Up @@ -999,6 +1028,7 @@ pub fn mixer_ui(st: &EngineState, eng: &LiveEngine) -> MixerUi {
crossfader: st.master.crossfader * 2.0 - 1.0,
master: db_knob(st.master.gain_db, 0.8),
headphone_mix: st.master.headphone_mix,
cue_available: eng.handle.as_ref().is_some_and(|h| h.stream_info().cue_channels.is_some()),
headphone_vol: db_knob(st.master.headphone_gain_db, 0.7),
master_vu: st.master.level.peak,
recording: st.recording.active,
Expand Down
3 changes: 2 additions & 1 deletion crates/app/src/live/model.rs
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ pub struct MixerUi {
pub crossfader: f32,
pub master: f32,
pub headphone_mix: f32,
pub cue_available: bool,
pub headphone_vol: f32,
pub master_vu: [f32; 2],
pub recording: bool,
Expand Down Expand Up @@ -191,6 +192,6 @@ pub enum LiveAction {

impl Default for MixerUi {
fn default() -> Self {
MixerUi { crossfader: 0.0, master: 0.8, headphone_mix: 0.0, headphone_vol: 0.7, master_vu: [0.0; 2], recording: false, record_secs: 0.0, master_bpm: None, automix: false, output_name: String::new() }
MixerUi { crossfader: 0.0, master: 0.8, headphone_mix: 0.0, cue_available: false, headphone_vol: 0.7, master_vu: [0.0; 2], recording: false, record_secs: 0.0, master_bpm: None, automix: false, output_name: String::new() }
}
}
6 changes: 4 additions & 2 deletions crates/app/src/live/view.rs
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,7 @@ impl LiveView {
if widgets::knob(ui, &mut f, 0.0..=1.0, 0.5, "FILTER", Color32::from_rgb(120, 220, 255), 31.0).changed() {
out.push(LiveAction::Filter(i, f));
}
if widgets::toggle(ui, d.pfl, "🎧", accent, vec2(40.0, 20.0)).on_hover_text("Headphone cue").clicked() {
if widgets::toggle(ui, d.pfl, "🎧", accent, vec2(40.0, 20.0)).on_hover_text("Monitor this deck before its fader. CUE·MIX controls how much master is heard.").clicked() {
out.push(LiveAction::Pfl(i, !d.pfl));
}
ui.add_space(8.0);
Expand Down Expand Up @@ -599,9 +599,11 @@ impl LiveView {
ui.horizontal(|ui| {
ui.add_space((ui.available_width() - 72.0).max(0.0) / 2.0);
let mut hm = m.headphone_mix;
if widgets::knob(ui, &mut hm, 0.0..=1.0, 0.0, "CUE·MIX", theme::TEXT, 32.0).changed() {
ui.add_enabled_ui(m.cue_available, |ui| {
if widgets::knob(ui, &mut hm, 0.0..=1.0, 0.0, "CUE·MIX", theme::TEXT, 32.0).on_hover_text("CUE: selected decks only; MIX: master. With no CUE selected, the CUE end is silent.").changed() {
out.push(LiveAction::HeadphoneMix(hm));
}
}).response.on_disabled_hover_text("No headphone output is configured.");
let mut hv = m.headphone_vol;
if widgets::knob(ui, &mut hv, 0.0..=1.0, 0.7, "PHONES", theme::TEXT, 32.0).changed() {
out.push(LiveAction::HeadphoneVol(hv));
Expand Down
1 change: 1 addition & 0 deletions crates/app/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ mod menu;
mod pipeline;
mod platform;
mod prefs;
mod preview;
mod settings;
mod studio;
mod studio_timeline;
Expand Down
20 changes: 14 additions & 6 deletions crates/app/src/mashup_view.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ pub enum Target {
}

pub enum MashupAction {
Preview(Match),
Preview(Match, usize),
StopPreview,
NewMix(Match),
Insert(Match),
Expand Down Expand Up @@ -56,6 +56,7 @@ pub struct MashupView {
transition_bars: Option<(i32, i32)>,
job: Option<Job>,
results: Vec<Match>,
pub revision: u64,
message: String,
pub previewing: Option<usize>,
run_next_frame: bool,
Expand All @@ -81,6 +82,7 @@ impl Default for MashupView {
transition_bars: None,
job: None,
results: Vec::new(),
revision: 0,
message: String::new(),
previewing: None,
run_next_frame: false,
Expand Down Expand Up @@ -116,6 +118,7 @@ impl MashupView {
self.inst_only = None;
self.transition_bars = None;
self.auto_phrase = true;
self.revision = self.revision.wrapping_add(1);
self.results.clear();
self.message.clear();
self.vocal = vocal.filter(|id| sh.analyses.get(id).is_some_and(|a| a.stems_model.is_some()));
Expand Down Expand Up @@ -207,11 +210,16 @@ impl MashupView {
})
.ok();
self.job = Some(Job { rx, progress, cancel });
self.revision = self.revision.wrapping_add(1);
self.results.clear();
self.previewing = None;
self.message.clear();
}

pub fn has_preview_row(&self, row: usize, track: TrackId) -> bool {
self.results.get(row).is_some_and(|m| m.vocal_track == track)
}

/// Close the finder (cancels a running search and stops a preview).
pub fn close(&mut self, out: &mut Vec<MashupAction>) {
self.open = false;
Expand Down Expand Up @@ -243,13 +251,13 @@ impl MashupView {
ui.ctx().request_repaint_after(std::time::Duration::from_millis(100));
}
}
if !preview_playing {
self.previewing = None;
}
self.previewing = sh.preview.item.filter(|p| p.source == crate::preview::PreviewSource::Mashups && sh.preview.mashup_revision == self.revision).map(|p| p.row);
if !preview_playing { self.previewing = None; }
self.contents(ui, sh, mix, out);
}

fn contents(&mut self, ui: &mut Ui, sh: &Shared, mix: &Mix, out: &mut Vec<MashupAction>) {
sh.preview.label(ui);
let with_stems: Vec<TrackId> = sh.tracks.iter().filter(|t| sh.analyses.get(&t.id).is_some_and(|a| a.stems_model.is_some() && a.grid.is_some())).map(|t| t.id).collect();
// ------------------------------------------------ query
let mut close = false;
Expand Down Expand Up @@ -411,12 +419,12 @@ impl MashupView {
ui.label(m.learned.map(|l| format!("{:.0}", l * 100.0)).unwrap_or_else(|| "–".into()));
ui.horizontal(|ui| {
let playing = self.previewing == Some(i);
if ui.button(if playing { "■" } else { "▶" }).on_hover_text(if playing { "Stop" } else { "Preview: vocals over this instrumental" }).clicked() {
if sh.preview.button(ui, crate::preview::PreviewItem { source: crate::preview::PreviewSource::Mashups, track: m.vocal_track, row: i }, true).on_hover_text(if playing { "Stop" } else { "Preview: vocals over this instrumental" }).clicked() {
if playing {
out.push(MashupAction::StopPreview);
self.previewing = None;
} else {
out.push(MashupAction::Preview(m.clone()));
out.push(MashupAction::Preview(m.clone(), i));
self.previewing = Some(i);
}
}
Expand Down
Loading
Loading