Mirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2025-12-28 05:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

command: deprecate the "length" property

Browse Source 
It collides with the --length option.
This commit is contained in:
wm4
2015-05-22 20:02:47 +02:00
parent c2f9e3d2b3
commit d26803cba0
4 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
player/command.c
View File

@@ -487,9 +487,8 @@ static int property_time(int action, void *arg, double time)
return M_PROPERTY_NOT_IMPLEMENTED;
}
/// Media length in seconds (RO)
static int mp_property_length(void *ctx, struct m_property *prop,
int action, void *arg)
static int mp_property_duration(void *ctx, struct m_property *prop,
int action, void *arg)
{
MPContext *mpctx = ctx;
double len = get_time_length(mpctx);
@@ -3287,7 +3286,8 @@ static const struct m_property mp_properties[] = {
{"file-format", mp_property_file_format},
{"stream-pos", mp_property_stream_pos},
{"stream-end", mp_property_stream_end},
{"length", mp_property_length},
{"duration", mp_property_duration},
M_PROPERTY_DEPRECATED_ALIAS("length", "duration"),
{"avsync", mp_property_avsync},
{"total-avsync-change", mp_property_total_avsync_change},
{"drop-frame-count", mp_property_drop_frame_cnt},

10
player/lua/osc.lua
View File

@@ -1482,7 +1482,7 @@ function osc_init()
ne.enabled = not (mp.get_property("percent-pos") == nil)
ne.slider.markerF = function ()
local duration = mp.get_property_number("length", nil)
local duration = mp.get_property_number("duration", nil)
if not (duration == nil) then
local chapters = mp.get_property_native("chapter-list", {})
local markers = {}
@@ -1497,7 +1497,7 @@ function osc_init()
ne.slider.posF =
function () return mp.get_property_number("percent-pos", nil) end
ne.slider.tooltipF = function (pos)
local duration = mp.get_property_number("length", nil)
local duration = mp.get_property_number("duration", nil)
if not ((duration == nil) or (pos == nil)) then
possec = duration * (pos / 100)
return mp.format_time(possec)
@@ -1542,8 +1542,8 @@ function osc_init()
-- tc_right (total/remaining time)
ne = new_element("tc_right", "button")
ne.visible = (not (mp.get_property("length") == nil))
and (mp.get_property_number("length") > 0)
ne.visible = (not (mp.get_property("duration") == nil))
and (mp.get_property_number("duration") > 0)
ne.content = function ()
if (state.rightTC_trem) then
if state.tc_ms then
@@ -1555,7 +1555,7 @@ function osc_init()
if state.tc_ms then
return (mp.get_property_osd("length/full"))
else
return (mp.get_property_osd("length"))
return (mp.get_property_osd("duration"))
end
end
end