inkreas.ing
old school music tracker
enable playback control from page menu
+125
-110
+67
-26
src/app.rs
+67
-26
src/app.rs
···
60
60
Header(HeaderEvent),
61
61
/// also closes all dialogs
62
62
GoToPage(PagesEnum),
63
+
Playback(PlaybackType),
63
64
CloseRequested,
64
65
CloseApp,
65
66
ConstRedraw,
66
67
}
67
68
69
+
impl Clone for GlobalEvent {
70
+
fn clone(&self) -> Self {
71
+
// TODO: make this really clone, once the Dialogs are an enum instead of Box dyn
72
+
match self {
73
+
GlobalEvent::OpenDialog(_) => panic!("TODO: don't clone this"),
74
+
GlobalEvent::Page(page_event) => GlobalEvent::Page(page_event.clone()),
75
+
GlobalEvent::Header(header_event) => GlobalEvent::Header(header_event.clone()),
76
+
GlobalEvent::GoToPage(pages_enum) => GlobalEvent::GoToPage(*pages_enum),
77
+
GlobalEvent::CloseRequested => GlobalEvent::CloseRequested,
78
+
GlobalEvent::CloseApp => GlobalEvent::CloseApp,
79
+
GlobalEvent::ConstRedraw => GlobalEvent::ConstRedraw,
80
+
GlobalEvent::Playback(playback_type) => GlobalEvent::Playback(*playback_type),
81
+
}
82
+
}
83
+
}
84
+
68
85
impl Debug for GlobalEvent {
69
86
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
70
87
let mut debug = f.debug_struct("GlobalEvent");
···
76
93
GlobalEvent::CloseRequested => debug.field("CloseRequested", &""),
77
94
GlobalEvent::CloseApp => debug.field("CloseApp", &""),
78
95
GlobalEvent::ConstRedraw => debug.field("ConstRedraw", &""),
96
+
GlobalEvent::Playback(playback_type) => debug.field("Playback", &playback_type),
79
97
};
80
98
debug.finish()
81
99
}
100
+
}
101
+
102
+
#[derive(Clone, Copy, Debug)]
103
+
pub enum PlaybackType {
104
+
Stop,
105
+
Song,
106
+
Pattern,
107
+
FromOrder,
108
+
FromCursor,
82
109
}
83
110
84
111
struct WorkerThreads {
···
253
280
return;
254
281
}
255
282
256
-
let message = if event.logical_key == Key::Named(NamedKey::F5) {
257
-
// play song from start
258
-
Some(ToWorkerMsg::Playback(PlaybackSettings::Order {
259
-
idx: 0,
260
-
should_loop: true,
261
-
}))
283
+
if event.logical_key == Key::Named(NamedKey::F5) {
284
+
self.event_queue
285
+
.push_back(GlobalEvent::Playback(PlaybackType::Song));
262
286
} else if event.logical_key == Key::Named(NamedKey::F6) {
263
-
Some(ToWorkerMsg::Playback(if modifiers.state().shift_key() {
264
-
// play the current order
265
-
self.header.play_current_order()
287
+
if modifiers.state().shift_key() {
288
+
self.event_queue
289
+
.push_back(GlobalEvent::Playback(PlaybackType::FromOrder));
266
290
} else {
267
-
// play the current pattern
268
-
self.header.play_current_pattern()
269
-
}))
291
+
self.event_queue
292
+
.push_back(GlobalEvent::Playback(PlaybackType::Pattern));
293
+
}
270
294
// TODO: add F7 handling
271
295
} else if event.logical_key == Key::Named(NamedKey::F8) {
272
-
Some(ToWorkerMsg::StopPlayback)
273
-
} else {
274
-
None
275
-
};
276
-
if let Some(msg) = message {
277
-
let result = AUDIO.lock_blocking().try_msg_worker(msg);
278
-
279
-
match result {
280
-
SendResult::Success => (),
281
-
SendResult::BufferFull => {
282
-
panic!("to worker buffer full, probably have to retry somehow")
283
-
}
284
-
SendResult::AudioInactive => panic!("audio should always be active"),
285
-
}
296
+
self.event_queue
297
+
.push_back(GlobalEvent::Playback(PlaybackType::Stop));
298
+
// TODO: allow F5 to also switch to the playback page, once it exists
286
299
} else {
287
300
// key_event didn't start or stop the song, so process normally
288
301
if let Some(dialog) = dialog_manager.active_dialog_mut() {
···
350
363
GlobalEvent::ConstRedraw => {
351
364
self.ui_pages.request_draw_const();
352
365
_ = self.try_request_redraw();
366
+
}
367
+
GlobalEvent::Playback(playback_type) => {
368
+
let msg = match playback_type {
369
+
PlaybackType::Song => Some(ToWorkerMsg::Playback(PlaybackSettings::Order {
370
+
idx: 0,
371
+
should_loop: true,
372
+
})),
373
+
PlaybackType::Stop => Some(ToWorkerMsg::StopPlayback),
374
+
PlaybackType::Pattern => {
375
+
Some(ToWorkerMsg::Playback(self.header.play_current_pattern()))
376
+
}
377
+
PlaybackType::FromOrder => {
378
+
Some(ToWorkerMsg::Playback(self.header.play_current_order()))
379
+
}
380
+
PlaybackType::FromCursor => None,
381
+
};
382
+
383
+
if let Some(msg) = msg {
384
+
let result = AUDIO.lock_blocking().try_msg_worker(msg);
385
+
386
+
match result {
387
+
SendResult::Success => (),
388
+
SendResult::BufferFull => {
389
+
panic!("to worker buffer full, probably have to retry somehow")
390
+
}
391
+
SendResult::AudioInactive => panic!("audio should always be active"),
392
+
}
393
+
}
353
394
}
354
395
}
355
396
}
+1
-1
src/ui/header.rs
+1
-1
src/ui/header.rs
+1
-1
src/ui/pages.rs
+1
-1
src/ui/pages.rs
+1
-1
src/ui/pages/order_list.rs
+1
-1
src/ui/pages/order_list.rs
+1
-1
src/ui/pages/pattern.rs
+1
-1
src/ui/pages/pattern.rs
+1
-1
src/ui/pages/sample_list.rs
+1
-1
src/ui/pages/sample_list.rs