delay loading of osc-mod.

1 files changed, 120 insertions, 111 deletions

diff --git a/ytdl-storyboard/osc-mod.lua b/ytdl-storyboard/osc-mod.lua
index 207978d..3d2e072 100644
--- a/ytdl-storyboard/osc-mod.lua
+++ b/ytdl-storyboard/osc-mod.lua
@@ -3,12 +3,6 @@ local msg = require 'mp.msg'
 local opt = require 'mp.options'
 local utils = require 'mp.utils'
 
--- disable builtin osc
---if not mp.get_property_bool("osc", true) then
---    goto label_exit
---end
-mp.set_property_bool("osc", false)
-
 --
 -- Parameters
 --
@@ -2805,104 +2799,6 @@ local function set_tick_delay(_, display_fps)
     tick_delay = 1 / display_fps
 end
 
-mp.register_event("shutdown", shutdown)
-mp.register_event("start-file", request_init)
-mp.observe_property("track-list", "native", request_init)
-mp.observe_property("playlist", "native", request_init)
-mp.observe_property("chapter-list", "native", function(_, list)
-    list = list or {}  -- safety, shouldn't return nil
-    table.sort(list, function(a, b) return a.time < b.time end)
-    state.chapter_list = list
-    update_duration_watch()
-    request_init()
-end)
-
-mp.register_script_message("osc-message", show_message)
-mp.register_script_message("osc-chapterlist", function(dur)
-    show_message(get_chapterlist(), dur)
-end)
-mp.register_script_message("osc-playlist", function(dur)
-    show_message(get_playlist(), dur)
-end)
-mp.register_script_message("osc-tracklist", function(dur)
-    local message = {}
-    for k in pairs(nicetypes) do
-        table.insert(message, get_tracklist(k))
-    end
-    show_message(table.concat(message, '\n\n'), dur)
-end)
-
-mp.observe_property("fullscreen", "bool", function(_, val)
-    state.fullscreen = val
-    state.marginsREQ = true
-    request_init_resize()
-end)
-mp.observe_property("border", "bool", function(_, val)
-    state.border = val
-    request_init_resize()
-end)
-mp.observe_property("title-bar", "bool", function(_, val)
-    state.title_bar = val
-    request_init_resize()
-end)
-mp.observe_property("window-maximized", "bool", function(_, val)
-    state.maximized = val
-    request_init_resize()
-end)
-mp.observe_property("idle-active", "bool", function(_, val)
-    state.idle = val
-    request_tick()
-end)
-
-mp.observe_property("display-fps", "number", set_tick_delay)
-mp.observe_property("pause", "bool", pause_state)
-mp.observe_property("demuxer-cache-state", "native", cache_state)
-mp.observe_property("vo-configured", "bool", request_tick)
-mp.observe_property("playback-time", "number", request_tick)
-mp.observe_property("osd-dimensions", "native", function()
-    -- (we could use the value instead of re-querying it all the time, but then
-    --  we might have to worry about property update ordering)
-    request_init_resize()
-end)
-mp.observe_property('osd-scale-by-window', 'native', request_init_resize)
-mp.observe_property('touch-pos', 'native', handle_touch)
-
--- mouse show/hide bindings
-mp.set_key_bindings({
-    {"mouse_move",              function() process_event("mouse_move", nil) end},
-    {"mouse_leave",             mouse_leave},
-}, "showhide", "force")
-mp.set_key_bindings({
-    {"mouse_move",              function() process_event("mouse_move", nil) end},
-    {"mouse_leave",             mouse_leave},
-}, "showhide_wc", "force")
-do_enable_keybindings()
-
---mouse input bindings
-mp.set_key_bindings({
-    {"mbtn_left",           function() process_event("mbtn_left", "up") end,
-                            function() process_event("mbtn_left", "down")  end},
-    {"shift+mbtn_left",     function() process_event("shift+mbtn_left", "up") end,
-                            function() process_event("shift+mbtn_left", "down")  end},
-    {"mbtn_right",          function() process_event("mbtn_right", "up") end,
-                            function() process_event("mbtn_right", "down")  end},
-    -- alias to shift_mbtn_left for single-handed mouse use
-    {"mbtn_mid",            function() process_event("shift+mbtn_left", "up") end,
-                            function() process_event("shift+mbtn_left", "down")  end},
-    {"wheel_up",            function() process_event("wheel_up", "press") end},
-    {"wheel_down",          function() process_event("wheel_down", "press") end},
-    {"mbtn_left_dbl",       "ignore"},
-    {"shift+mbtn_left_dbl", "ignore"},
-    {"mbtn_right_dbl",      "ignore"},
-}, "input", "force")
-mp.enable_key_bindings("input")
-
-mp.set_key_bindings({
-    {"mbtn_left",           function() process_event("mbtn_left", "up") end,
-                            function() process_event("mbtn_left", "down")  end},
-}, "window-controls", "force")
-mp.enable_key_bindings("window-controls")
-
 local function always_on(val)
     if state.enabled then
         if val then
@@ -2981,12 +2877,6 @@ local function idlescreen_visibility(mode, no_osd)
     request_tick()
 end
 
-mp.register_script_message("osc-visibility", visibility_mode)
-mp.register_script_message("osc-show", show_osc)
-mp.add_key_binding(nil, "visibility", function() visibility_mode("cycle") end)
-
-mp.register_script_message("osc-idlescreen", idlescreen_visibility)
-
 -- Validate string type user options
 local function validate_user_opts()
     if layouts[user_opts.layout] == nil then
