Skip to content

osc.lua: update track state only when track-list changes #17535

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
sfan5 merged 2 commits into from
Mar 12, 2026
Merged

osc.lua: update track state only when track-list changes #17535

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb637be
osc.lua: update track state only when track-list changes
guidocella Mar 9, 2026
d7cb53c
osc.lua: move {audio,sub}_track_count into state
guidocella Mar 9, 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
36 changes: 15 additions & 21 deletions player/lua/osc.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,6 @@ local margins_opts = {
}

local tick_delay = 1 / 60
local audio_track_count = 0
local sub_track_count = 0
local window_control_box_width = 80
local layouts = {}
local is_december = os.date("*t").month == 12
Expand Down Expand Up @@ -257,6 +255,8 @@ local state = {
hide_timer = nil,
cache_state = nil,
idle = false,
audio_track_count = 0,
sub_track_count = 0,
no_video = false,
file_loaded = false,
enabled = true,
Expand Down Expand Up @@ -628,22 +628,19 @@ local function render_wipe(osd)
osd:remove()
end

local function update_tracklist(_, track_list)
state.audio_track_count = 0
state.sub_track_count = 0

--
-- Tracklist Management
--

-- updates the OSC internal playlists, should be run each time the track-layout changes
local function update_tracklist()
audio_track_count, sub_track_count = 0, 0

for _, track in pairs(mp.get_property_native("track-list")) do
for _, track in pairs(track_list) do
if track.type == "audio" then
audio_track_count = audio_track_count + 1
state.audio_track_count = state.audio_track_count + 1
elseif track.type == "sub" then
sub_track_count = sub_track_count + 1
state.sub_track_count = state.sub_track_count + 1
end
end

request_init()
end

-- WindowControl helpers
Expand Down Expand Up @@ -2006,26 +2003,23 @@ local function osc_init()
ne.content = icons.chapter_next
bind_mouse_buttons("chapter_next")

--
update_tracklist()

--audio_track
ne = new_element("audio_track", "button")

ne.enabled = audio_track_count > 0
ne.enabled = state.audio_track_count > 0
ne.content = function ()
return icons.audio .. osc_styles.smallButtonsLlabel .. " " ..
mp.get_property_number("aid", "-") .. "/" .. audio_track_count
mp.get_property_number("aid", "-") .. "/" .. state.audio_track_count
end
bind_mouse_buttons("audio_track")

--sub_track
ne = new_element("sub_track", "button")

ne.enabled = sub_track_count > 0
ne.enabled = state.sub_track_count > 0
ne.content = function ()
return icons.subtitle .. osc_styles.smallButtonsLlabel .. " " ..
mp.get_property_number("sid", "-") .. "/" .. sub_track_count
mp.get_property_number("sid", "-") .. "/" .. state.sub_track_count
end
bind_mouse_buttons("sub_track")

Expand Down Expand Up @@ -2739,7 +2733,7 @@ end

mp.register_event("shutdown", shutdown)
mp.register_event("start-file", request_init)
mp.observe_property("track-list", "native", request_init)
mp.observe_property("track-list", "native", update_tracklist)
mp.observe_property("playlist-count", "native", request_init)
mp.observe_property("playlist-pos", "native", request_init)
mp.observe_property("chapter-list", "native", function(_, list)
Expand Down