Skip to content

jk: a pause during a cutscene keeps the sound in order and in sync #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
finger563 merged 2 commits into from
Nov 8, 2026
Merged

jk: a pause during a cutscene keeps the sound in order and in sync #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2621ec7
jk: a pause during a cutscene keeps the sound in order and in sync (O…
finger563 Nov 8, 2026
2e8324e
jk: OpenJKDF2 5b5c037 (no clock shift while the cutscene's own pause …
finger563 Nov 8, 2026
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
2 changes: 1 addition & 1 deletion components/jk/OpenJKDF2
Open in desktop
Submodule OpenJKDF2 updated 2 files
+20 −0 src/Main/jkCutscene.c
+4 −0 src/Main/jkCutscene.h
11 changes: 10 additions & 1 deletion components/jk/src/jk.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ bool request(Request req, const std::string &path = {}, const std::string &label
}
std::unique_ptr<espp::Task> g_audio_task;
extern "C" void stdSound_ESP32_Pump(void);
extern "C" void jkCutscene_ESP32_SkipTime(uint64_t us);
constexpr size_t ENGINE_STACK_BYTES = 1024 * 1024;
int g_native_w = CONFIG_JK_INTERNAL_WIDTH;
int g_native_h = CONFIG_JK_INTERNAL_HEIGHT;
Expand Down Expand Up @@ -405,6 +406,7 @@ int jk_esp_park_point(void) {
if (!g_paused) {
return 0;
}
const uint64_t park_start_us = esp_timer_get_time();
g_parked = true;
while (g_paused && !g_engine_stop && !jk_esp_quit_requested) {
// the pause menu's save / load / reset arrive while parked here: serve
Expand All @@ -413,6 +415,11 @@ int jk_esp_park_point(void) {
run_pending_request();
vTaskDelay(pdMS_TO_TICKS(10));
}
#if CONFIG_JK_ENGINE
// a cutscene keeps time by the wall clock: without this it takes the pause
// for lag and decodes every frame it missed at once
jkCutscene_ESP32_SkipTime(esp_timer_get_time() - park_start_us);
Comment thread
finger563 marked this conversation as resolved.
Resolved
#endif
g_parked = false;
return 1;
}
Expand Down Expand Up @@ -1082,7 +1089,9 @@ bool init(const Config &config) {
g_audio_task = espp::Task::make_unique({
.callback =
[](std::mutex &m, std::condition_variable &cv, bool &task_notified) {
if (!g_paused) {
// mix until the engine has actually parked, so the sound stops
// with the picture (it can finish a frame after the pause)
if (!g_parked) {
stdSound_ESP32_Pump();
}
std::unique_lock<std::mutex> lk(m);
Expand Down
Loading