@@ -3047,6 +2937,111 @@ local function validate_user_opts()
     end
 end
 
+local function load_plugin()
+mp.register_event("shutdown", shutdown)
+mp.register_event("start-file", request_init)
+mp.observe_property("track-list", "native", request_init)
+mp.observe_property("playlist", "native", request_init)
+mp.observe_property("chapter-list", "native", function(_, list)
+    list = list or {}  -- safety, shouldn't return nil
+    table.sort(list, function(a, b) return a.time < b.time end)
+    state.chapter_list = list
+    update_duration_watch()
+    request_init()
+end)
+
+mp.register_script_message("osc-message", show_message)
+mp.register_script_message("osc-chapterlist", function(dur)
+    show_message(get_chapterlist(), dur)
+end)
+mp.register_script_message("osc-playlist", function(dur)
+    show_message(get_playlist(), dur)
+end)
+mp.register_script_message("osc-tracklist", function(dur)
+    local message = {}
+    for k in pairs(nicetypes) do
+        table.insert(message, get_tracklist(k))
+    end
+    show_message(table.concat(message, '\n\n'), dur)
+end)
+
+mp.observe_property("fullscreen", "bool", function(_, val)
+    state.fullscreen = val
+    state.marginsREQ = true
+    request_init_resize()
+end)
+mp.observe_property("border", "bool", function(_, val)
+    state.border = val
+    request_init_resize()
+end)
+mp.observe_property("title-bar", "bool", function(_, val)
+    state.title_bar = val
+    request_init_resize()
+end)
+mp.observe_property("window-maximized", "bool", function(_, val)
+    state.maximized = val
+    request_init_resize()
+end)
+mp.observe_property("idle-active", "bool", function(_, val)
+    state.idle = val
+    request_tick()
+end)
+
+mp.observe_property("display-fps", "number", set_tick_delay)
+mp.observe_property("pause", "bool", pause_state)
+mp.observe_property("demuxer-cache-state", "native", cache_state)
+mp.observe_property("vo-configured", "bool", request_tick)
+mp.observe_property("playback-time", "number", request_tick)
+mp.observe_property("osd-dimensions", "native", function()
+    -- (we could use the value instead of re-querying it all the time, but then
+    --  we might have to worry about property update ordering)
+    request_init_resize()
+end)
+mp.observe_property('osd-scale-by-window', 'native', request_init_resize)
+mp.observe_property('touch-pos', 'native', handle_touch)
+
+-- mouse show/hide bindings
+mp.set_key_bindings({
+    {"mouse_move",              function() process_event("mouse_move", nil) end},
+    {"mouse_leave",             mouse_leave},
+}, "showhide", "force")
+mp.set_key_bindings({
+    {"mouse_move",              function() process_event("mouse_move", nil) end},
+    {"mouse_leave",             mouse_leave},
+}, "showhide_wc", "force")
+do_enable_keybindings()
+
+--mouse input bindings
+mp.set_key_bindings({
+    {"mbtn_left",           function() process_event("mbtn_left", "up") end,
+                            function() process_event("mbtn_left", "down")  end},
+    {"shift+mbtn_left",     function() process_event("shift+mbtn_left", "up") end,
+                            function() process_event("shift+mbtn_left", "down")  end},
+    {"mbtn_right",          function() process_event("mbtn_right", "up") end,
+                            function() process_event("mbtn_right", "down")  end},
+    -- alias to shift_mbtn_left for single-handed mouse use
+    {"mbtn_mid",            function() process_event("shift+mbtn_left", "up") end,
+                            function() process_event("shift+mbtn_left", "down")  end},
+    {"wheel_up",            function() process_event("wheel_up", "press") end},
+    {"wheel_down",          function() process_event("wheel_down", "press") end},
+    {"mbtn_left_dbl",       "ignore"},
+    {"shift+mbtn_left_dbl", "ignore"},
+    {"mbtn_right_dbl",      "ignore"},
+}, "input", "force")
+mp.enable_key_bindings("input")
+
+mp.set_key_bindings({
+    {"mbtn_left",           function() process_event("mbtn_left", "up") end,
+                            function() process_event("mbtn_left", "down")  end},
+}, "window-controls", "force")
+mp.enable_key_bindings("window-controls")
+
+mp.register_script_message("osc-visibility", visibility_mode)
+mp.register_script_message("osc-show", show_osc)
+mp.add_key_binding(nil, "visibility", function() visibility_mode("cycle") end)
+
+mp.register_script_message("osc-idlescreen", idlescreen_visibility)
+
 -- read options from config and command-line
 opt.read_options(user_opts, "osc", function(changed)
     validate_user_opts()
@@ -3071,5 +3066,19 @@ update_duration_watch()
 set_virt_mouse_area(0, 0, 0, 0, "input")
 set_virt_mouse_area(0, 0, 0, 0, "window-controls")
 set_virt_mouse_area(0, 0, 0, 0, "window-controls-title")
+end -- load_plugin
 
-::label_exit::
+-- Disable builtin osc and load self.
+local function builtin_unload_observer()
+    if mp.get_property("user-data/osc/unloading") == nil then
+        msg.debug("Builtin osc unloaded. Loading self...")
+        mp.unobserve_property(builtin_unload_observer)
+        load_plugin()
+    end
+end
+if mp.get_property_bool("osc", true) then
+    msg.debug("Unloading builtin osc")
+    mp.set_property_bool("user-data/osc/unloading", true)
+    mp.observe_property("user-data/osc/unloading", nil, builtin_unload_observer)
+    mp.set_property_bool("osc", false)
+end