diff options
| author | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2015-04-25 18:28:17 +0900 |
|---|---|---|
| committer | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2015-04-25 18:28:17 +0900 |
| commit | 5f1d6b6e5ae515abfb77c78c44d21ee21beb0fc3 (patch) | |
| tree | 6b757d37d296709dfd5955ef9d4d41426cd47da6 /player/lua/osc.lua | |
| parent | d64ff3aa51b49451348383a6ff6de7697a52dc62 (diff) | |
| parent | 983d24e3b9ce9c9c7755279138c14170e85fbf37 (diff) | |
| download | mpv-5f1d6b6e5ae515abfb77c78c44d21ee21beb0fc3.tar.bz2 mpv-5f1d6b6e5ae515abfb77c78c44d21ee21beb0fc3.tar.xz | |
Merge branch 'master' into release/0.9
* master: (87 commits)
manpage: move --autosync description
player: add --window-scale option
player: flush decoder even if cover art is decoded
player: don't show A/V desync message in non-sense situations
w32_common: add more rounded-down frame rates
w32_common: use the current monitor's refresh rate
dxva2: fix broken build with gcc 5.1
terminal: printf() is not signal-safe
man: fix PDF build
DOCS/mplayer-changes: Eleborate on joystick input
osc: add nil check for element.eventresponder
mp_image: remove some unused interlacing flags
vf_vapoursynth: update _FieldBased semantics
options: remove unneeded hack from command line parser
manpage: document ff-index sub-property
demux_mkv: limit timestamp fixing to 1ms max
demux_mkv: attempt to fix rounded timestamps
demux_mkv: move global options to the demuxer
demux_mkv: better seeking after video end
lua: add utils.format_json() function
...
Diffstat (limited to 'player/lua/osc.lua')
| -rw-r--r-- | player/lua/osc.lua | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/player/lua/osc.lua b/player/lua/osc.lua index 26e2f89c5f..7f602b8689 100644 --- a/player/lua/osc.lua +++ b/player/lua/osc.lua @@ -266,11 +266,13 @@ end -- get the currently selected track of <type>, OSC-style counted function get_track(type) local track = mp.get_property(type) - if (track == "no" or track == nil) then - return 0 - else - return tracks_mpv[type][tonumber(track)].osc_id + if track ~= "no" and track ~= nil then + local tr = tracks_mpv[type][tonumber(track)] + if tr then + return tr.osc_id + end end + return 0 end @@ -446,7 +448,7 @@ function render_elements(master_ass) style_ass:append(string.format("{\\1a&H%X&\\2a&H%X&\\3a&H%X&\\4a&H%X&}", ar[1], ar[2], ar[3], ar[4])) - if (state.active_element == n) then + if element.eventresponder and (state.active_element == n) then -- run render event functions if not (element.eventresponder.render == nil) then |