mirror of
https://github.com/ksyasuda/SubMiner.git
synced 2026-06-09 15:13:32 -07:00
fix(overlay): Linux X11/XWayland stacking, stale pause state, multi-copy selector (#101)
This commit is contained in:
@@ -39,6 +39,9 @@ function M.create(ctx)
|
||||
end
|
||||
return "show-visible-overlay"
|
||||
end
|
||||
if state.visible_overlay_requested == true then
|
||||
return nil
|
||||
end
|
||||
return "hide-visible-overlay"
|
||||
end
|
||||
|
||||
@@ -50,6 +53,25 @@ function M.create(ctx)
|
||||
return options_helper.coerce_bool(raw_pause_until_ready, false)
|
||||
end
|
||||
|
||||
local function resolve_pause_until_ready_owns_initial_pause()
|
||||
local raw_owns_initial_pause = opts.auto_start_pause_until_ready_owns_initial_pause
|
||||
if raw_owns_initial_pause == nil then
|
||||
raw_owns_initial_pause = opts["auto-start-pause-until-ready-owns-initial-pause"]
|
||||
end
|
||||
return options_helper.coerce_bool(raw_owns_initial_pause, false)
|
||||
end
|
||||
|
||||
local function consume_pause_until_ready_initial_pause_ownership()
|
||||
if state.auto_play_ready_initial_pause_ownership_consumed then
|
||||
return false
|
||||
end
|
||||
if not resolve_pause_until_ready_owns_initial_pause() then
|
||||
return false
|
||||
end
|
||||
state.auto_play_ready_initial_pause_ownership_consumed = true
|
||||
return true
|
||||
end
|
||||
|
||||
local function resolve_texthooker_enabled(override_value)
|
||||
if override_value ~= nil then
|
||||
return options_helper.coerce_bool(override_value, false)
|
||||
@@ -260,7 +282,8 @@ function M.create(ctx)
|
||||
clear_auto_play_ready_osd_timer()
|
||||
end
|
||||
if not was_armed then
|
||||
state.auto_play_ready_should_resume_playback = mp.get_property_native("pause") ~= true
|
||||
state.auto_play_ready_should_resume_playback = consume_pause_until_ready_initial_pause_ownership()
|
||||
or mp.get_property_native("pause") ~= true
|
||||
end
|
||||
state.auto_play_ready_gate_armed = true
|
||||
mp.set_property_native("pause", true)
|
||||
@@ -290,6 +313,7 @@ function M.create(ctx)
|
||||
end
|
||||
|
||||
local function notify_auto_play_ready()
|
||||
state.auto_play_ready_signal_seen = true
|
||||
local released_ready_gate = release_auto_play_ready_gate("tokenization-ready")
|
||||
local force_ready_overlay_restore = state.force_ready_overlay_restore == true
|
||||
state.force_ready_overlay_restore = false
|
||||
@@ -601,6 +625,7 @@ function M.create(ctx)
|
||||
end
|
||||
|
||||
state.overlay_running = false
|
||||
state.auto_play_ready_signal_seen = false
|
||||
subminer_log("error", "process", "Overlay start failed after retries: " .. reason)
|
||||
show_osd("Overlay start failed")
|
||||
release_auto_play_ready_gate("overlay-start-failed")
|
||||
@@ -653,6 +678,7 @@ function M.create(ctx)
|
||||
|
||||
state.overlay_running = false
|
||||
state.texthooker_running = false
|
||||
state.auto_play_ready_signal_seen = false
|
||||
disarm_auto_play_ready_gate()
|
||||
show_osd("Stopped")
|
||||
end
|
||||
@@ -709,6 +735,14 @@ function M.create(ctx)
|
||||
end)
|
||||
return
|
||||
end
|
||||
if not state.overlay_running then
|
||||
state.suppress_ready_overlay_restore = false
|
||||
disarm_auto_play_ready_gate({ resume_playback = false })
|
||||
start_overlay({
|
||||
show_visible_overlay = true,
|
||||
})
|
||||
return
|
||||
end
|
||||
state.suppress_ready_overlay_restore = true
|
||||
disarm_auto_play_ready_gate({ resume_playback = false })
|
||||
|
||||
@@ -773,6 +807,7 @@ function M.create(ctx)
|
||||
|
||||
state.overlay_running = false
|
||||
state.texthooker_running = false
|
||||
state.auto_play_ready_signal_seen = false
|
||||
state.suppress_ready_overlay_restore = false
|
||||
state.force_ready_overlay_restore = true
|
||||
disarm_auto_play_ready_gate({ resume_playback = false })
|
||||
@@ -795,6 +830,7 @@ function M.create(ctx)
|
||||
}, function(success, result, error)
|
||||
if not success or (result and result.status ~= 0) then
|
||||
state.overlay_running = false
|
||||
state.auto_play_ready_signal_seen = false
|
||||
subminer_log(
|
||||
"error",
|
||||
"process",
|
||||
|
||||
Reference in New Issue
Block a user