2010-01-30 23:24:23 +00:00
|
|
|
/*
|
2015-04-13 07:36:54 +00:00
|
|
|
* This file is part of mpv.
|
2010-01-30 23:24:23 +00:00
|
|
|
*
|
player: change license of most core files to LGPL
These files have all in common that they were fully or mostly taken from
mplayer.c. (mplayer.c was a huge file that contains almost all of the
playback core, until it was split into multiple parts.) This was
probably the hardest part to relicense, because so much code was moved
around all the time.
player/audio.c still does not compile. We'll have to redo audio
filtering. Once that is done, we can probably actually provide an
actual LGPL configure switch.
Here is a relatively detailed list of potential issues:
8d190244: author did not reply, parts were made GPL-only in a previous
commit.
7882ea9b: author could not be reached, but the code is gone. wscript
still has --datadir switch, but I don't think this is relevant to
copyright.
f197efd5: unclear origin, but I consider the code gone anyway (replaced
with generic OSD mechanisms).
8337d9c2: author did not reply, but only the option still exists (under
a different name), other code was removed.
d8fd7131: did not reply. Disabled in a previous commit.
05258251: same author as above. Both fields actually seem to have
vanished (even when tracking renames), so no action taken.
d459e644, 268b2c1a: author did not reply, but we reuse only the options
(with different names and slightly or fully different semantics, and
completely different implementations), so I don't think this is relevant
for copyright.
09e742fe, 17c39c4e: same as above.
e8a173de, bff4b3ee: author could not be reached. The commands were
reworked to properties, and the code outside of the TV code were moved
back to the TV code. So I don't think copyright applies to the current
command.c parts (mp_property_tv_color, mp_property_tv_freq,
mp_property_tv_scan). The TV parts remain GPL.
0810e427: could not be reached. Disabled in a previous commit.
43744a2d: unknown author, but this was replaced by dynamic alloc (if the
change is even copyrightable).
116ca0c7: unknown author; reasoning see input.c relicensing commit.
e7e4d1d8: these semantics still exist, but as generic code, and this
code was fully removed.
f1175cd9: the author of the cited patch is unknown, and upon inspection
it turns out that I was only using the idea to pause the player on EOF,
so I claim it's not copyright relevant.
25affdcc: author could not be reached (yet) - but it's only a function
rename, not copyrightable.
5728504c was committed by Arpi (who agreed), but hints that it might be
by a different author. In fact it seems to be mostly this patch:
http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2001-November/002041.html
The author did not respond, but it all seems to have been removed later.
It's a terrible mess though. Arpi reverted the A-V sync code at first,
but left the RTC code for a while. The following commits remove these
changes 100%: 14b35442, 7181a091, 31482783, 614f8475, df58e822.
cehoyos did explicitly not agree to LGPL, but was involved in the
following changes:
c99d8fc8: applied a patch and didn't modify it, the original author
agreed.
40ac0d31: author could not be reached, but all code is gone anyway. The
"af" command has a similar function, but works completely different and
actually reuses a mechanism older than this patch.
54350436: applied a patch, but didn't modify it, except for adding a
German translation, which was removed later.
a2dda036: same situation as above
240b743e: this was made GPL-only in a previous commit
7b25afd7: same as above (for now)
kirijua could not be reached, but was a regular patch contributor:
c2c997fd: video equalizer code move; probably not copyrightable. Is GPL
due to Nick anyway.
be54f481: technically, this became the audio track property later. But
all what is left is the fact that you pass a track ID to it, so consider
the original coypright non-relevant.
2f376d1b: this was rewritten in b7052b43, but for now we can afford to
be careful, so this was marked as GPL only in a previous commit.
43844d09: remaining parts in main.c were reverted in a previous commit.
anders has mostly disagreed with the LGPL relicensing. Does not want
libaf to become LGPL, but made some concessions. In particular, he
granted us permission to relicense 4943e9c52c and 242aa6ebd4. We also
consider some of his changes remaining in mpv not relevant for copyright
(such as 735de602 - we won't remove the this option completely). We will
completely remove his other contributions, including the entire audio
filter chain. For now, this stuff is marked as GPL only. The remaining
question is how much code in player/audio.c (based on the former
mplayer.c and dec_audio.c) is under his copyright. I made claims about
this in a previous commit.
Nick(ols) Kurshev, svn username "nick" and "nickols_k", could not be
reached. He had a lot of changes in early MPlayer. It seems all of that
was removed, at least in mpv. His main work, like VIDIX or libswscale
work, does not exist in mpv anymore, but the changes to mplayer.c and
other core parts still deserve attention:
a4119f6b, fb927549, ad3529b8, e11b23dc, 5f2178be, 93c371d5: removed in
b43d67e0, d1628d12, 24ed01fe, df58e822.
0a83c6ec, 104c125e, 4e067f62, aec5dcc8, b587a3d6, f3de6e6b: DR, VAA, and
"tune" stuff was fully removed later on or replaced with other
mechanisms.
340183b0: screenshots were redone later (the VOCTRL was even removed,
with an independent implementation using the same VOCTRL a few years
later), so not relevant anymore. Basically only the 's' shortcut remains
(but not its implementation).
92c5c274, bffd4007, 555c6766: for now marked as GPL only in a previous
commit.
Might contain some trace amounts of "michael"'s copyright, who agreed to
LGPL only once the core is relicensed. This will still be respected, but
I don't think it matters at this in this case. (Some code touched by him
was merged into mplayer.c, and then disappeared after heavy
refactoring.)
I tried to be as careful and as complete as possible. It can't be
excluded that amends to this will be made later.
This does not make the player LGPL yet.
2017-06-23 13:53:41 +00:00
|
|
|
* mpv is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2.1 of the License, or (at your option) any later version.
|
2010-01-30 23:24:23 +00:00
|
|
|
*
|
2015-04-13 07:36:54 +00:00
|
|
|
* mpv is distributed in the hope that it will be useful,
|
2010-01-30 23:24:23 +00:00
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
player: change license of most core files to LGPL
These files have all in common that they were fully or mostly taken from
mplayer.c. (mplayer.c was a huge file that contains almost all of the
playback core, until it was split into multiple parts.) This was
probably the hardest part to relicense, because so much code was moved
around all the time.
player/audio.c still does not compile. We'll have to redo audio
filtering. Once that is done, we can probably actually provide an
actual LGPL configure switch.
Here is a relatively detailed list of potential issues:
8d190244: author did not reply, parts were made GPL-only in a previous
commit.
7882ea9b: author could not be reached, but the code is gone. wscript
still has --datadir switch, but I don't think this is relevant to
copyright.
f197efd5: unclear origin, but I consider the code gone anyway (replaced
with generic OSD mechanisms).
8337d9c2: author did not reply, but only the option still exists (under
a different name), other code was removed.
d8fd7131: did not reply. Disabled in a previous commit.
05258251: same author as above. Both fields actually seem to have
vanished (even when tracking renames), so no action taken.
d459e644, 268b2c1a: author did not reply, but we reuse only the options
(with different names and slightly or fully different semantics, and
completely different implementations), so I don't think this is relevant
for copyright.
09e742fe, 17c39c4e: same as above.
e8a173de, bff4b3ee: author could not be reached. The commands were
reworked to properties, and the code outside of the TV code were moved
back to the TV code. So I don't think copyright applies to the current
command.c parts (mp_property_tv_color, mp_property_tv_freq,
mp_property_tv_scan). The TV parts remain GPL.
0810e427: could not be reached. Disabled in a previous commit.
43744a2d: unknown author, but this was replaced by dynamic alloc (if the
change is even copyrightable).
116ca0c7: unknown author; reasoning see input.c relicensing commit.
e7e4d1d8: these semantics still exist, but as generic code, and this
code was fully removed.
f1175cd9: the author of the cited patch is unknown, and upon inspection
it turns out that I was only using the idea to pause the player on EOF,
so I claim it's not copyright relevant.
25affdcc: author could not be reached (yet) - but it's only a function
rename, not copyrightable.
5728504c was committed by Arpi (who agreed), but hints that it might be
by a different author. In fact it seems to be mostly this patch:
http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2001-November/002041.html
The author did not respond, but it all seems to have been removed later.
It's a terrible mess though. Arpi reverted the A-V sync code at first,
but left the RTC code for a while. The following commits remove these
changes 100%: 14b35442, 7181a091, 31482783, 614f8475, df58e822.
cehoyos did explicitly not agree to LGPL, but was involved in the
following changes:
c99d8fc8: applied a patch and didn't modify it, the original author
agreed.
40ac0d31: author could not be reached, but all code is gone anyway. The
"af" command has a similar function, but works completely different and
actually reuses a mechanism older than this patch.
54350436: applied a patch, but didn't modify it, except for adding a
German translation, which was removed later.
a2dda036: same situation as above
240b743e: this was made GPL-only in a previous commit
7b25afd7: same as above (for now)
kirijua could not be reached, but was a regular patch contributor:
c2c997fd: video equalizer code move; probably not copyrightable. Is GPL
due to Nick anyway.
be54f481: technically, this became the audio track property later. But
all what is left is the fact that you pass a track ID to it, so consider
the original coypright non-relevant.
2f376d1b: this was rewritten in b7052b43, but for now we can afford to
be careful, so this was marked as GPL only in a previous commit.
43844d09: remaining parts in main.c were reverted in a previous commit.
anders has mostly disagreed with the LGPL relicensing. Does not want
libaf to become LGPL, but made some concessions. In particular, he
granted us permission to relicense 4943e9c52c and 242aa6ebd4. We also
consider some of his changes remaining in mpv not relevant for copyright
(such as 735de602 - we won't remove the this option completely). We will
completely remove his other contributions, including the entire audio
filter chain. For now, this stuff is marked as GPL only. The remaining
question is how much code in player/audio.c (based on the former
mplayer.c and dec_audio.c) is under his copyright. I made claims about
this in a previous commit.
Nick(ols) Kurshev, svn username "nick" and "nickols_k", could not be
reached. He had a lot of changes in early MPlayer. It seems all of that
was removed, at least in mpv. His main work, like VIDIX or libswscale
work, does not exist in mpv anymore, but the changes to mplayer.c and
other core parts still deserve attention:
a4119f6b, fb927549, ad3529b8, e11b23dc, 5f2178be, 93c371d5: removed in
b43d67e0, d1628d12, 24ed01fe, df58e822.
0a83c6ec, 104c125e, 4e067f62, aec5dcc8, b587a3d6, f3de6e6b: DR, VAA, and
"tune" stuff was fully removed later on or replaced with other
mechanisms.
340183b0: screenshots were redone later (the VOCTRL was even removed,
with an independent implementation using the same VOCTRL a few years
later), so not relevant anymore. Basically only the 's' shortcut remains
(but not its implementation).
92c5c274, bffd4007, 555c6766: for now marked as GPL only in a previous
commit.
Might contain some trace amounts of "michael"'s copyright, who agreed to
LGPL only once the core is relicensed. This will still be respected, but
I don't think it matters at this in this case. (Some code touched by him
was merged into mplayer.c, and then disappeared after heavy
refactoring.)
I tried to be as careful and as complete as possible. It can't be
excluded that amends to this will be made later.
This does not make the player LGPL yet.
2017-06-23 13:53:41 +00:00
|
|
|
* GNU Lesser General Public License for more details.
|
2010-01-30 23:24:23 +00:00
|
|
|
*
|
player: change license of most core files to LGPL
These files have all in common that they were fully or mostly taken from
mplayer.c. (mplayer.c was a huge file that contains almost all of the
playback core, until it was split into multiple parts.) This was
probably the hardest part to relicense, because so much code was moved
around all the time.
player/audio.c still does not compile. We'll have to redo audio
filtering. Once that is done, we can probably actually provide an
actual LGPL configure switch.
Here is a relatively detailed list of potential issues:
8d190244: author did not reply, parts were made GPL-only in a previous
commit.
7882ea9b: author could not be reached, but the code is gone. wscript
still has --datadir switch, but I don't think this is relevant to
copyright.
f197efd5: unclear origin, but I consider the code gone anyway (replaced
with generic OSD mechanisms).
8337d9c2: author did not reply, but only the option still exists (under
a different name), other code was removed.
d8fd7131: did not reply. Disabled in a previous commit.
05258251: same author as above. Both fields actually seem to have
vanished (even when tracking renames), so no action taken.
d459e644, 268b2c1a: author did not reply, but we reuse only the options
(with different names and slightly or fully different semantics, and
completely different implementations), so I don't think this is relevant
for copyright.
09e742fe, 17c39c4e: same as above.
e8a173de, bff4b3ee: author could not be reached. The commands were
reworked to properties, and the code outside of the TV code were moved
back to the TV code. So I don't think copyright applies to the current
command.c parts (mp_property_tv_color, mp_property_tv_freq,
mp_property_tv_scan). The TV parts remain GPL.
0810e427: could not be reached. Disabled in a previous commit.
43744a2d: unknown author, but this was replaced by dynamic alloc (if the
change is even copyrightable).
116ca0c7: unknown author; reasoning see input.c relicensing commit.
e7e4d1d8: these semantics still exist, but as generic code, and this
code was fully removed.
f1175cd9: the author of the cited patch is unknown, and upon inspection
it turns out that I was only using the idea to pause the player on EOF,
so I claim it's not copyright relevant.
25affdcc: author could not be reached (yet) - but it's only a function
rename, not copyrightable.
5728504c was committed by Arpi (who agreed), but hints that it might be
by a different author. In fact it seems to be mostly this patch:
http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2001-November/002041.html
The author did not respond, but it all seems to have been removed later.
It's a terrible mess though. Arpi reverted the A-V sync code at first,
but left the RTC code for a while. The following commits remove these
changes 100%: 14b35442, 7181a091, 31482783, 614f8475, df58e822.
cehoyos did explicitly not agree to LGPL, but was involved in the
following changes:
c99d8fc8: applied a patch and didn't modify it, the original author
agreed.
40ac0d31: author could not be reached, but all code is gone anyway. The
"af" command has a similar function, but works completely different and
actually reuses a mechanism older than this patch.
54350436: applied a patch, but didn't modify it, except for adding a
German translation, which was removed later.
a2dda036: same situation as above
240b743e: this was made GPL-only in a previous commit
7b25afd7: same as above (for now)
kirijua could not be reached, but was a regular patch contributor:
c2c997fd: video equalizer code move; probably not copyrightable. Is GPL
due to Nick anyway.
be54f481: technically, this became the audio track property later. But
all what is left is the fact that you pass a track ID to it, so consider
the original coypright non-relevant.
2f376d1b: this was rewritten in b7052b43, but for now we can afford to
be careful, so this was marked as GPL only in a previous commit.
43844d09: remaining parts in main.c were reverted in a previous commit.
anders has mostly disagreed with the LGPL relicensing. Does not want
libaf to become LGPL, but made some concessions. In particular, he
granted us permission to relicense 4943e9c52c and 242aa6ebd4. We also
consider some of his changes remaining in mpv not relevant for copyright
(such as 735de602 - we won't remove the this option completely). We will
completely remove his other contributions, including the entire audio
filter chain. For now, this stuff is marked as GPL only. The remaining
question is how much code in player/audio.c (based on the former
mplayer.c and dec_audio.c) is under his copyright. I made claims about
this in a previous commit.
Nick(ols) Kurshev, svn username "nick" and "nickols_k", could not be
reached. He had a lot of changes in early MPlayer. It seems all of that
was removed, at least in mpv. His main work, like VIDIX or libswscale
work, does not exist in mpv anymore, but the changes to mplayer.c and
other core parts still deserve attention:
a4119f6b, fb927549, ad3529b8, e11b23dc, 5f2178be, 93c371d5: removed in
b43d67e0, d1628d12, 24ed01fe, df58e822.
0a83c6ec, 104c125e, 4e067f62, aec5dcc8, b587a3d6, f3de6e6b: DR, VAA, and
"tune" stuff was fully removed later on or replaced with other
mechanisms.
340183b0: screenshots were redone later (the VOCTRL was even removed,
with an independent implementation using the same VOCTRL a few years
later), so not relevant anymore. Basically only the 's' shortcut remains
(but not its implementation).
92c5c274, bffd4007, 555c6766: for now marked as GPL only in a previous
commit.
Might contain some trace amounts of "michael"'s copyright, who agreed to
LGPL only once the core is relicensed. This will still be respected, but
I don't think it matters at this in this case. (Some code touched by him
was merged into mplayer.c, and then disappeared after heavy
refactoring.)
I tried to be as careful and as complete as possible. It can't be
excluded that amends to this will be made later.
This does not make the player LGPL yet.
2017-06-23 13:53:41 +00:00
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
|
|
* License along with mpv. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*
|
|
|
|
* Parts under HAVE_GPL are licensed under GNU General Public License.
|
2010-01-30 23:24:23 +00:00
|
|
|
*/
|
|
|
|
|
2007-02-21 00:49:24 +00:00
|
|
|
#include <stdlib.h>
|
|
|
|
#include <inttypes.h>
|
|
|
|
#include <unistd.h>
|
2007-03-09 14:04:07 +00:00
|
|
|
#include <string.h>
|
2008-11-29 06:09:57 +00:00
|
|
|
#include <stdbool.h>
|
2012-02-10 18:03:24 +00:00
|
|
|
#include <assert.h>
|
2013-06-04 11:33:01 +00:00
|
|
|
#include <time.h>
|
2014-11-28 23:34:53 +00:00
|
|
|
#include <math.h>
|
2014-04-05 21:54:21 +00:00
|
|
|
#include <pthread.h>
|
2013-11-30 21:47:17 +00:00
|
|
|
#include <sys/types.h>
|
2007-02-21 00:49:24 +00:00
|
|
|
|
2013-06-27 16:21:07 +00:00
|
|
|
#include <libavutil/avstring.h>
|
|
|
|
#include <libavutil/common.h>
|
|
|
|
|
2007-02-21 00:49:24 +00:00
|
|
|
#include "config.h"
|
2016-01-11 18:03:40 +00:00
|
|
|
#include "mpv_talloc.h"
|
2014-02-10 20:01:35 +00:00
|
|
|
#include "client.h"
|
2016-03-01 20:46:49 +00:00
|
|
|
#include "common/av_common.h"
|
2016-02-29 19:57:31 +00:00
|
|
|
#include "common/codecs.h"
|
2014-01-16 20:24:39 +00:00
|
|
|
#include "common/msg.h"
|
|
|
|
#include "common/msg_control.h"
|
2008-03-28 01:07:59 +00:00
|
|
|
#include "command.h"
|
2013-12-01 01:07:32 +00:00
|
|
|
#include "osdep/timer.h"
|
2013-12-17 01:39:45 +00:00
|
|
|
#include "common/common.h"
|
2013-12-17 00:23:09 +00:00
|
|
|
#include "input/input.h"
|
2015-01-23 20:45:13 +00:00
|
|
|
#include "input/keycodes.h"
|
2007-02-21 00:49:24 +00:00
|
|
|
#include "stream/stream.h"
|
2012-11-09 00:06:43 +00:00
|
|
|
#include "demux/demux.h"
|
|
|
|
#include "demux/stheader.h"
|
2013-12-17 01:39:45 +00:00
|
|
|
#include "common/playlist.h"
|
2013-11-24 11:58:06 +00:00
|
|
|
#include "sub/osd.h"
|
2011-01-16 18:03:08 +00:00
|
|
|
#include "sub/dec_sub.h"
|
2013-12-17 01:02:25 +00:00
|
|
|
#include "options/m_option.h"
|
|
|
|
#include "options/m_property.h"
|
|
|
|
#include "options/m_config.h"
|
2012-11-09 00:06:43 +00:00
|
|
|
#include "video/filter/vf.h"
|
|
|
|
#include "video/decode/vd.h"
|
|
|
|
#include "video/out/vo.h"
|
|
|
|
#include "video/csputils.h"
|
audio: introduce a new type to hold audio frames
This is pretty pointless, but I believe it allows us to claim that the
new code is not affected by the copyright of the old code. This is
needed, because the original mp_audio struct was written by someone who
has disagreed with LGPL relicensing (it was called af_data at the time,
and was defined in af.h).
The "GPL'ed" struct contents that surive are pretty trivial: just the
data pointer, and some metadata like the format, samplerate, etc. - but
at least in this case, any new code would be extremely similar anyway,
and I'm not really sure whether it's OK to claim different copyright. So
what we do is we just use AVFrame (which of course is LGPL with 100%
certainty), and add some accessors around it to adapt it to mpv
conventions.
Also, this gets rid of some annoying conventions of mp_audio, like the
struct fields that require using an accessor to write to them anyway.
For the most part, this change is only dumb replacements of mp_audio
related functions and fields. One minor actual change is that you can't
allocate the new type on the stack anymore.
Some code still uses mp_audio. All audio filter code will be deleted, so
it makes no sense to convert this code. (Audio filters which are LGPL
and which we keep will have to be ported to a new filter infrastructure
anyway.) player/audio.c uses it because it interacts with the old filter
code. push.c has some complex use of mp_audio and mp_audio_buffer, but
this and pull.c will most likely be rewritten to do something else.
2017-08-16 19:00:20 +00:00
|
|
|
#include "audio/aframe.h"
|
2017-09-21 10:48:30 +00:00
|
|
|
#include "audio/format.h"
|
2012-11-09 00:06:43 +00:00
|
|
|
#include "audio/out/ao.h"
|
|
|
|
#include "video/decode/dec_video.h"
|
|
|
|
#include "audio/decode/dec_audio.h"
|
2016-07-01 17:39:04 +00:00
|
|
|
#include "video/out/bitmap_packer.h"
|
2013-12-17 01:02:25 +00:00
|
|
|
#include "options/path.h"
|
2011-10-06 18:46:01 +00:00
|
|
|
#include "screenshot.h"
|
vo_opengl: refactor vo performance subsystem
This replaces `vo-performance` by `vo-passes`, bringing with it a number
of changes and improvements:
1. mpv users can now introspect the vo_opengl passes, which is something
that has been requested multiple times.
2. performance data is now measured per-pass, which helps both
development and debugging.
3. since adding more passes is cheap, we can now report information for
more passes (e.g. the blit pass, and the osd pass). Note: we also
switch to nanosecond scale, to be able to measure these passes
better.
4. `--user-shaders` authors can now describe their own passes, helping
users both identify which user shaders are active at any given time
as well as helping shader authors identify performance issues.
5. the timing data per pass is now exported as a full list of samples,
so projects like Argon-/mpv-stats can immediately read out all of the
samples and render a graph without having to manually poll this
option constantly.
Due to gl_timer's design being complicated (directly reading performance
data would block, so we delay the actual read-back until the next _start
command), it's vital not to conflate different passes that might be
doing different things from one frame to another. To accomplish this,
the actual timers are stored as part of the gl_shader_cache's sc_entry,
which makes them unique for that exact shader.
Starting and stopping the time measurement is easy to unify with the
gl_sc architecture, because the existing API already relies on a
"generate, render, reset" flow, so we can just put timer_start and
timer_stop in sc_generate and sc_reset, respectively.
The ugliest thing about this code is that due to the need to keep pass
information relatively stable in between frames, we need to distinguish
between "new" and "redrawn" frames, which bloats the code somewhat and
also feels hacky and vo_opengl-specific. (But then again, this entire
thing is vo_opengl-specific)
2017-06-29 15:00:06 +00:00
|
|
|
#include "misc/node.h"
|
2007-02-21 00:49:24 +00:00
|
|
|
|
2013-11-30 21:40:51 +00:00
|
|
|
#include "osdep/io.h"
|
2015-01-01 19:37:49 +00:00
|
|
|
#include "osdep/subprocess.h"
|
2013-11-30 21:40:51 +00:00
|
|
|
|
2013-12-17 00:08:53 +00:00
|
|
|
#include "core.h"
|
Add initial Lua scripting support
This is preliminary. There are still tons of issues, and any aspect
of scripting may change in the future. I decided to merge this
(preliminary) work now because it makes it easier to develop it, not
because it's done. lua.rst is clear enough about it (plus some
sarcasm).
This requires linking to Lua. Lua has no official pkg-config file, but
there are distribution specific .pc files, all with different names.
Adding a non-pkg-config based configure test was considered, but we'd
rather not.
One major complication is that libquvi links against Lua too, and if
the Lua version is different from mpv's, you will get a crash as soon
as libquvi uses Lua. (libquvi by design always runs when a file is
opened.) I would consider this the problem of distros and whoever
builds mpv, but to make things easier for users, we add a terrible
runtime test to the configure script, which probes whether libquvi
will crash. This is disabled when cross-compiling, but in that case
we hope the user knows what he is doing.
2013-09-25 22:41:14 +00:00
|
|
|
|
2017-09-21 10:48:30 +00:00
|
|
|
#if HAVE_LIBAF
|
|
|
|
#include "audio/filter/af.h"
|
|
|
|
#endif
|
|
|
|
|
2016-09-28 11:47:30 +00:00
|
|
|
#ifdef _WIN32
|
|
|
|
#include <windows.h>
|
|
|
|
#endif
|
|
|
|
|
2013-09-30 20:27:37 +00:00
|
|
|
struct command_ctx {
|
2016-09-01 18:00:43 +00:00
|
|
|
// All properties, terminated with a {0} item.
|
|
|
|
struct m_property *properties;
|
|
|
|
|
2014-12-10 13:42:57 +00:00
|
|
|
bool is_idle;
|
|
|
|
|
2013-12-01 01:07:32 +00:00
|
|
|
double last_seek_time;
|
|
|
|
double last_seek_pts;
|
2014-12-17 21:56:45 +00:00
|
|
|
double marked_pts;
|
2013-12-01 01:07:32 +00:00
|
|
|
|
2015-05-22 18:01:12 +00:00
|
|
|
char **warned_deprecated;
|
|
|
|
int num_warned_deprecated;
|
|
|
|
|
2013-11-29 23:18:24 +00:00
|
|
|
struct cycle_counter *cycle_counters;
|
|
|
|
int num_cycle_counters;
|
|
|
|
|
2014-10-02 23:22:07 +00:00
|
|
|
struct overlay *overlays;
|
2014-07-25 12:22:40 +00:00
|
|
|
int num_overlays;
|
|
|
|
// One of these is in use by the OSD; the other one exists so that the
|
|
|
|
// bitmap list can be manipulated without additional synchronization.
|
|
|
|
struct sub_bitmaps overlay_osd[2];
|
2016-07-01 17:39:04 +00:00
|
|
|
int overlay_osd_current;
|
|
|
|
struct bitmap_packer *overlay_packer;
|
2014-10-10 17:46:21 +00:00
|
|
|
|
command: add a mechanism to allow scripts to intercept file loads
A vague idea to get something similar what libquvi did.
Undocumented because it might change a lot, or even be removed. To give
an idea what it does, a Lua script could do the following:
-- type ID priority
mp.commandv("hook_add", "on_load", 0, 0)
mp.register_script_message("hook_run", function(param, param2)
-- param is "0", the user-chosen ID from the hook_add command
-- param2 is the magic value that has to be passed to finish
-- the hook
mp.resume_all()
-- do something, maybe set options that are reset on end:
mp.set_property("file-local-options/name", "value")
-- or change the URL that's being opened:
local url = mp.get_property("stream-open-filename")
mp.set_property("stream-open-filename", url .. ".png")
-- let the player (or the next script) continue
mp.commandv("hook_ack", param2)
end)
2014-10-15 21:09:53 +00:00
|
|
|
struct hook_handler **hooks;
|
|
|
|
int num_hooks;
|
|
|
|
int64_t hook_seq; // for hook_handler.seq
|
|
|
|
|
2015-02-12 15:53:56 +00:00
|
|
|
struct ao_hotplug *hotplug;
|
2016-09-21 13:56:54 +00:00
|
|
|
|
|
|
|
char *cur_ipc;
|
|
|
|
char *cur_ipc_input;
|
command: silence deprecation warnings with --reset-on-next-file=all
--reset-on-next-file=all triggers m_config_backup_all_opts(), which
backups all options (even deprecated ones). Later, when the option
values are reset with m_config_restore_backups(), mp_on_set_option() is
called, which in turn calls mp_property_do_silent(), which in turn will
call mp_property_generic_option() and m_config_get_co(), which triggers
the deprecation message.
Unfortunately there's no good way to determine whether an option has
actually changed (there's no option value compare operation), so the
deprecated options have to be set no matter what. On the other hand, we
can't pass through additional flags through the property layer. So we
add a dumb global flag to silence the deprecation warnings in these
cases.
Fortunately m_config_get_co_raw() works to silence the warnings.
m_config_get_co() also resolves aliases (deprecated and non-deprecated),
but aliased options are handled differently by the option-property
bridge, so we don't need to do that here, so the only purpose of it is
to trigger a warning for deprecated (non-alias) options.
2016-10-22 14:02:52 +00:00
|
|
|
|
|
|
|
int silence_option_deprecations;
|
2013-09-30 20:27:37 +00:00
|
|
|
};
|
|
|
|
|
2014-10-02 23:22:07 +00:00
|
|
|
struct overlay {
|
2016-07-01 17:39:04 +00:00
|
|
|
struct mp_image *source;
|
|
|
|
int x, y;
|
2014-10-02 23:22:07 +00:00
|
|
|
};
|
|
|
|
|
command: add a mechanism to allow scripts to intercept file loads
A vague idea to get something similar what libquvi did.
Undocumented because it might change a lot, or even be removed. To give
an idea what it does, a Lua script could do the following:
-- type ID priority
mp.commandv("hook_add", "on_load", 0, 0)
mp.register_script_message("hook_run", function(param, param2)
-- param is "0", the user-chosen ID from the hook_add command
-- param2 is the magic value that has to be passed to finish
-- the hook
mp.resume_all()
-- do something, maybe set options that are reset on end:
mp.set_property("file-local-options/name", "value")
-- or change the URL that's being opened:
local url = mp.get_property("stream-open-filename")
mp.set_property("stream-open-filename", url .. ".png")
-- let the player (or the next script) continue
mp.commandv("hook_ack", param2)
end)
2014-10-15 21:09:53 +00:00
|
|
|
struct hook_handler {
|
|
|
|
char *client; // client API user name
|
|
|
|
char *type; // kind of hook, e.g. "on_load"
|
|
|
|
char *user_id; // numeric user-chosen ID, printed as string
|
|
|
|
int priority; // priority for global hook order
|
|
|
|
int64_t seq; // unique ID (also age -> fixed order for equal priorities)
|
|
|
|
bool active; // hook is currently in progress (only 1 at a time for now)
|
|
|
|
};
|
|
|
|
|
2016-05-03 20:41:53 +00:00
|
|
|
// U+279C HEAVY ROUND-TIPPED RIGHTWARDS ARROW
|
2016-05-04 19:51:35 +00:00
|
|
|
// U+00A0 NO-BREAK SPACE
|
|
|
|
#define ARROW_SP "\342\236\234\302\240"
|
2016-05-03 20:41:53 +00:00
|
|
|
|
|
|
|
const char list_current[] = OSD_ASS_0 ARROW_SP OSD_ASS_1;
|
|
|
|
const char list_normal[] = OSD_ASS_0 "{\\alpha&HFF}" ARROW_SP "{\\r}" OSD_ASS_1;
|
|
|
|
|
2015-07-21 19:54:15 +00:00
|
|
|
static int edit_filters(struct MPContext *mpctx, struct mp_log *log,
|
|
|
|
enum stream_type mediatype,
|
2013-09-20 13:09:29 +00:00
|
|
|
const char *cmd, const char *arg);
|
2013-08-03 11:41:38 +00:00
|
|
|
static int set_filters(struct MPContext *mpctx, enum stream_type mediatype,
|
|
|
|
struct m_obj_settings *new_chain);
|
command: auto-insert yadif when switching deinterlacing
If VO deinterlacing is unavailable, try to insert vf_yadif.
If vf_lavfi is available, actually use vf_yadif from libavfilter. The
libavfilter version of this filter is faster, more correct, etc., so it
is preferred. Unfortunately vf_yadif obviously doesn't support
VFCTRL_GET/SET_DEINTERLACE, and with the current state of the
libavfilter API, it doesn't look like there is any simple way to
emulate it. Instead, we simply insert the filter with a specific label,
and if deinterlacing is to be disabled, the filter is removed again by
label.
This won't do the right thing if the user inserts any deinterlacing
filter manually (except native vf_yadif, which understands the VFCTRL).
For example, with '-vf lavfi=yadif', pressing 'D' (toggle deinterlacing)
will just insert a second deinterlacer filter. In these cases, the user
is supposed to map a command that toggles his own filter instead of
using 'D' and the deinterlace property.
The same applies if the user wants to pass different parameters to the
deinterlacer filters.
2013-05-22 21:37:39 +00:00
|
|
|
|
2016-09-17 18:48:22 +00:00
|
|
|
static int mp_property_do_silent(const char *name, int action, void *val,
|
|
|
|
struct MPContext *ctx);
|
|
|
|
|
2014-10-24 19:52:16 +00:00
|
|
|
static void hook_remove(struct MPContext *mpctx, int index)
|
|
|
|
{
|
|
|
|
struct command_ctx *cmd = mpctx->command_ctx;
|
|
|
|
assert(index >= 0 && index < cmd->num_hooks);
|
|
|
|
talloc_free(cmd->hooks[index]);
|
|
|
|
MP_TARRAY_REMOVE_AT(cmd->hooks, cmd->num_hooks, index);
|
|
|
|
}
|
|
|
|
|
command: add a mechanism to allow scripts to intercept file loads
A vague idea to get something similar what libquvi did.
Undocumented because it might change a lot, or even be removed. To give
an idea what it does, a Lua script could do the following:
-- type ID priority
mp.commandv("hook_add", "on_load", 0, 0)
mp.register_script_message("hook_run", function(param, param2)
-- param is "0", the user-chosen ID from the hook_add command
-- param2 is the magic value that has to be passed to finish
-- the hook
mp.resume_all()
-- do something, maybe set options that are reset on end:
mp.set_property("file-local-options/name", "value")
-- or change the URL that's being opened:
local url = mp.get_property("stream-open-filename")
mp.set_property("stream-open-filename", url .. ".png")
-- let the player (or the next script) continue
mp.commandv("hook_ack", param2)
end)
2014-10-15 21:09:53 +00:00
|
|
|
bool mp_hook_test_completion(struct MPContext *mpctx, char *type)
|
|
|
|
{
|
|
|
|
struct command_ctx *cmd = mpctx->command_ctx;
|
|
|
|
for (int n = 0; n < cmd->num_hooks; n++) {
|
|
|
|
struct hook_handler *h = cmd->hooks[n];
|
2014-10-24 19:52:16 +00:00
|
|
|
if (h->active && strcmp(h->type, type) == 0) {
|
|
|
|
if (!mp_client_exists(mpctx, h->client)) {
|
|
|
|
hook_remove(mpctx, n);
|
|
|
|
break;
|
|
|
|
}
|
command: add a mechanism to allow scripts to intercept file loads
A vague idea to get something similar what libquvi did.
Undocumented because it might change a lot, or even be removed. To give
an idea what it does, a Lua script could do the following:
-- type ID priority
mp.commandv("hook_add", "on_load", 0, 0)
mp.register_script_message("hook_run", function(param, param2)
-- param is "0", the user-chosen ID from the hook_add command
-- param2 is the magic value that has to be passed to finish
-- the hook
mp.resume_all()
-- do something, maybe set options that are reset on end:
mp.set_property("file-local-options/name", "value")
-- or change the URL that's being opened:
local url = mp.get_property("stream-open-filename")
mp.set_property("stream-open-filename", url .. ".png")
-- let the player (or the next script) continue
mp.commandv("hook_ack", param2)
end)
2014-10-15 21:09:53 +00:00
|
|
|
return false;
|
2014-10-24 19:52:16 +00:00
|
|
|
}
|
command: add a mechanism to allow scripts to intercept file loads
A vague idea to get something similar what libquvi did.
Undocumented because it might change a lot, or even be removed. To give
an idea what it does, a Lua script could do the following:
-- type ID priority
mp.commandv("hook_add", "on_load", 0, 0)
mp.register_script_message("hook_run", function(param, param2)
-- param is "0", the user-chosen ID from the hook_add command
-- param2 is the magic value that has to be passed to finish
-- the hook
mp.resume_all()
-- do something, maybe set options that are reset on end:
mp.set_property("file-local-options/name", "value")
-- or change the URL that's being opened:
local url = mp.get_property("stream-open-filename")
mp.set_property("stream-open-filename", url .. ".png")
-- let the player (or the next script) continue
mp.commandv("hook_ack", param2)
end)
2014-10-15 21:09:53 +00:00
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool send_hook_msg(struct MPContext *mpctx, struct hook_handler *h,
|
|
|
|
char *cmd)
|
|
|
|
{
|
|
|
|
mpv_event_client_message *m = talloc_ptrtype(NULL, m);
|
|
|
|
*m = (mpv_event_client_message){0};
|
2014-10-20 21:43:10 +00:00
|
|
|
MP_TARRAY_APPEND(m, m->args, m->num_args, cmd);
|
command: add a mechanism to allow scripts to intercept file loads
A vague idea to get something similar what libquvi did.
Undocumented because it might change a lot, or even be removed. To give
an idea what it does, a Lua script could do the following:
-- type ID priority
mp.commandv("hook_add", "on_load", 0, 0)
mp.register_script_message("hook_run", function(param, param2)
-- param is "0", the user-chosen ID from the hook_add command
-- param2 is the magic value that has to be passed to finish
-- the hook
mp.resume_all()
-- do something, maybe set options that are reset on end:
mp.set_property("file-local-options/name", "value")
-- or change the URL that's being opened:
local url = mp.get_property("stream-open-filename")
mp.set_property("stream-open-filename", url .. ".png")
-- let the player (or the next script) continue
mp.commandv("hook_ack", param2)
end)
2014-10-15 21:09:53 +00:00
|
|
|
MP_TARRAY_APPEND(m, m->args, m->num_args, talloc_strdup(m, h->user_id));
|
|
|
|
MP_TARRAY_APPEND(m, m->args, m->num_args, talloc_strdup(m, h->type));
|
|
|
|
bool r =
|
|
|
|
mp_client_send_event(mpctx, h->client, MPV_EVENT_CLIENT_MESSAGE, m) >= 0;
|
|
|
|
if (!r)
|
|
|
|
MP_WARN(mpctx, "Sending hook command failed.\n");
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
// client==NULL means start the hook chain
|
|
|
|
void mp_hook_run(struct MPContext *mpctx, char *client, char *type)
|
|
|
|
{
|
|
|
|
struct command_ctx *cmd = mpctx->command_ctx;
|
|
|
|
bool found_current = !client;
|
2014-10-24 19:52:16 +00:00
|
|
|
int index = -1;
|
command: add a mechanism to allow scripts to intercept file loads
A vague idea to get something similar what libquvi did.
Undocumented because it might change a lot, or even be removed. To give
an idea what it does, a Lua script could do the following:
-- type ID priority
mp.commandv("hook_add", "on_load", 0, 0)
mp.register_script_message("hook_run", function(param, param2)
-- param is "0", the user-chosen ID from the hook_add command
-- param2 is the magic value that has to be passed to finish
-- the hook
mp.resume_all()
-- do something, maybe set options that are reset on end:
mp.set_property("file-local-options/name", "value")
-- or change the URL that's being opened:
local url = mp.get_property("stream-open-filename")
mp.set_property("stream-open-filename", url .. ".png")
-- let the player (or the next script) continue
mp.commandv("hook_ack", param2)
end)
2014-10-15 21:09:53 +00:00
|
|
|
for (int n = 0; n < cmd->num_hooks; n++) {
|
|
|
|
struct hook_handler *h = cmd->hooks[n];
|
|
|
|
if (!found_current) {
|
|
|
|
if (h->active && strcmp(h->type, type) == 0) {
|
|
|
|
h->active = false;
|
|
|
|
found_current = true;
|
2016-09-16 13:51:56 +00:00
|
|
|
mp_wakeup_core(mpctx);
|
command: add a mechanism to allow scripts to intercept file loads
A vague idea to get something similar what libquvi did.
Undocumented because it might change a lot, or even be removed. To give
an idea what it does, a Lua script could do the following:
-- type ID priority
mp.commandv("hook_add", "on_load", 0, 0)
mp.register_script_message("hook_run", function(param, param2)
-- param is "0", the user-chosen ID from the hook_add command
-- param2 is the magic value that has to be passed to finish
-- the hook
mp.resume_all()
-- do something, maybe set options that are reset on end:
mp.set_property("file-local-options/name", "value")
-- or change the URL that's being opened:
local url = mp.get_property("stream-open-filename")
mp.set_property("stream-open-filename", url .. ".png")
-- let the player (or the next script) continue
mp.commandv("hook_ack", param2)
end)
2014-10-15 21:09:53 +00:00
|
|
|
}
|
|
|
|
} else if (strcmp(h->type, type) == 0) {
|
2014-10-24 19:52:16 +00:00
|
|
|
index = n;
|
command: add a mechanism to allow scripts to intercept file loads
A vague idea to get something similar what libquvi did.
Undocumented because it might change a lot, or even be removed. To give
an idea what it does, a Lua script could do the following:
-- type ID priority
mp.commandv("hook_add", "on_load", 0, 0)
mp.register_script_message("hook_run", function(param, param2)
-- param is "0", the user-chosen ID from the hook_add command
-- param2 is the magic value that has to be passed to finish
-- the hook
mp.resume_all()
-- do something, maybe set options that are reset on end:
mp.set_property("file-local-options/name", "value")
-- or change the URL that's being opened:
local url = mp.get_property("stream-open-filename")
mp.set_property("stream-open-filename", url .. ".png")
-- let the player (or the next script) continue
mp.commandv("hook_ack", param2)
end)
2014-10-15 21:09:53 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2014-10-24 19:52:16 +00:00
|
|
|
if (index < 0)
|
command: add a mechanism to allow scripts to intercept file loads
A vague idea to get something similar what libquvi did.
Undocumented because it might change a lot, or even be removed. To give
an idea what it does, a Lua script could do the following:
-- type ID priority
mp.commandv("hook_add", "on_load", 0, 0)
mp.register_script_message("hook_run", function(param, param2)
-- param is "0", the user-chosen ID from the hook_add command
-- param2 is the magic value that has to be passed to finish
-- the hook
mp.resume_all()
-- do something, maybe set options that are reset on end:
mp.set_property("file-local-options/name", "value")
-- or change the URL that's being opened:
local url = mp.get_property("stream-open-filename")
mp.set_property("stream-open-filename", url .. ".png")
-- let the player (or the next script) continue
mp.commandv("hook_ack", param2)
end)
2014-10-15 21:09:53 +00:00
|
|
|
return;
|
2014-10-24 19:52:16 +00:00
|
|
|
struct hook_handler *next = cmd->hooks[index];
|
command: add a mechanism to allow scripts to intercept file loads
A vague idea to get something similar what libquvi did.
Undocumented because it might change a lot, or even be removed. To give
an idea what it does, a Lua script could do the following:
-- type ID priority
mp.commandv("hook_add", "on_load", 0, 0)
mp.register_script_message("hook_run", function(param, param2)
-- param is "0", the user-chosen ID from the hook_add command
-- param2 is the magic value that has to be passed to finish
-- the hook
mp.resume_all()
-- do something, maybe set options that are reset on end:
mp.set_property("file-local-options/name", "value")
-- or change the URL that's being opened:
local url = mp.get_property("stream-open-filename")
mp.set_property("stream-open-filename", url .. ".png")
-- let the player (or the next script) continue
mp.commandv("hook_ack", param2)
end)
2014-10-15 21:09:53 +00:00
|
|
|
MP_VERBOSE(mpctx, "Running hook: %s/%s\n", next->client, type);
|
|
|
|
next->active = true;
|
2014-10-24 19:52:16 +00:00
|
|
|
if (!send_hook_msg(mpctx, next, "hook_run")) {
|
|
|
|
hook_remove(mpctx, index);
|
2016-09-16 12:23:54 +00:00
|
|
|
mp_wakeup_core(mpctx); // repeat next iteration to finish
|
2014-10-24 19:52:16 +00:00
|
|
|
}
|
command: add a mechanism to allow scripts to intercept file loads
A vague idea to get something similar what libquvi did.
Undocumented because it might change a lot, or even be removed. To give
an idea what it does, a Lua script could do the following:
-- type ID priority
mp.commandv("hook_add", "on_load", 0, 0)
mp.register_script_message("hook_run", function(param, param2)
-- param is "0", the user-chosen ID from the hook_add command
-- param2 is the magic value that has to be passed to finish
-- the hook
mp.resume_all()
-- do something, maybe set options that are reset on end:
mp.set_property("file-local-options/name", "value")
-- or change the URL that's being opened:
local url = mp.get_property("stream-open-filename")
mp.set_property("stream-open-filename", url .. ".png")
-- let the player (or the next script) continue
mp.commandv("hook_ack", param2)
end)
2014-10-15 21:09:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int compare_hook(const void *pa, const void *pb)
|
|
|
|
{
|
|
|
|
struct hook_handler **h1 = (void *)pa;
|
|
|
|
struct hook_handler **h2 = (void *)pb;
|
|
|
|
if ((*h1)->priority != (*h2)->priority)
|
|
|
|
return (*h1)->priority - (*h2)->priority;
|
|
|
|
return (*h1)->seq - (*h2)->seq;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void mp_hook_add(struct MPContext *mpctx, char *client, char *name,
|
|
|
|
int id, int pri)
|
|
|
|
{
|
|
|
|
struct command_ctx *cmd = mpctx->command_ctx;
|
|
|
|
struct hook_handler *h = talloc_ptrtype(cmd, h);
|
|
|
|
int64_t seq = cmd->hook_seq++;
|
|
|
|
*h = (struct hook_handler){
|
|
|
|
.client = talloc_strdup(h, client),
|
|
|
|
.type = talloc_strdup(h, name),
|
|
|
|
.user_id = talloc_asprintf(h, "%d", id),
|
|
|
|
.priority = pri,
|
|
|
|
.seq = seq,
|
|
|
|
};
|
|
|
|
MP_TARRAY_APPEND(cmd, cmd->hooks, cmd->num_hooks, h);
|
|
|
|
qsort(cmd->hooks, cmd->num_hooks, sizeof(cmd->hooks[0]), compare_hook);
|
|
|
|
}
|
|
|
|
|
2016-07-14 18:04:59 +00:00
|
|
|
// Call before a seek, in order to allow revert-seek to undo the seek.
|
2016-08-18 18:40:23 +00:00
|
|
|
void mark_seek(struct MPContext *mpctx)
|
2013-12-01 01:07:32 +00:00
|
|
|
{
|
|
|
|
struct command_ctx *cmd = mpctx->command_ctx;
|
|
|
|
double now = mp_time_sec();
|
|
|
|
if (now > cmd->last_seek_time + 2.0 || cmd->last_seek_pts == MP_NOPTS_VALUE)
|
|
|
|
cmd->last_seek_pts = get_current_time(mpctx);
|
|
|
|
cmd->last_seek_time = now;
|
|
|
|
}
|
|
|
|
|
2017-01-26 17:24:53 +00:00
|
|
|
static char *skip_n_lines(char *text, int lines)
|
|
|
|
{
|
|
|
|
while (text && lines > 0) {
|
|
|
|
char *next = strchr(text, '\n');
|
|
|
|
text = next ? next + 1 : NULL;
|
|
|
|
lines--;
|
|
|
|
}
|
|
|
|
return text;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int count_lines(char *text)
|
|
|
|
{
|
|
|
|
int count = 0;
|
|
|
|
while (text) {
|
|
|
|
char *next = strchr(text, '\n');
|
|
|
|
if (!next || (next[0] == '\n' && !next[1]))
|
|
|
|
break;
|
|
|
|
text = next + 1;
|
|
|
|
count++;
|
|
|
|
}
|
|
|
|
return count;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Given a huge string separated by new lines, attempts to cut off text above
|
|
|
|
// the current line to keep the line visible, and below to keep rendering
|
|
|
|
// performance up. pos gives the current line (0 for the first line).
|
|
|
|
// "text" might be returned as is, or it can be freed and a new allocation is
|
|
|
|
// returned.
|
|
|
|
// This is only a heuristic - we can't deal with line breaking.
|
|
|
|
static char *cut_osd_list(struct MPContext *mpctx, char *text, int pos)
|
|
|
|
{
|
|
|
|
int screen_h, font_h;
|
|
|
|
osd_get_text_size(mpctx->osd, &screen_h, &font_h);
|
|
|
|
int max_lines = screen_h / MPMAX(font_h, 1) - 1;
|
|
|
|
|
|
|
|
if (!text || max_lines < 5)
|
|
|
|
return text;
|
|
|
|
|
|
|
|
int count = count_lines(text);
|
|
|
|
if (count <= max_lines)
|
|
|
|
return text;
|
|
|
|
|
|
|
|
char *new = talloc_strdup(NULL, "");
|
|
|
|
|
|
|
|
int start = pos - max_lines / 2;
|
|
|
|
if (start == 1)
|
|
|
|
start = 0; // avoid weird transition when pad_h becomes visible
|
|
|
|
int pad_h = start > 0;
|
|
|
|
if (pad_h)
|
|
|
|
new = talloc_strdup_append_buffer(new, "\342\206\221 (hidden items)\n");
|
|
|
|
|
|
|
|
int space = max_lines - pad_h - 1;
|
|
|
|
int pad_t = count - start > space;
|
|
|
|
if (!pad_t)
|
|
|
|
start = count - space;
|
|
|
|
|
|
|
|
char *head = skip_n_lines(text, start);
|
|
|
|
if (!head) {
|
|
|
|
talloc_free(new);
|
|
|
|
return text;
|
|
|
|
}
|
|
|
|
|
|
|
|
char *tail = skip_n_lines(head, max_lines - pad_h - pad_t);
|
|
|
|
new = talloc_asprintf_append_buffer(new, "%.*s",
|
|
|
|
(int)(tail ? tail - head : strlen(head)), head);
|
|
|
|
if (pad_t)
|
|
|
|
new = talloc_strdup_append_buffer(new, "\342\206\223 (hidden items)\n");
|
|
|
|
|
|
|
|
talloc_free(text);
|
|
|
|
return new;
|
|
|
|
}
|
|
|
|
|
2014-05-05 21:52:50 +00:00
|
|
|
static char *format_file_size(int64_t size)
|
|
|
|
{
|
|
|
|
double s = size;
|
|
|
|
if (size < 1024)
|
|
|
|
return talloc_asprintf(NULL, "%.0f", s);
|
|
|
|
|
|
|
|
if (size < (1024 * 1024))
|
|
|
|
return talloc_asprintf(NULL, "%.3f Kb", s / (1024.0));
|
|
|
|
|
|
|
|
if (size < (1024 * 1024 * 1024))
|
|
|
|
return talloc_asprintf(NULL, "%.3f Mb", s / (1024.0 * 1024.0));
|
|
|
|
|
|
|
|
if (size < (1024LL * 1024LL * 1024LL * 1024LL))
|
|
|
|
return talloc_asprintf(NULL, "%.3f Gb", s / (1024.0 * 1024.0 * 1024.0));
|
|
|
|
|
|
|
|
return talloc_asprintf(NULL, "%.3f Tb", s / (1024.0 * 1024.0 * 1024.0 * 1024.0));
|
|
|
|
}
|
|
|
|
|
2012-09-18 13:31:46 +00:00
|
|
|
static char *format_delay(double time)
|
|
|
|
{
|
2015-12-26 17:36:45 +00:00
|
|
|
return talloc_asprintf(NULL, "%d ms", (int)lrint(time * 1000));
|
2012-09-18 13:31:46 +00:00
|
|
|
}
|
|
|
|
|
2016-09-17 18:48:22 +00:00
|
|
|
// Option-property bridge. This is used so that setting options via various
|
|
|
|
// mechanisms (including command line parsing, config files, per-file options)
|
|
|
|
// updates state associated with them. For that, they have to go through the
|
|
|
|
// property layer. (Ideally, this would be the other way around, and there
|
|
|
|
// would be per-option change handlers instead.)
|
|
|
|
// Note that the property-option bridge sidesteps this, as we'd get infinite
|
|
|
|
// recursion.
|
|
|
|
int mp_on_set_option(void *ctx, struct m_config_option *co, void *data, int flags)
|
|
|
|
{
|
|
|
|
struct MPContext *mpctx = ctx;
|
2017-06-16 19:31:13 +00:00
|
|
|
struct command_ctx *cmd = mpctx->command_ctx;
|
2016-09-17 18:48:22 +00:00
|
|
|
const char *name = co->name;
|
|
|
|
|
2017-06-16 19:31:13 +00:00
|
|
|
// Skip going through mp_property_generic_option (typically), because the
|
|
|
|
// property implementation is trivial, and can break some obscure features
|
|
|
|
// like --profile and --include if non-trivial flags are involved (which
|
|
|
|
// the bridge would drop).
|
|
|
|
struct m_property *prop = m_property_list_find(cmd->properties, name);
|
|
|
|
if (prop && prop->is_option)
|
|
|
|
goto direct_option;
|
|
|
|
|
player: more option/property consistency fixes
Some properties had a different type from their equivalent options (such
as mute, volume, deinterlace, edition). This wasn't really sane, as raw
option values should be always within their bounds. On the other hand,
these properties use a different type to reflect runtime limits (such as
range of available editions), or simply to improve the "UI" (you don't
want to cycle throuhg the completely useless "auto" value when cycling
the "mute" property).
Handle this by making them always return the option type, but also
allowing them to provide a "constricted" type, which is used for UI
purposes. All M_PROPERTY_GET_CONSTRICTED_TYPE changes are related to
this.
One consequence is that you can set the volume property to arbitrary
high values just like with the --volume option, but using the "add"
command it still restricts it to the --volume-max range.
Also deprecate --chapter, as it is grossly incompatible to the chapter
property. We pondered renaming it to --chapters, or introducing a more
powerful --range option, but concluded that --start --end is actually
enough.
These changes appear to take care of the last gross property/option
incompatibilities, although there might still be a few lurking.
2016-09-18 14:06:12 +00:00
|
|
|
struct m_option type = {0};
|
|
|
|
|
|
|
|
int r = mp_property_do_silent(name, M_PROPERTY_GET_TYPE, &type, mpctx);
|
2016-09-18 09:39:30 +00:00
|
|
|
if (r == M_PROPERTY_UNKNOWN)
|
|
|
|
goto direct_option; // not mapped as property
|
player: more option/property consistency fixes
Some properties had a different type from their equivalent options (such
as mute, volume, deinterlace, edition). This wasn't really sane, as raw
option values should be always within their bounds. On the other hand,
these properties use a different type to reflect runtime limits (such as
range of available editions), or simply to improve the "UI" (you don't
want to cycle throuhg the completely useless "auto" value when cycling
the "mute" property).
Handle this by making them always return the option type, but also
allowing them to provide a "constricted" type, which is used for UI
purposes. All M_PROPERTY_GET_CONSTRICTED_TYPE changes are related to
this.
One consequence is that you can set the volume property to arbitrary
high values just like with the --volume option, but using the "add"
command it still restricts it to the --volume-max range.
Also deprecate --chapter, as it is grossly incompatible to the chapter
property. We pondered renaming it to --chapters, or introducing a more
powerful --range option, but concluded that --start --end is actually
enough.
These changes appear to take care of the last gross property/option
incompatibilities, although there might still be a few lurking.
2016-09-18 14:06:12 +00:00
|
|
|
if (r != M_PROPERTY_OK)
|
|
|
|
return M_OPT_INVALID; // shouldn't happen
|
|
|
|
|
|
|
|
assert(type.type == co->opt->type);
|
|
|
|
assert(type.max == co->opt->max);
|
|
|
|
assert(type.min == co->opt->min);
|
|
|
|
|
|
|
|
r = mp_property_do_silent(name, M_PROPERTY_SET, data, mpctx);
|
2016-09-17 18:48:22 +00:00
|
|
|
if (r != M_PROPERTY_OK)
|
|
|
|
return M_OPT_INVALID;
|
|
|
|
|
2016-09-23 19:04:20 +00:00
|
|
|
// The flags can't be passed through the property layer correctly.
|
|
|
|
m_config_mark_co_flags(co, flags);
|
2016-09-17 18:48:22 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
direct_option:
|
2016-09-22 18:35:48 +00:00
|
|
|
mp_notify_property(mpctx, name);
|
2016-09-17 18:48:22 +00:00
|
|
|
return m_config_set_option_raw_direct(mpctx->mconfig, co, data, flags);
|
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
// Property-option bridge. (Maps the property to the option with the same name.)
|
2016-09-22 18:35:38 +00:00
|
|
|
static int mp_property_generic_option(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2010-12-18 06:02:48 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
|
|
|
const char *optname = prop->name;
|
2016-09-22 18:35:38 +00:00
|
|
|
int flags = M_SETOPT_RUNTIME;
|
command: silence deprecation warnings with --reset-on-next-file=all
--reset-on-next-file=all triggers m_config_backup_all_opts(), which
backups all options (even deprecated ones). Later, when the option
values are reset with m_config_restore_backups(), mp_on_set_option() is
called, which in turn calls mp_property_do_silent(), which in turn will
call mp_property_generic_option() and m_config_get_co(), which triggers
the deprecation message.
Unfortunately there's no good way to determine whether an option has
actually changed (there's no option value compare operation), so the
deprecated options have to be set no matter what. On the other hand, we
can't pass through additional flags through the property layer. So we
add a dumb global flag to silence the deprecation warnings in these
cases.
Fortunately m_config_get_co_raw() works to silence the warnings.
m_config_get_co() also resolves aliases (deprecated and non-deprecated),
but aliased options are handled differently by the option-property
bridge, so we don't need to do that here, so the only purpose of it is
to trigger a warning for deprecated (non-alias) options.
2016-10-22 14:02:52 +00:00
|
|
|
struct m_config_option *opt;
|
|
|
|
if (mpctx->command_ctx->silence_option_deprecations) {
|
|
|
|
// This case is specifically for making --reset-on-next-file=all silent.
|
|
|
|
opt = m_config_get_co_raw(mpctx->mconfig, bstr0(optname));
|
|
|
|
} else {
|
|
|
|
opt = m_config_get_co(mpctx->mconfig, bstr0(optname));
|
|
|
|
}
|
2014-09-21 14:00:03 +00:00
|
|
|
|
|
|
|
if (!opt)
|
|
|
|
return M_PROPERTY_UNKNOWN;
|
|
|
|
|
2010-12-18 06:02:48 +00:00
|
|
|
switch (action) {
|
|
|
|
case M_PROPERTY_GET_TYPE:
|
2012-09-21 12:05:52 +00:00
|
|
|
*(struct m_option *)arg = *(opt->opt);
|
2010-12-18 06:02:48 +00:00
|
|
|
return M_PROPERTY_OK;
|
|
|
|
case M_PROPERTY_GET:
|
2017-06-15 13:22:06 +00:00
|
|
|
if (!opt->data)
|
|
|
|
return M_PROPERTY_NOT_IMPLEMENTED;
|
|
|
|
m_option_copy(opt->opt, arg, opt->data);
|
2010-12-18 06:02:48 +00:00
|
|
|
return M_PROPERTY_OK;
|
|
|
|
case M_PROPERTY_SET:
|
2016-09-17 18:48:22 +00:00
|
|
|
if (m_config_set_option_raw_direct(mpctx->mconfig, opt, arg, flags) < 0)
|
2016-09-01 18:00:43 +00:00
|
|
|
return M_PROPERTY_ERROR;
|
2010-12-18 06:02:48 +00:00
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
|
|
|
return M_PROPERTY_NOT_IMPLEMENTED;
|
|
|
|
}
|
|
|
|
|
2007-02-21 00:49:24 +00:00
|
|
|
/// Playback speed (RW)
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_playback_speed(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2007-02-21 00:49:24 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2014-10-02 00:49:05 +00:00
|
|
|
double speed = mpctx->opts->playback_speed;
|
2012-09-25 01:24:38 +00:00
|
|
|
switch (action) {
|
|
|
|
case M_PROPERTY_SET: {
|
2015-08-10 16:40:16 +00:00
|
|
|
mpctx->opts->playback_speed = *(double *)arg;
|
|
|
|
update_playback_speed(mpctx);
|
2016-09-16 12:24:15 +00:00
|
|
|
mp_wakeup_core(mpctx);
|
2010-05-03 23:34:38 +00:00
|
|
|
return M_PROPERTY_OK;
|
2007-02-21 00:49:24 +00:00
|
|
|
}
|
2012-09-25 01:24:38 +00:00
|
|
|
case M_PROPERTY_PRINT:
|
2014-10-02 00:49:05 +00:00
|
|
|
*(char **)arg = talloc_asprintf(NULL, "%.2f", speed);
|
2012-09-25 01:24:38 +00:00
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return mp_property_generic_option(mpctx, prop, action, arg);
|
2007-02-21 00:49:24 +00:00
|
|
|
}
|
|
|
|
|
2015-08-10 16:40:16 +00:00
|
|
|
static int mp_property_av_speed_correction(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
|
|
|
char *type = prop->priv;
|
2015-08-10 16:43:25 +00:00
|
|
|
double val = 0;
|
2015-08-10 16:40:16 +00:00
|
|
|
switch (type[0]) {
|
2015-08-10 16:43:25 +00:00
|
|
|
case 'a': val = mpctx->speed_factor_a; break;
|
|
|
|
case 'v': val = mpctx->speed_factor_v; break;
|
|
|
|
default: abort();
|
2015-08-10 16:40:16 +00:00
|
|
|
}
|
2015-08-10 16:43:25 +00:00
|
|
|
|
|
|
|
if (action == M_PROPERTY_PRINT) {
|
|
|
|
*(char **)arg = talloc_asprintf(NULL, "%+.05f%%", (val - 1) * 100);
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
return m_property_double_ro(action, arg, val);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int mp_property_display_sync_active(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
|
|
|
return m_property_flag_ro(action, arg, mpctx->display_sync_active);
|
2015-08-10 16:40:16 +00:00
|
|
|
}
|
|
|
|
|
2007-02-21 00:49:24 +00:00
|
|
|
/// filename with path (RO)
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_path(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2007-02-21 00:49:24 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2012-10-13 15:09:35 +00:00
|
|
|
if (!mpctx->filename)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return m_property_strdup_ro(action, arg, mpctx->filename);
|
2007-02-21 00:49:24 +00:00
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_filename(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2012-10-30 18:32:57 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2012-10-30 18:32:57 +00:00
|
|
|
if (!mpctx->filename)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
2013-09-04 12:31:08 +00:00
|
|
|
char *filename = talloc_strdup(NULL, mpctx->filename);
|
|
|
|
if (mp_is_url(bstr0(filename)))
|
|
|
|
mp_url_unescape_inplace(filename);
|
|
|
|
char *f = (char *)mp_basename(filename);
|
2016-08-11 20:40:00 +00:00
|
|
|
if (!f[0])
|
|
|
|
f = filename;
|
|
|
|
if (action == M_PROPERTY_KEY_ACTION) {
|
|
|
|
struct m_property_action_arg *ka = arg;
|
|
|
|
if (strcmp(ka->key, "no-ext") == 0) {
|
|
|
|
action = ka->action;
|
|
|
|
arg = ka->arg;
|
|
|
|
bstr root;
|
|
|
|
if (mp_splitext(f, &root))
|
|
|
|
f = bstrto0(filename, root);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
int r = m_property_strdup_ro(action, arg, f);
|
2013-09-04 12:31:08 +00:00
|
|
|
talloc_free(filename);
|
|
|
|
return r;
|
2012-10-30 18:32:57 +00:00
|
|
|
}
|
|
|
|
|
command: add a mechanism to allow scripts to intercept file loads
A vague idea to get something similar what libquvi did.
Undocumented because it might change a lot, or even be removed. To give
an idea what it does, a Lua script could do the following:
-- type ID priority
mp.commandv("hook_add", "on_load", 0, 0)
mp.register_script_message("hook_run", function(param, param2)
-- param is "0", the user-chosen ID from the hook_add command
-- param2 is the magic value that has to be passed to finish
-- the hook
mp.resume_all()
-- do something, maybe set options that are reset on end:
mp.set_property("file-local-options/name", "value")
-- or change the URL that's being opened:
local url = mp.get_property("stream-open-filename")
mp.set_property("stream-open-filename", url .. ".png")
-- let the player (or the next script) continue
mp.commandv("hook_ack", param2)
end)
2014-10-15 21:09:53 +00:00
|
|
|
static int mp_property_stream_open_filename(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
|
|
|
if (!mpctx->stream_open_filename || !mpctx->playing)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
switch (action) {
|
|
|
|
case M_PROPERTY_SET: {
|
2016-02-23 21:15:10 +00:00
|
|
|
if (mpctx->demuxer)
|
command: add a mechanism to allow scripts to intercept file loads
A vague idea to get something similar what libquvi did.
Undocumented because it might change a lot, or even be removed. To give
an idea what it does, a Lua script could do the following:
-- type ID priority
mp.commandv("hook_add", "on_load", 0, 0)
mp.register_script_message("hook_run", function(param, param2)
-- param is "0", the user-chosen ID from the hook_add command
-- param2 is the magic value that has to be passed to finish
-- the hook
mp.resume_all()
-- do something, maybe set options that are reset on end:
mp.set_property("file-local-options/name", "value")
-- or change the URL that's being opened:
local url = mp.get_property("stream-open-filename")
mp.set_property("stream-open-filename", url .. ".png")
-- let the player (or the next script) continue
mp.commandv("hook_ack", param2)
end)
2014-10-15 21:09:53 +00:00
|
|
|
return M_PROPERTY_ERROR;
|
|
|
|
mpctx->stream_open_filename =
|
|
|
|
talloc_strdup(mpctx->stream_open_filename, *(char **)arg);
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
|
|
|
case M_PROPERTY_GET_TYPE:
|
|
|
|
case M_PROPERTY_GET:
|
|
|
|
return m_property_strdup_ro(action, arg, mpctx->stream_open_filename);
|
|
|
|
}
|
|
|
|
return M_PROPERTY_NOT_IMPLEMENTED;
|
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_file_size(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2014-05-05 21:52:50 +00:00
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
2014-07-16 20:40:21 +00:00
|
|
|
if (!mpctx->demuxer)
|
2014-05-05 21:52:50 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
2014-05-24 12:04:09 +00:00
|
|
|
int64_t size;
|
2014-07-16 20:40:21 +00:00
|
|
|
if (demux_stream_control(mpctx->demuxer, STREAM_CTRL_GET_SIZE, &size) < 1)
|
2014-05-24 12:04:09 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
2014-05-05 21:52:50 +00:00
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
if (action == M_PROPERTY_PRINT) {
|
2014-05-05 21:52:50 +00:00
|
|
|
*(char **)arg = format_file_size(size);
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return m_property_int64_ro(action, arg, size);
|
2014-05-05 21:52:50 +00:00
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_media_title(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2012-10-13 15:09:35 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2012-10-30 18:32:57 +00:00
|
|
|
char *name = NULL;
|
2014-09-02 20:28:11 +00:00
|
|
|
if (mpctx->opts->media_title)
|
|
|
|
name = mpctx->opts->media_title;
|
|
|
|
if (name && name[0])
|
|
|
|
return m_property_strdup_ro(action, arg, name);
|
2016-02-15 20:03:51 +00:00
|
|
|
if (mpctx->demuxer) {
|
|
|
|
name = mp_tags_get_str(mpctx->demuxer->metadata, "service_name");
|
2016-01-13 00:50:38 +00:00
|
|
|
if (name && name[0])
|
|
|
|
return m_property_strdup_ro(action, arg, name);
|
2016-02-15 20:03:51 +00:00
|
|
|
name = mp_tags_get_str(mpctx->demuxer->metadata, "title");
|
2013-05-15 13:06:21 +00:00
|
|
|
if (name && name[0])
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return m_property_strdup_ro(action, arg, name);
|
2016-02-15 20:03:51 +00:00
|
|
|
name = mp_tags_get_str(mpctx->demuxer->metadata, "icy-title");
|
2014-10-27 13:59:07 +00:00
|
|
|
if (name && name[0])
|
|
|
|
return m_property_strdup_ro(action, arg, name);
|
2012-10-30 18:32:57 +00:00
|
|
|
}
|
2015-07-10 19:22:35 +00:00
|
|
|
if (mpctx->playing && mpctx->playing->title)
|
|
|
|
return m_property_strdup_ro(action, arg, mpctx->playing->title);
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return mp_property_filename(ctx, prop, action, arg);
|
2012-10-13 15:09:35 +00:00
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_stream_path(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2012-10-13 15:09:35 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2016-08-26 10:31:09 +00:00
|
|
|
if (!mpctx->demuxer || !mpctx->demuxer->filename)
|
2012-10-13 15:09:35 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
2016-08-26 10:31:09 +00:00
|
|
|
return m_property_strdup_ro(action, arg, mpctx->demuxer->filename);
|
2012-10-13 15:09:35 +00:00
|
|
|
}
|
|
|
|
|
2007-02-21 00:49:24 +00:00
|
|
|
/// Demuxer name (RO)
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_demuxer(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2007-02-21 00:49:24 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2016-02-15 20:03:51 +00:00
|
|
|
struct demuxer *demuxer = mpctx->demuxer;
|
2012-08-19 16:07:06 +00:00
|
|
|
if (!demuxer)
|
2010-05-03 23:34:38 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return m_property_strdup_ro(action, arg, demuxer->desc->name);
|
2007-02-21 00:49:24 +00:00
|
|
|
}
|
|
|
|
|
2015-01-23 14:59:06 +00:00
|
|
|
static int mp_property_file_format(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
2016-02-15 20:03:51 +00:00
|
|
|
struct demuxer *demuxer = mpctx->demuxer;
|
2015-01-23 14:59:06 +00:00
|
|
|
if (!demuxer)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
const char *name = demuxer->filetype ? demuxer->filetype : demuxer->desc->name;
|
|
|
|
return m_property_strdup_ro(action, arg, name);
|
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_stream_pos(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2007-02-21 00:49:24 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2014-07-16 20:40:21 +00:00
|
|
|
struct demuxer *demuxer = mpctx->demuxer;
|
2016-03-09 22:34:04 +00:00
|
|
|
if (!demuxer || demuxer->filepos < 0)
|
2010-05-03 23:34:38 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
2016-03-09 22:34:04 +00:00
|
|
|
return m_property_int64_ro(action, arg, demuxer->filepos);
|
2007-02-21 00:49:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Stream end offset (RO)
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_stream_end(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2007-02-21 00:49:24 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return mp_property_file_size(ctx, prop, action, arg);
|
2007-02-21 00:49:24 +00:00
|
|
|
}
|
|
|
|
|
2013-07-25 22:18:05 +00:00
|
|
|
// Does some magic to handle "<name>/full" as time formatted with milliseconds.
|
|
|
|
// Assumes prop is the type of the actual property.
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int property_time(int action, void *arg, double time)
|
2013-07-25 22:18:05 +00:00
|
|
|
{
|
2015-10-16 14:16:10 +00:00
|
|
|
if (time == MP_NOPTS_VALUE)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
const struct m_option time_type = {.type = CONF_TYPE_TIME};
|
2013-07-25 22:18:05 +00:00
|
|
|
switch (action) {
|
|
|
|
case M_PROPERTY_GET:
|
|
|
|
*(double *)arg = time;
|
|
|
|
return M_PROPERTY_OK;
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
case M_PROPERTY_GET_TYPE:
|
|
|
|
*(struct m_option *)arg = time_type;
|
|
|
|
return M_PROPERTY_OK;
|
2013-07-25 22:18:05 +00:00
|
|
|
case M_PROPERTY_KEY_ACTION: {
|
|
|
|
struct m_property_action_arg *ka = arg;
|
|
|
|
|
|
|
|
if (strcmp(ka->key, "full") != 0)
|
|
|
|
return M_PROPERTY_UNKNOWN;
|
|
|
|
|
|
|
|
switch (ka->action) {
|
|
|
|
case M_PROPERTY_GET:
|
|
|
|
*(double *)ka->arg = time;
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
case M_PROPERTY_PRINT:
|
|
|
|
*(char **)ka->arg = mp_format_time(time, true);
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
case M_PROPERTY_GET_TYPE:
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
*(struct m_option *)ka->arg = time_type;
|
2013-07-25 22:18:05 +00:00
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return M_PROPERTY_NOT_IMPLEMENTED;
|
|
|
|
}
|
|
|
|
|
2015-05-22 18:02:47 +00:00
|
|
|
static int mp_property_duration(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2007-02-21 00:49:24 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2014-10-29 20:54:59 +00:00
|
|
|
double len = get_time_length(mpctx);
|
2007-02-21 00:49:24 +00:00
|
|
|
|
2014-10-29 20:54:59 +00:00
|
|
|
if (len < 0)
|
2010-05-03 23:34:38 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
2007-02-21 00:49:24 +00:00
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return property_time(action, arg, len);
|
2007-02-21 00:49:24 +00:00
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_avsync(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2012-11-16 19:10:05 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2016-01-21 21:24:20 +00:00
|
|
|
if (!mpctx->ao_chain || !mpctx->vo_chain)
|
2012-11-16 19:10:05 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
2014-12-16 04:07:38 +00:00
|
|
|
if (action == M_PROPERTY_PRINT) {
|
|
|
|
*(char **)arg = talloc_asprintf(NULL, "%7.3f", mpctx->last_av_difference);
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return m_property_double_ro(action, arg, mpctx->last_av_difference);
|
2012-11-16 19:10:05 +00:00
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_total_avsync_change(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2014-04-12 18:26:28 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2016-01-21 21:24:20 +00:00
|
|
|
if (!mpctx->ao_chain || !mpctx->vo_chain)
|
2014-04-12 18:26:28 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
if (mpctx->total_avsync_change == MP_NOPTS_VALUE)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return m_property_double_ro(action, arg, mpctx->total_avsync_change);
|
2014-04-12 18:26:28 +00:00
|
|
|
}
|
|
|
|
|
2017-01-20 16:01:29 +00:00
|
|
|
static int mp_property_frame_drop_dec(void *ctx, struct m_property *prop,
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
int action, void *arg)
|
2014-04-12 18:26:28 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2016-08-30 21:45:20 +00:00
|
|
|
if (!mpctx->vo_chain)
|
2014-04-12 18:26:28 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
2016-01-17 17:07:50 +00:00
|
|
|
return m_property_int_ro(action, arg, mpctx->vo_chain->video_src->dropped_frames);
|
2014-04-12 18:26:28 +00:00
|
|
|
}
|
|
|
|
|
2015-10-30 13:05:41 +00:00
|
|
|
static int mp_property_mistimed_frame_count(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
2016-01-17 17:07:50 +00:00
|
|
|
if (!mpctx->vo_chain || !mpctx->display_sync_active)
|
2015-10-30 13:05:41 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
|
|
|
return m_property_int_ro(action, arg, mpctx->mistimed_frames_total);
|
|
|
|
}
|
|
|
|
|
2015-11-13 21:48:32 +00:00
|
|
|
static int mp_property_vsync_ratio(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
2016-01-17 17:07:50 +00:00
|
|
|
if (!mpctx->vo_chain || !mpctx->display_sync_active)
|
2015-11-13 21:48:32 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
|
|
|
int vsyncs = 0, frames = 0;
|
|
|
|
for (int n = 0; n < mpctx->num_past_frames; n++) {
|
|
|
|
int vsync = mpctx->past_frames[n].num_vsyncs;
|
|
|
|
if (vsync < 0)
|
|
|
|
break;
|
|
|
|
vsyncs += vsync;
|
|
|
|
frames += 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!frames)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
|
|
|
return m_property_double_ro(action, arg, vsyncs / (double)frames);
|
|
|
|
}
|
|
|
|
|
2017-01-20 16:01:29 +00:00
|
|
|
static int mp_property_frame_drop_vo(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
video: add VO framedropping mode
This mostly uses the same idea as with vo_vdpau.c, but much simplified.
On X11, it tries to get the display framerate with XF86VM, and limits
the frequency of new video frames against it. Note that this is an old
extension, and is confirmed not to work correctly with multi-monitor
setups. But we're using it because it was already around (it is also
used by vo_vdpau).
This attempts to predict the next vsync event by using the time of the
last frame and the display FPS. Even if that goes completely wrong,
the results are still relatively good.
On other systems, or if the X11 code doesn't return a display FPS, a
framerate of 1000 is assumed. This is infinite for all practical
purposes, and means that only frames which are definitely too late are
dropped. This probably has worse results, but is still useful.
"--framedrop=yes" is basically replaced with "--framedrop=decoder". The
old framedropping mode is kept around, and should perhaps be improved.
Dropping on the decoder level is still useful if decoding itself is too
slow.
2014-08-15 21:33:33 +00:00
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
2016-01-17 17:07:50 +00:00
|
|
|
if (!mpctx->vo_chain)
|
video: add VO framedropping mode
This mostly uses the same idea as with vo_vdpau.c, but much simplified.
On X11, it tries to get the display framerate with XF86VM, and limits
the frequency of new video frames against it. Note that this is an old
extension, and is confirmed not to work correctly with multi-monitor
setups. But we're using it because it was already around (it is also
used by vo_vdpau).
This attempts to predict the next vsync event by using the time of the
last frame and the display FPS. Even if that goes completely wrong,
the results are still relatively good.
On other systems, or if the X11 code doesn't return a display FPS, a
framerate of 1000 is assumed. This is infinite for all practical
purposes, and means that only frames which are definitely too late are
dropped. This probably has worse results, but is still useful.
"--framedrop=yes" is basically replaced with "--framedrop=decoder". The
old framedropping mode is kept around, and should perhaps be improved.
Dropping on the decoder level is still useful if decoding itself is too
slow.
2014-08-15 21:33:33 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
|
|
|
return m_property_int_ro(action, arg, vo_get_drop_count(mpctx->video_out));
|
|
|
|
}
|
|
|
|
|
2015-11-13 21:41:41 +00:00
|
|
|
static int mp_property_vo_delayed_frame_count(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2015-08-10 16:43:25 +00:00
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
2016-01-17 17:07:50 +00:00
|
|
|
if (!mpctx->vo_chain)
|
2015-08-10 16:43:25 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
2015-11-13 21:41:41 +00:00
|
|
|
return m_property_int_ro(action, arg, vo_get_delayed_count(mpctx->video_out));
|
2015-08-10 16:43:25 +00:00
|
|
|
}
|
|
|
|
|
2007-05-31 13:07:52 +00:00
|
|
|
/// Current position in percent (RW)
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_percent_pos(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2011-08-07 01:45:40 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2015-05-26 19:42:34 +00:00
|
|
|
if (!mpctx->playback_initialized)
|
2010-05-03 23:34:38 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
2007-05-31 13:07:52 +00:00
|
|
|
|
2011-08-07 01:45:40 +00:00
|
|
|
switch (action) {
|
2014-01-15 21:24:56 +00:00
|
|
|
case M_PROPERTY_SET: {
|
2013-06-28 20:28:21 +00:00
|
|
|
double pos = *(double *)arg;
|
2016-08-15 19:07:32 +00:00
|
|
|
queue_seek(mpctx, MPSEEK_FACTOR, pos / 100.0, MPSEEK_DEFAULT, 0);
|
2012-09-18 18:07:24 +00:00
|
|
|
return M_PROPERTY_OK;
|
2014-01-15 21:24:56 +00:00
|
|
|
}
|
|
|
|
case M_PROPERTY_GET: {
|
|
|
|
double pos = get_current_pos_ratio(mpctx, false) * 100.0;
|
|
|
|
if (pos < 0)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
*(double *)arg = pos;
|
2013-06-28 20:28:21 +00:00
|
|
|
return M_PROPERTY_OK;
|
2014-01-15 21:24:56 +00:00
|
|
|
}
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
case M_PROPERTY_GET_TYPE:
|
|
|
|
*(struct m_option *)arg = (struct m_option){
|
|
|
|
.type = CONF_TYPE_DOUBLE,
|
|
|
|
.flags = M_OPT_RANGE,
|
|
|
|
.min = 0,
|
|
|
|
.max = 100,
|
|
|
|
};
|
|
|
|
return M_PROPERTY_OK;
|
2014-12-20 16:31:58 +00:00
|
|
|
case M_PROPERTY_PRINT: {
|
|
|
|
int pos = get_percent_pos(mpctx);
|
|
|
|
if (pos < 0)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
*(char **)arg = talloc_asprintf(NULL, "%d", pos);
|
2012-09-18 18:07:24 +00:00
|
|
|
return M_PROPERTY_OK;
|
2007-05-31 13:07:52 +00:00
|
|
|
}
|
2014-12-20 16:31:58 +00:00
|
|
|
}
|
2012-09-18 18:07:24 +00:00
|
|
|
return M_PROPERTY_NOT_IMPLEMENTED;
|
2007-05-31 13:07:52 +00:00
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_time_start(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2014-02-28 14:04:10 +00:00
|
|
|
{
|
2015-11-16 21:47:17 +00:00
|
|
|
// minor backwards-compat.
|
|
|
|
return property_time(action, arg, 0);
|
2014-02-28 14:04:10 +00:00
|
|
|
}
|
|
|
|
|
2007-05-31 13:07:52 +00:00
|
|
|
/// Current position in seconds (RW)
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_time_pos(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2011-08-07 01:45:40 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2015-05-26 19:42:34 +00:00
|
|
|
if (!mpctx->playback_initialized)
|
2007-05-31 13:07:52 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
2013-07-25 22:18:05 +00:00
|
|
|
if (action == M_PROPERTY_SET) {
|
2016-08-15 19:07:32 +00:00
|
|
|
queue_seek(mpctx, MPSEEK_ABSOLUTE, *(double *)arg, MPSEEK_DEFAULT, 0);
|
2007-05-31 13:07:52 +00:00
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return property_time(action, arg, get_current_time(mpctx));
|
2007-05-31 13:07:52 +00:00
|
|
|
}
|
|
|
|
|
2016-09-19 17:11:14 +00:00
|
|
|
/// Current audio pts in seconds (R)
|
|
|
|
static int mp_property_audio_pts(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
|
|
|
if (!mpctx->playback_initialized || mpctx->audio_status < STATUS_PLAYING ||
|
|
|
|
mpctx->audio_status >= STATUS_EOF)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
|
|
|
return property_time(action, arg, playing_audio_pts(mpctx));
|
|
|
|
}
|
|
|
|
|
2013-12-16 19:12:53 +00:00
|
|
|
static bool time_remaining(MPContext *mpctx, double *remaining)
|
2013-05-10 13:20:40 +00:00
|
|
|
{
|
2013-12-16 19:12:53 +00:00
|
|
|
double len = get_time_length(mpctx);
|
2014-06-29 17:27:46 +00:00
|
|
|
double playback = get_playback_time(mpctx);
|
2013-05-10 13:20:40 +00:00
|
|
|
|
2015-10-16 14:16:10 +00:00
|
|
|
if (playback == MP_NOPTS_VALUE)
|
|
|
|
return false;
|
|
|
|
|
2014-06-29 17:27:46 +00:00
|
|
|
*remaining = len - playback;
|
2013-12-16 19:12:53 +00:00
|
|
|
|
2014-10-29 20:54:59 +00:00
|
|
|
return len >= 0;
|
2013-12-16 14:55:36 +00:00
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_remaining(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2013-12-16 14:55:36 +00:00
|
|
|
{
|
2013-12-16 19:12:53 +00:00
|
|
|
double remaining;
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
if (!time_remaining(ctx, &remaining))
|
2013-12-16 14:55:36 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return property_time(action, arg, remaining);
|
2013-12-16 14:55:36 +00:00
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_playtime_remaining(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2013-12-16 14:55:36 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2013-12-16 19:12:53 +00:00
|
|
|
double remaining;
|
|
|
|
if (!time_remaining(mpctx, &remaining))
|
2013-05-10 13:20:40 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
2015-08-10 16:40:16 +00:00
|
|
|
double speed = mpctx->video_speed;
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return property_time(action, arg, remaining / speed);
|
2013-05-10 13:20:40 +00:00
|
|
|
}
|
|
|
|
|
2014-06-29 17:27:46 +00:00
|
|
|
static int mp_property_playback_time(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
2015-05-26 19:42:34 +00:00
|
|
|
if (!mpctx->playback_initialized)
|
2014-06-29 17:27:46 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
2015-08-21 13:51:50 +00:00
|
|
|
if (action == M_PROPERTY_SET) {
|
2016-08-15 19:07:32 +00:00
|
|
|
queue_seek(mpctx, MPSEEK_ABSOLUTE, *(double *)arg, MPSEEK_DEFAULT, 0);
|
2015-08-21 13:51:50 +00:00
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
2014-06-29 17:27:46 +00:00
|
|
|
return property_time(action, arg, get_playback_time(mpctx));
|
|
|
|
}
|
|
|
|
|
2014-07-14 23:49:02 +00:00
|
|
|
/// Current BD/DVD title (RW)
|
|
|
|
static int mp_property_disc_title(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
2016-02-15 20:03:51 +00:00
|
|
|
struct demuxer *d = mpctx->demuxer;
|
2014-07-16 20:40:21 +00:00
|
|
|
if (!d)
|
2014-07-14 23:49:02 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
unsigned int title = -1;
|
|
|
|
switch (action) {
|
|
|
|
case M_PROPERTY_GET:
|
2014-07-16 20:40:21 +00:00
|
|
|
if (demux_stream_control(d, STREAM_CTRL_GET_CURRENT_TITLE, &title) < 0)
|
2014-07-14 23:49:02 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
*(int*)arg = title;
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
case M_PROPERTY_GET_TYPE:
|
|
|
|
*(struct m_option *)arg = (struct m_option){
|
|
|
|
.type = CONF_TYPE_INT,
|
|
|
|
.flags = M_OPT_MIN,
|
|
|
|
.min = -1,
|
|
|
|
};
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
case M_PROPERTY_SET:
|
|
|
|
title = *(int*)arg;
|
2014-07-16 20:40:21 +00:00
|
|
|
if (demux_stream_control(d, STREAM_CTRL_SET_CURRENT_TITLE, &title) < 0)
|
2014-07-14 23:49:02 +00:00
|
|
|
return M_PROPERTY_NOT_IMPLEMENTED;
|
2015-07-08 19:31:31 +00:00
|
|
|
if (!mpctx->stop_play)
|
|
|
|
mpctx->stop_play = PT_RELOAD_FILE;
|
2014-07-14 23:49:02 +00:00
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
|
|
|
return M_PROPERTY_NOT_IMPLEMENTED;
|
|
|
|
}
|
|
|
|
|
2007-12-14 08:33:11 +00:00
|
|
|
/// Current chapter (RW)
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_chapter(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2007-12-14 08:33:11 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2016-09-01 18:57:33 +00:00
|
|
|
if (!mpctx->playback_initialized)
|
player: more option/property consistency fixes
Some properties had a different type from their equivalent options (such
as mute, volume, deinterlace, edition). This wasn't really sane, as raw
option values should be always within their bounds. On the other hand,
these properties use a different type to reflect runtime limits (such as
range of available editions), or simply to improve the "UI" (you don't
want to cycle throuhg the completely useless "auto" value when cycling
the "mute" property).
Handle this by making them always return the option type, but also
allowing them to provide a "constricted" type, which is used for UI
purposes. All M_PROPERTY_GET_CONSTRICTED_TYPE changes are related to
this.
One consequence is that you can set the volume property to arbitrary
high values just like with the --volume option, but using the "add"
command it still restricts it to the --volume-max range.
Also deprecate --chapter, as it is grossly incompatible to the chapter
property. We pondered renaming it to --chapters, or introducing a more
powerful --range option, but concluded that --start --end is actually
enough.
These changes appear to take care of the last gross property/option
incompatibilities, although there might still be a few lurking.
2016-09-18 14:06:12 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
2016-09-01 18:57:33 +00:00
|
|
|
|
2012-08-19 16:07:06 +00:00
|
|
|
int chapter = get_current_chapter(mpctx);
|
2015-01-05 05:34:25 +00:00
|
|
|
int num = get_chapter_count(mpctx);
|
2010-04-24 17:46:54 +00:00
|
|
|
if (chapter < -1)
|
2007-12-22 06:20:48 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
2007-12-14 08:33:11 +00:00
|
|
|
switch (action) {
|
|
|
|
case M_PROPERTY_GET:
|
2007-12-17 03:42:54 +00:00
|
|
|
*(int *) arg = chapter;
|
2007-12-14 08:33:11 +00:00
|
|
|
return M_PROPERTY_OK;
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
case M_PROPERTY_GET_TYPE:
|
|
|
|
*(struct m_option *)arg = (struct m_option){
|
|
|
|
.type = CONF_TYPE_INT,
|
|
|
|
.flags = M_OPT_MIN | M_OPT_MAX,
|
|
|
|
.min = -1,
|
2015-01-05 05:34:25 +00:00
|
|
|
.max = num - 1,
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
};
|
|
|
|
return M_PROPERTY_OK;
|
2007-12-14 08:33:11 +00:00
|
|
|
case M_PROPERTY_PRINT: {
|
2013-09-07 17:59:39 +00:00
|
|
|
*(char **) arg = chapter_display_name(mpctx, chapter);
|
2007-12-14 08:33:11 +00:00
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
2013-08-14 01:25:50 +00:00
|
|
|
case M_PROPERTY_SWITCH:
|
2012-09-18 18:07:24 +00:00
|
|
|
case M_PROPERTY_SET: ;
|
2013-12-01 01:07:32 +00:00
|
|
|
mark_seek(mpctx);
|
2013-08-14 01:25:50 +00:00
|
|
|
int step_all;
|
|
|
|
if (action == M_PROPERTY_SWITCH) {
|
|
|
|
struct m_property_switch_arg *sarg = arg;
|
2015-12-26 17:36:45 +00:00
|
|
|
step_all = lrint(sarg->inc);
|
2013-08-14 01:25:50 +00:00
|
|
|
// Check threshold for relative backward seeks
|
|
|
|
if (mpctx->opts->chapter_seek_threshold >= 0 && step_all < 0) {
|
|
|
|
double current_chapter_start =
|
|
|
|
chapter_start_time(mpctx, chapter);
|
|
|
|
// If we are far enough into a chapter, seek back to the
|
|
|
|
// beginning of current chapter instead of previous one
|
2014-03-25 01:18:12 +00:00
|
|
|
if (current_chapter_start != MP_NOPTS_VALUE &&
|
2013-08-14 01:25:50 +00:00
|
|
|
get_current_time(mpctx) - current_chapter_start >
|
|
|
|
mpctx->opts->chapter_seek_threshold)
|
2016-10-01 18:51:17 +00:00
|
|
|
{
|
2013-08-14 01:25:50 +00:00
|
|
|
step_all++;
|
2016-10-01 18:51:17 +00:00
|
|
|
}
|
2013-08-14 01:25:50 +00:00
|
|
|
}
|
|
|
|
} else // Absolute set
|
|
|
|
step_all = *(int *)arg - chapter;
|
2007-12-14 08:33:11 +00:00
|
|
|
chapter += step_all;
|
2013-08-14 01:25:50 +00:00
|
|
|
if (chapter < -1)
|
|
|
|
chapter = -1;
|
2015-01-05 05:34:25 +00:00
|
|
|
if (chapter >= num && step_all > 0) {
|
2014-12-08 16:27:07 +00:00
|
|
|
if (mpctx->opts->keep_open) {
|
|
|
|
seek_to_last_frame(mpctx);
|
|
|
|
} else {
|
2015-12-25 12:58:50 +00:00
|
|
|
// semi-broken file; ignore for user convenience
|
|
|
|
if (action == M_PROPERTY_SWITCH && num < 2)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
2015-07-08 19:31:31 +00:00
|
|
|
if (!mpctx->stop_play)
|
|
|
|
mpctx->stop_play = PT_NEXT_ENTRY;
|
2016-09-16 12:24:15 +00:00
|
|
|
mp_wakeup_core(mpctx);
|
2014-12-08 16:27:07 +00:00
|
|
|
}
|
2013-05-03 22:36:53 +00:00
|
|
|
} else {
|
2015-07-10 10:11:14 +00:00
|
|
|
double pts = chapter_start_time(mpctx, chapter);
|
|
|
|
if (pts != MP_NOPTS_VALUE) {
|
2016-08-15 19:07:32 +00:00
|
|
|
queue_seek(mpctx, MPSEEK_ABSOLUTE, pts, MPSEEK_DEFAULT, 0);
|
2015-07-10 10:11:14 +00:00
|
|
|
mpctx->last_chapter_seek = chapter;
|
|
|
|
mpctx->last_chapter_pts = pts;
|
|
|
|
}
|
2013-05-03 22:36:53 +00:00
|
|
|
}
|
2012-09-18 18:07:24 +00:00
|
|
|
return M_PROPERTY_OK;
|
2007-12-14 08:33:11 +00:00
|
|
|
}
|
2012-09-18 18:07:24 +00:00
|
|
|
return M_PROPERTY_NOT_IMPLEMENTED;
|
2007-12-14 08:33:11 +00:00
|
|
|
}
|
|
|
|
|
2014-02-15 15:55:40 +00:00
|
|
|
static int get_chapter_entry(int item, int action, void *arg, void *ctx)
|
|
|
|
{
|
|
|
|
struct MPContext *mpctx = ctx;
|
|
|
|
char *name = chapter_name(mpctx, item);
|
|
|
|
double time = chapter_start_time(mpctx, item);
|
|
|
|
struct m_sub_property props[] = {
|
|
|
|
{"title", SUB_PROP_STR(name)},
|
2014-11-13 16:25:59 +00:00
|
|
|
{"time", {.type = CONF_TYPE_TIME}, {.time = time}},
|
2014-02-15 15:55:40 +00:00
|
|
|
{0}
|
|
|
|
};
|
|
|
|
|
|
|
|
int r = m_property_read_sub(props, action, arg);
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2016-09-24 15:27:19 +00:00
|
|
|
static int parse_node_chapters(struct MPContext *mpctx,
|
|
|
|
struct mpv_node *given_chapters)
|
2016-09-23 21:54:44 +00:00
|
|
|
{
|
2016-09-24 15:27:19 +00:00
|
|
|
if (!mpctx->demuxer)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
2016-09-23 21:54:44 +00:00
|
|
|
if (given_chapters->format != MPV_FORMAT_NODE_ARRAY)
|
2016-09-24 15:27:19 +00:00
|
|
|
return M_PROPERTY_ERROR;
|
2016-09-23 21:54:44 +00:00
|
|
|
|
|
|
|
double len = get_time_length(mpctx);
|
|
|
|
|
|
|
|
talloc_free(mpctx->chapters);
|
|
|
|
mpctx->num_chapters = 0;
|
2016-09-24 15:27:19 +00:00
|
|
|
mpctx->chapters = talloc_array(NULL, struct demux_chapter, 0);
|
2016-09-23 21:54:44 +00:00
|
|
|
|
2016-09-24 15:27:19 +00:00
|
|
|
for (int n = 0; n < given_chapters->u.list->num; n++) {
|
2016-09-23 21:54:44 +00:00
|
|
|
struct mpv_node *chapter_data = &given_chapters->u.list->values[n];
|
2016-09-24 15:27:19 +00:00
|
|
|
|
2016-09-23 21:54:44 +00:00
|
|
|
if (chapter_data->format != MPV_FORMAT_NODE_MAP)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
mpv_node_list *chapter_data_elements = chapter_data->u.list;
|
|
|
|
|
|
|
|
double time = -1;
|
|
|
|
char *title = 0;
|
|
|
|
|
2016-09-24 15:27:19 +00:00
|
|
|
for (int e = 0; e < chapter_data_elements->num; e++) {
|
|
|
|
struct mpv_node *chapter_data_element =
|
|
|
|
&chapter_data_elements->values[e];
|
2016-09-23 21:54:44 +00:00
|
|
|
char *key = chapter_data_elements->keys[e];
|
|
|
|
switch (chapter_data_element->format) {
|
|
|
|
case MPV_FORMAT_INT64:
|
|
|
|
if (strcmp(key, "time") == 0)
|
|
|
|
time = (double)chapter_data_element->u.int64;
|
|
|
|
break;
|
|
|
|
case MPV_FORMAT_DOUBLE:
|
|
|
|
if (strcmp(key, "time") == 0)
|
|
|
|
time = chapter_data_element->u.double_;
|
|
|
|
break;
|
|
|
|
case MPV_FORMAT_STRING:
|
|
|
|
if (strcmp(key, "title") == 0)
|
|
|
|
title = chapter_data_element->u.string;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-09-24 15:27:19 +00:00
|
|
|
if (time >= 0 && time < len) {
|
2016-09-23 21:54:44 +00:00
|
|
|
struct demux_chapter new = {
|
|
|
|
.pts = time,
|
2016-09-24 15:27:19 +00:00
|
|
|
.metadata = talloc_zero(mpctx->chapters, struct mp_tags),
|
2016-09-23 21:54:44 +00:00
|
|
|
};
|
2016-09-24 15:27:19 +00:00
|
|
|
if (title)
|
|
|
|
mp_tags_set_str(new.metadata, "title", title);
|
2016-09-23 21:54:44 +00:00
|
|
|
MP_TARRAY_APPEND(NULL, mpctx->chapters, mpctx->num_chapters, new);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-09-24 15:27:19 +00:00
|
|
|
mp_notify(mpctx, MPV_EVENT_CHAPTER_CHANGE, NULL);
|
|
|
|
|
2016-09-23 21:54:44 +00:00
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_list_chapters(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2013-05-15 00:17:47 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2014-02-15 15:55:40 +00:00
|
|
|
int count = get_chapter_count(mpctx);
|
2016-09-23 21:54:44 +00:00
|
|
|
switch (action) {
|
|
|
|
case M_PROPERTY_PRINT: {
|
2015-05-26 19:42:34 +00:00
|
|
|
int cur = mpctx->playback_initialized ? get_current_chapter(mpctx) : -1;
|
2013-05-15 00:17:47 +00:00
|
|
|
char *res = NULL;
|
|
|
|
int n;
|
|
|
|
|
|
|
|
if (count < 1) {
|
|
|
|
res = talloc_asprintf_append(res, "No chapters.");
|
|
|
|
}
|
|
|
|
|
|
|
|
for (n = 0; n < count; n++) {
|
|
|
|
char *name = chapter_display_name(mpctx, n);
|
|
|
|
double t = chapter_start_time(mpctx, n);
|
|
|
|
char* time = mp_format_time(t, false);
|
|
|
|
res = talloc_asprintf_append(res, "%s", time);
|
|
|
|
talloc_free(time);
|
2016-05-03 20:41:53 +00:00
|
|
|
const char *m = n == cur ? list_current : list_normal;
|
|
|
|
res = talloc_asprintf_append(res, " %s%s\n", m, name);
|
2013-05-15 00:17:47 +00:00
|
|
|
talloc_free(name);
|
|
|
|
}
|
|
|
|
|
|
|
|
*(char **)arg = res;
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
2016-09-23 21:54:44 +00:00
|
|
|
case M_PROPERTY_SET: {
|
|
|
|
struct mpv_node *given_chapters = arg;
|
2016-09-24 15:27:19 +00:00
|
|
|
return parse_node_chapters(mpctx, given_chapters);
|
2016-09-23 21:54:44 +00:00
|
|
|
}
|
|
|
|
}
|
2014-02-15 15:55:40 +00:00
|
|
|
return m_property_read_list(action, arg, count, get_chapter_entry, mpctx);
|
2013-05-15 00:17:47 +00:00
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_edition(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2012-08-25 23:19:42 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2016-02-15 20:03:51 +00:00
|
|
|
struct demuxer *demuxer = mpctx->demuxer;
|
player: more option/property consistency fixes
Some properties had a different type from their equivalent options (such
as mute, volume, deinterlace, edition). This wasn't really sane, as raw
option values should be always within their bounds. On the other hand,
these properties use a different type to reflect runtime limits (such as
range of available editions), or simply to improve the "UI" (you don't
want to cycle throuhg the completely useless "auto" value when cycling
the "mute" property).
Handle this by making them always return the option type, but also
allowing them to provide a "constricted" type, which is used for UI
purposes. All M_PROPERTY_GET_CONSTRICTED_TYPE changes are related to
this.
One consequence is that you can set the volume property to arbitrary
high values just like with the --volume option, but using the "add"
command it still restricts it to the --volume-max range.
Also deprecate --chapter, as it is grossly incompatible to the chapter
property. We pondered renaming it to --chapters, or introducing a more
powerful --range option, but concluded that --start --end is actually
enough.
These changes appear to take care of the last gross property/option
incompatibilities, although there might still be a few lurking.
2016-09-18 14:06:12 +00:00
|
|
|
if (!mpctx->playback_initialized || !demuxer || demuxer->num_editions <= 0)
|
|
|
|
return mp_property_generic_option(mpctx, prop, action, arg);
|
2012-08-25 23:19:42 +00:00
|
|
|
|
|
|
|
int edition = demuxer->edition;
|
|
|
|
|
|
|
|
switch (action) {
|
|
|
|
case M_PROPERTY_GET:
|
2012-09-18 18:07:24 +00:00
|
|
|
*(int *)arg = edition;
|
|
|
|
return M_PROPERTY_OK;
|
2012-09-21 12:22:23 +00:00
|
|
|
case M_PROPERTY_SET: {
|
2012-08-25 23:19:42 +00:00
|
|
|
edition = *(int *)arg;
|
2012-09-21 12:22:23 +00:00
|
|
|
if (edition != demuxer->edition) {
|
2016-09-01 18:57:33 +00:00
|
|
|
mpctx->opts->edition_id = edition;
|
2015-07-08 19:31:31 +00:00
|
|
|
if (!mpctx->stop_play)
|
|
|
|
mpctx->stop_play = PT_RELOAD_FILE;
|
player: more option/property consistency fixes
Some properties had a different type from their equivalent options (such
as mute, volume, deinterlace, edition). This wasn't really sane, as raw
option values should be always within their bounds. On the other hand,
these properties use a different type to reflect runtime limits (such as
range of available editions), or simply to improve the "UI" (you don't
want to cycle throuhg the completely useless "auto" value when cycling
the "mute" property).
Handle this by making them always return the option type, but also
allowing them to provide a "constricted" type, which is used for UI
purposes. All M_PROPERTY_GET_CONSTRICTED_TYPE changes are related to
this.
One consequence is that you can set the volume property to arbitrary
high values just like with the --volume option, but using the "add"
command it still restricts it to the --volume-max range.
Also deprecate --chapter, as it is grossly incompatible to the chapter
property. We pondered renaming it to --chapters, or introducing a more
powerful --range option, but concluded that --start --end is actually
enough.
These changes appear to take care of the last gross property/option
incompatibilities, although there might still be a few lurking.
2016-09-18 14:06:12 +00:00
|
|
|
mp_wakeup_core(mpctx);
|
|
|
|
break; // make it accessible to the demuxer via option change notify
|
2012-09-21 12:22:23 +00:00
|
|
|
}
|
|
|
|
return M_PROPERTY_OK;
|
2012-08-25 23:19:42 +00:00
|
|
|
}
|
player: more option/property consistency fixes
Some properties had a different type from their equivalent options (such
as mute, volume, deinterlace, edition). This wasn't really sane, as raw
option values should be always within their bounds. On the other hand,
these properties use a different type to reflect runtime limits (such as
range of available editions), or simply to improve the "UI" (you don't
want to cycle throuhg the completely useless "auto" value when cycling
the "mute" property).
Handle this by making them always return the option type, but also
allowing them to provide a "constricted" type, which is used for UI
purposes. All M_PROPERTY_GET_CONSTRICTED_TYPE changes are related to
this.
One consequence is that you can set the volume property to arbitrary
high values just like with the --volume option, but using the "add"
command it still restricts it to the --volume-max range.
Also deprecate --chapter, as it is grossly incompatible to the chapter
property. We pondered renaming it to --chapters, or introducing a more
powerful --range option, but concluded that --start --end is actually
enough.
These changes appear to take care of the last gross property/option
incompatibilities, although there might still be a few lurking.
2016-09-18 14:06:12 +00:00
|
|
|
case M_PROPERTY_GET_CONSTRICTED_TYPE: {
|
|
|
|
int r = mp_property_generic_option(mpctx, prop, M_PROPERTY_GET_TYPE, arg);
|
|
|
|
((struct m_option *)arg)->max = demuxer->num_editions - 1;
|
|
|
|
return r;
|
2012-08-25 23:19:42 +00:00
|
|
|
}
|
|
|
|
}
|
player: more option/property consistency fixes
Some properties had a different type from their equivalent options (such
as mute, volume, deinterlace, edition). This wasn't really sane, as raw
option values should be always within their bounds. On the other hand,
these properties use a different type to reflect runtime limits (such as
range of available editions), or simply to improve the "UI" (you don't
want to cycle throuhg the completely useless "auto" value when cycling
the "mute" property).
Handle this by making them always return the option type, but also
allowing them to provide a "constricted" type, which is used for UI
purposes. All M_PROPERTY_GET_CONSTRICTED_TYPE changes are related to
this.
One consequence is that you can set the volume property to arbitrary
high values just like with the --volume option, but using the "add"
command it still restricts it to the --volume-max range.
Also deprecate --chapter, as it is grossly incompatible to the chapter
property. We pondered renaming it to --chapters, or introducing a more
powerful --range option, but concluded that --start --end is actually
enough.
These changes appear to take care of the last gross property/option
incompatibilities, although there might still be a few lurking.
2016-09-18 14:06:12 +00:00
|
|
|
return mp_property_generic_option(mpctx, prop, action, arg);
|
2012-08-25 23:19:42 +00:00
|
|
|
}
|
|
|
|
|
2014-02-18 23:41:12 +00:00
|
|
|
static int get_edition_entry(int item, int action, void *arg, void *ctx)
|
|
|
|
{
|
|
|
|
struct MPContext *mpctx = ctx;
|
|
|
|
|
2016-02-15 20:03:51 +00:00
|
|
|
struct demuxer *demuxer = mpctx->demuxer;
|
2014-02-18 23:41:12 +00:00
|
|
|
struct demux_edition *ed = &demuxer->editions[item];
|
|
|
|
|
|
|
|
char *title = mp_tags_get_str(ed->metadata, "title");
|
|
|
|
|
|
|
|
struct m_sub_property props[] = {
|
|
|
|
{"id", SUB_PROP_INT(item)},
|
|
|
|
{"title", SUB_PROP_STR(title),
|
|
|
|
.unavailable = !title},
|
|
|
|
{"default", SUB_PROP_FLAG(ed->default_edition)},
|
|
|
|
{0}
|
|
|
|
};
|
|
|
|
|
|
|
|
return m_property_read_sub(props, action, arg);
|
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int property_list_editions(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2014-02-18 23:41:12 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2016-02-15 20:03:51 +00:00
|
|
|
struct demuxer *demuxer = mpctx->demuxer;
|
2014-02-18 23:41:12 +00:00
|
|
|
if (!demuxer)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
|
|
|
if (action == M_PROPERTY_PRINT) {
|
|
|
|
char *res = NULL;
|
|
|
|
|
|
|
|
struct demux_edition *editions = demuxer->editions;
|
|
|
|
int num_editions = demuxer->num_editions;
|
|
|
|
int current = demuxer->edition;
|
|
|
|
|
|
|
|
if (!num_editions)
|
|
|
|
res = talloc_asprintf_append(res, "No editions.");
|
|
|
|
|
|
|
|
for (int n = 0; n < num_editions; n++) {
|
|
|
|
struct demux_edition *ed = &editions[n];
|
|
|
|
|
2016-05-03 20:41:53 +00:00
|
|
|
res = talloc_strdup_append(res, n == current ? list_current
|
|
|
|
: list_normal);
|
2014-02-18 23:41:12 +00:00
|
|
|
res = talloc_asprintf_append(res, "%d: ", n);
|
|
|
|
char *title = mp_tags_get_str(ed->metadata, "title");
|
|
|
|
if (!title)
|
|
|
|
title = "unnamed";
|
2016-05-03 20:41:53 +00:00
|
|
|
res = talloc_asprintf_append(res, "'%s'\n", title);
|
2014-02-18 23:41:12 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
*(char **)arg = res;
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
|
|
|
return m_property_read_list(action, arg, demuxer->num_editions,
|
|
|
|
get_edition_entry, mpctx);
|
|
|
|
}
|
|
|
|
|
2014-07-14 23:49:02 +00:00
|
|
|
/// Number of titles in BD/DVD
|
|
|
|
static int mp_property_disc_titles(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
2016-02-15 20:03:51 +00:00
|
|
|
struct demuxer *demuxer = mpctx->demuxer;
|
2014-07-14 23:49:02 +00:00
|
|
|
unsigned int num_titles;
|
2014-07-16 20:40:21 +00:00
|
|
|
if (!demuxer || demux_stream_control(demuxer, STREAM_CTRL_GET_NUM_TITLES,
|
|
|
|
&num_titles) < 1)
|
2014-07-14 23:49:02 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
return m_property_int_ro(action, arg, num_titles);
|
|
|
|
}
|
|
|
|
|
2014-12-13 19:25:31 +00:00
|
|
|
static int get_disc_title_entry(int item, int action, void *arg, void *ctx)
|
|
|
|
{
|
|
|
|
struct MPContext *mpctx = ctx;
|
2016-02-15 20:03:51 +00:00
|
|
|
struct demuxer *demuxer = mpctx->demuxer;
|
2014-12-13 19:25:31 +00:00
|
|
|
|
|
|
|
double len = item;
|
|
|
|
if (demux_stream_control(demuxer, STREAM_CTRL_GET_TITLE_LENGTH, &len) < 1)
|
|
|
|
len = -1;
|
|
|
|
|
|
|
|
struct m_sub_property props[] = {
|
|
|
|
{"id", SUB_PROP_INT(item)},
|
|
|
|
{"length", {.type = CONF_TYPE_TIME}, {.time = len},
|
|
|
|
.unavailable = len < 0},
|
|
|
|
{0}
|
|
|
|
};
|
|
|
|
|
|
|
|
return m_property_read_sub(props, action, arg);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int mp_property_list_disc_titles(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
2016-02-15 20:03:51 +00:00
|
|
|
struct demuxer *demuxer = mpctx->demuxer;
|
2014-12-13 19:25:31 +00:00
|
|
|
unsigned int num_titles;
|
|
|
|
if (!demuxer || demux_stream_control(demuxer, STREAM_CTRL_GET_NUM_TITLES,
|
|
|
|
&num_titles) < 1)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
return m_property_read_list(action, arg, num_titles,
|
|
|
|
get_disc_title_entry, mpctx);
|
|
|
|
}
|
|
|
|
|
2008-09-26 21:17:01 +00:00
|
|
|
/// Number of chapters in file
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_chapters(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2008-09-26 21:17:01 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2015-05-26 19:42:34 +00:00
|
|
|
if (!mpctx->playback_initialized)
|
2008-09-26 21:17:01 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
2011-10-23 02:51:44 +00:00
|
|
|
int count = get_chapter_count(mpctx);
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return m_property_int_ro(action, arg, count);
|
2008-09-26 21:17:01 +00:00
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_editions(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2012-08-25 23:19:42 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2016-02-15 20:03:51 +00:00
|
|
|
struct demuxer *demuxer = mpctx->demuxer;
|
2012-08-25 23:19:42 +00:00
|
|
|
if (!demuxer)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
if (demuxer->num_editions <= 0)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return m_property_int_ro(action, arg, demuxer->num_editions);
|
2012-08-25 23:19:42 +00:00
|
|
|
}
|
|
|
|
|
2014-07-14 23:49:02 +00:00
|
|
|
/// Current dvd angle (RW)
|
|
|
|
static int mp_property_angle(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
2016-02-15 20:03:51 +00:00
|
|
|
struct demuxer *demuxer = mpctx->demuxer;
|
2014-07-14 23:49:02 +00:00
|
|
|
if (!demuxer)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
|
|
|
int ris, angles = -1, angle = 1;
|
|
|
|
|
2014-07-16 20:40:21 +00:00
|
|
|
ris = demux_stream_control(demuxer, STREAM_CTRL_GET_NUM_ANGLES, &angles);
|
2014-07-14 23:49:02 +00:00
|
|
|
if (ris == STREAM_UNSUPPORTED)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
2014-07-16 20:40:21 +00:00
|
|
|
ris = demux_stream_control(demuxer, STREAM_CTRL_GET_ANGLE, &angle);
|
2014-07-14 23:49:02 +00:00
|
|
|
if (ris == STREAM_UNSUPPORTED)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (angle < 0 || angles <= 1)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
|
|
|
switch (action) {
|
|
|
|
case M_PROPERTY_GET:
|
|
|
|
*(int *) arg = angle;
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
case M_PROPERTY_PRINT: {
|
|
|
|
*(char **) arg = talloc_asprintf(NULL, "%d/%d", angle, angles);
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
|
|
|
case M_PROPERTY_SET:
|
|
|
|
angle = *(int *)arg;
|
|
|
|
if (angle < 0 || angle > angles)
|
|
|
|
return M_PROPERTY_ERROR;
|
|
|
|
|
2014-07-20 12:13:24 +00:00
|
|
|
demux_flush(demuxer);
|
2014-07-16 20:40:21 +00:00
|
|
|
ris = demux_stream_control(demuxer, STREAM_CTRL_SET_ANGLE, &angle);
|
2016-03-09 22:55:16 +00:00
|
|
|
if (ris == STREAM_OK) {
|
|
|
|
demux_control(demuxer, DEMUXER_CTRL_RESYNC, NULL);
|
|
|
|
demux_flush(demuxer);
|
|
|
|
}
|
2014-07-14 23:49:02 +00:00
|
|
|
|
2014-11-20 21:45:02 +00:00
|
|
|
reset_audio_state(mpctx);
|
|
|
|
reset_video_state(mpctx);
|
2016-09-16 12:24:15 +00:00
|
|
|
mp_wakeup_core(mpctx);
|
2014-07-14 23:49:02 +00:00
|
|
|
|
2014-07-20 12:13:24 +00:00
|
|
|
return ris == STREAM_OK ? M_PROPERTY_OK : M_PROPERTY_ERROR;
|
2014-07-14 23:49:02 +00:00
|
|
|
case M_PROPERTY_GET_TYPE: {
|
|
|
|
struct m_option opt = {
|
|
|
|
.type = CONF_TYPE_INT,
|
|
|
|
.flags = CONF_RANGE,
|
|
|
|
.min = 1,
|
|
|
|
.max = angles,
|
|
|
|
};
|
|
|
|
*(struct m_option *)arg = opt;
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return M_PROPERTY_NOT_IMPLEMENTED;
|
|
|
|
}
|
|
|
|
|
2014-02-19 15:29:04 +00:00
|
|
|
static int get_tag_entry(int item, int action, void *arg, void *ctx)
|
|
|
|
{
|
|
|
|
struct mp_tags *tags = ctx;
|
|
|
|
|
|
|
|
struct m_sub_property props[] = {
|
|
|
|
{"key", SUB_PROP_STR(tags->keys[item])},
|
|
|
|
{"value", SUB_PROP_STR(tags->values[item])},
|
|
|
|
{0}
|
|
|
|
};
|
|
|
|
|
|
|
|
return m_property_read_sub(props, action, arg);
|
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int tag_property(int action, void *arg, struct mp_tags *tags)
|
2011-08-07 01:45:40 +00:00
|
|
|
{
|
|
|
|
switch (action) {
|
2012-09-18 18:07:24 +00:00
|
|
|
case M_PROPERTY_GET: {
|
2014-03-30 17:09:31 +00:00
|
|
|
mpv_node_list *list = talloc_zero(NULL, mpv_node_list);
|
|
|
|
mpv_node node = {
|
|
|
|
.format = MPV_FORMAT_NODE_MAP,
|
|
|
|
.u.list = list,
|
|
|
|
};
|
|
|
|
list->num = tags->num_keys;
|
|
|
|
list->values = talloc_array(list, mpv_node, list->num);
|
|
|
|
list->keys = talloc_array(list, char*, list->num);
|
2013-09-08 04:32:48 +00:00
|
|
|
for (int n = 0; n < tags->num_keys; n++) {
|
2014-03-30 17:09:31 +00:00
|
|
|
list->keys[n] = talloc_strdup(list, tags->keys[n]);
|
|
|
|
list->values[n] = (struct mpv_node){
|
|
|
|
.format = MPV_FORMAT_STRING,
|
|
|
|
.u.string = talloc_strdup(list, tags->values[n]),
|
|
|
|
};
|
2013-09-08 04:32:48 +00:00
|
|
|
}
|
2014-03-30 17:09:31 +00:00
|
|
|
*(mpv_node*)arg = node;
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
|
|
|
case M_PROPERTY_GET_TYPE: {
|
|
|
|
*(struct m_option *)arg = (struct m_option){.type = CONF_TYPE_NODE};
|
2007-05-29 22:14:41 +00:00
|
|
|
return M_PROPERTY_OK;
|
2012-09-18 18:07:24 +00:00
|
|
|
}
|
2013-06-07 15:31:30 +00:00
|
|
|
case M_PROPERTY_PRINT: {
|
|
|
|
char *res = NULL;
|
2013-09-08 04:32:48 +00:00
|
|
|
for (int n = 0; n < tags->num_keys; n++) {
|
2013-06-07 15:31:30 +00:00
|
|
|
res = talloc_asprintf_append_buffer(res, "%s: %s\n",
|
2013-09-08 04:32:48 +00:00
|
|
|
tags->keys[n], tags->values[n]);
|
2013-06-07 15:31:30 +00:00
|
|
|
}
|
2014-12-30 13:04:53 +00:00
|
|
|
if (!res)
|
|
|
|
res = talloc_strdup(NULL, "(empty)");
|
2013-06-07 15:31:30 +00:00
|
|
|
*(char **)arg = res;
|
2014-12-30 13:04:53 +00:00
|
|
|
return M_PROPERTY_OK;
|
2013-06-07 15:31:30 +00:00
|
|
|
}
|
2012-09-21 10:19:59 +00:00
|
|
|
case M_PROPERTY_KEY_ACTION: {
|
2012-09-22 04:15:36 +00:00
|
|
|
struct m_property_action_arg *ka = arg;
|
2014-03-30 11:41:03 +00:00
|
|
|
bstr key;
|
|
|
|
char *rem;
|
|
|
|
m_property_split_path(ka->key, &key, &rem);
|
|
|
|
if (bstr_equals0(key, "list")) {
|
2014-02-19 15:29:04 +00:00
|
|
|
struct m_property_action_arg nka = *ka;
|
2014-03-30 11:41:03 +00:00
|
|
|
nka.key = rem;
|
2014-02-19 15:29:04 +00:00
|
|
|
return m_property_read_list(action, &nka, tags->num_keys,
|
|
|
|
get_tag_entry, tags);
|
|
|
|
}
|
2014-02-19 15:16:42 +00:00
|
|
|
// Direct access without this prefix is allowed for compatibility.
|
2014-03-30 11:41:03 +00:00
|
|
|
bstr k = bstr0(ka->key);
|
|
|
|
bstr_eatstart0(&k, "by-key/");
|
|
|
|
char *meta = mp_tags_get_bstr(tags, k);
|
2012-09-21 10:19:59 +00:00
|
|
|
if (!meta)
|
2007-05-29 22:14:41 +00:00
|
|
|
return M_PROPERTY_UNKNOWN;
|
2011-08-07 01:45:40 +00:00
|
|
|
switch (ka->action) {
|
2007-05-29 22:14:41 +00:00
|
|
|
case M_PROPERTY_GET:
|
2012-09-18 18:07:24 +00:00
|
|
|
*(char **)ka->arg = talloc_strdup(NULL, meta);
|
2007-05-29 22:14:41 +00:00
|
|
|
return M_PROPERTY_OK;
|
|
|
|
case M_PROPERTY_GET_TYPE:
|
2014-03-30 16:50:35 +00:00
|
|
|
*(struct m_option *)ka->arg = (struct m_option){
|
|
|
|
.type = CONF_TYPE_STRING,
|
|
|
|
};
|
2007-05-29 22:14:41 +00:00
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
|
|
|
}
|
2012-09-21 10:19:59 +00:00
|
|
|
}
|
2007-05-29 22:14:41 +00:00
|
|
|
return M_PROPERTY_NOT_IMPLEMENTED;
|
|
|
|
}
|
|
|
|
|
2013-09-08 04:32:48 +00:00
|
|
|
/// Demuxer meta data
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_metadata(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2013-09-08 04:32:48 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2016-02-15 20:03:51 +00:00
|
|
|
struct demuxer *demuxer = mpctx->demuxer;
|
2013-09-08 04:32:48 +00:00
|
|
|
if (!demuxer)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return tag_property(action, arg, demuxer->metadata);
|
2013-09-08 04:32:48 +00:00
|
|
|
}
|
|
|
|
|
2014-12-29 22:03:39 +00:00
|
|
|
static int mp_property_filtered_metadata(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
|
|
|
if (!mpctx->filtered_tags)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
|
|
|
return tag_property(action, arg, mpctx->filtered_tags);
|
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_chapter_metadata(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2013-09-08 05:42:05 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2013-09-08 05:42:05 +00:00
|
|
|
int chapter = get_current_chapter(mpctx);
|
2015-08-12 09:10:45 +00:00
|
|
|
if (chapter < 0)
|
2014-11-02 16:20:04 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
return tag_property(action, arg, mpctx->chapters[chapter].metadata);
|
2013-09-08 05:42:05 +00:00
|
|
|
}
|
|
|
|
|
2015-09-11 21:04:02 +00:00
|
|
|
static int mp_property_filter_metadata(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2014-04-13 14:08:58 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2015-09-11 21:04:02 +00:00
|
|
|
const char *type = prop->priv;
|
2014-04-13 14:08:58 +00:00
|
|
|
|
2014-12-30 13:04:53 +00:00
|
|
|
if (action == M_PROPERTY_KEY_ACTION) {
|
2014-04-13 14:08:58 +00:00
|
|
|
struct m_property_action_arg *ka = arg;
|
|
|
|
bstr key;
|
|
|
|
char *rem;
|
|
|
|
m_property_split_path(ka->key, &key, &rem);
|
2015-09-11 21:04:02 +00:00
|
|
|
struct mp_tags metadata = {0};
|
|
|
|
int res = CONTROL_UNKNOWN;
|
|
|
|
if (strcmp(type, "vf") == 0) {
|
2016-01-13 23:18:48 +00:00
|
|
|
if (!mpctx->vo_chain)
|
2015-09-11 21:04:02 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
2016-01-13 23:18:48 +00:00
|
|
|
struct vf_chain *vf = mpctx->vo_chain->vf;
|
2015-09-11 21:04:02 +00:00
|
|
|
res = vf_control_by_label(vf, VFCTRL_GET_METADATA, &metadata, key);
|
|
|
|
} else if (strcmp(type, "af") == 0) {
|
2017-09-21 10:48:30 +00:00
|
|
|
#if HAVE_LIBAF
|
2016-01-21 21:10:15 +00:00
|
|
|
if (!(mpctx->ao_chain && mpctx->ao_chain->af))
|
2015-09-11 21:04:02 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
2016-01-21 21:10:15 +00:00
|
|
|
struct af_stream *af = mpctx->ao_chain->af;
|
2015-09-11 21:04:02 +00:00
|
|
|
res = af_control_by_label(af, AF_CONTROL_GET_METADATA, &metadata, key);
|
2017-09-21 10:48:30 +00:00
|
|
|
#endif
|
2015-09-11 21:04:02 +00:00
|
|
|
}
|
|
|
|
switch (res) {
|
2014-04-29 15:00:52 +00:00
|
|
|
case CONTROL_UNKNOWN:
|
2014-04-13 14:08:58 +00:00
|
|
|
return M_PROPERTY_UNKNOWN;
|
2014-12-30 13:04:53 +00:00
|
|
|
case CONTROL_NA: // empty
|
2014-04-29 15:00:52 +00:00
|
|
|
case CONTROL_OK:
|
|
|
|
if (strlen(rem)) {
|
|
|
|
struct m_property_action_arg next_ka = *ka;
|
|
|
|
next_ka.key = rem;
|
2015-09-11 21:04:02 +00:00
|
|
|
return tag_property(M_PROPERTY_KEY_ACTION, &next_ka, &metadata);
|
2014-04-29 15:00:52 +00:00
|
|
|
} else {
|
2015-09-11 21:04:02 +00:00
|
|
|
return tag_property(ka->action, ka->arg, &metadata);
|
2014-04-29 15:00:52 +00:00
|
|
|
}
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
default:
|
|
|
|
return M_PROPERTY_ERROR;
|
2014-04-13 14:08:58 +00:00
|
|
|
}
|
|
|
|
}
|
2014-04-14 00:45:45 +00:00
|
|
|
return M_PROPERTY_NOT_IMPLEMENTED;
|
2014-04-13 14:08:58 +00:00
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_pause(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2008-10-01 17:05:30 +00:00
|
|
|
{
|
2008-11-29 06:09:57 +00:00
|
|
|
MPContext *mpctx = ctx;
|
|
|
|
|
2016-09-01 18:57:33 +00:00
|
|
|
if (mpctx->playback_initialized && action == M_PROPERTY_SET) {
|
2017-04-14 16:22:45 +00:00
|
|
|
set_pause_state(mpctx, *(int *)arg);
|
2010-05-07 19:02:47 +00:00
|
|
|
return M_PROPERTY_OK;
|
2008-11-29 06:09:57 +00:00
|
|
|
}
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return mp_property_generic_option(mpctx, prop, action, arg);
|
2008-10-01 17:05:30 +00:00
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_core_idle(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2014-04-14 20:03:43 +00:00
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
2017-04-14 16:56:03 +00:00
|
|
|
return m_property_flag_ro(action, arg, !mpctx->playback_active);
|
2014-04-14 20:03:43 +00:00
|
|
|
}
|
|
|
|
|
2014-12-10 13:42:57 +00:00
|
|
|
static int mp_property_idle(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
|
|
|
struct command_ctx *cmd = mpctx->command_ctx;
|
|
|
|
return m_property_flag_ro(action, arg, cmd->is_idle);
|
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_eof_reached(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2014-04-14 20:19:07 +00:00
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
2015-05-26 19:42:34 +00:00
|
|
|
if (!mpctx->playback_initialized)
|
2014-09-01 19:44:54 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
2014-07-29 22:22:25 +00:00
|
|
|
bool eof = mpctx->video_status == STATUS_EOF &&
|
|
|
|
mpctx->audio_status == STATUS_EOF;
|
|
|
|
return m_property_flag_ro(action, arg, eof);
|
2014-04-14 20:19:07 +00:00
|
|
|
}
|
|
|
|
|
2014-08-07 22:13:27 +00:00
|
|
|
static int mp_property_seeking(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
2015-05-26 19:42:34 +00:00
|
|
|
if (!mpctx->playback_initialized)
|
2014-09-01 19:44:54 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
2014-08-07 22:13:27 +00:00
|
|
|
return m_property_flag_ro(action, arg, !mpctx->restart_complete);
|
|
|
|
}
|
|
|
|
|
2014-10-21 11:32:30 +00:00
|
|
|
static int mp_property_playback_abort(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
|
|
|
return m_property_flag_ro(action, arg, !mpctx->playing || mpctx->stop_play);
|
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_cache(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2013-02-17 19:24:59 +00:00
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
2014-07-01 22:14:30 +00:00
|
|
|
float cache = mp_get_cache_percent(mpctx);
|
2013-02-17 19:24:59 +00:00
|
|
|
if (cache < 0)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
2014-07-01 22:14:30 +00:00
|
|
|
|
2014-08-11 11:30:08 +00:00
|
|
|
if (action == M_PROPERTY_PRINT) {
|
2014-08-17 23:42:43 +00:00
|
|
|
*(char **)arg = talloc_asprintf(NULL, "%d", (int)cache);
|
2014-08-11 11:30:08 +00:00
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
|
|
|
|
2014-07-01 22:14:30 +00:00
|
|
|
return m_property_float_ro(action, arg, cache);
|
2013-02-17 19:24:59 +00:00
|
|
|
}
|
2007-05-29 22:14:41 +00:00
|
|
|
|
2014-07-01 23:46:04 +00:00
|
|
|
static int property_int_kb_size(int kb_size, int action, void *arg)
|
|
|
|
{
|
|
|
|
switch (action) {
|
|
|
|
case M_PROPERTY_GET:
|
|
|
|
*(int *)arg = kb_size;
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
case M_PROPERTY_PRINT:
|
|
|
|
*(char **)arg = format_file_size(kb_size * 1024LL);
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
case M_PROPERTY_GET_TYPE:
|
|
|
|
*(struct m_option *)arg = (struct m_option){.type = CONF_TYPE_INT};
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
|
|
|
return M_PROPERTY_NOT_IMPLEMENTED;
|
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_cache_size(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2014-04-09 17:15:23 +00:00
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
2014-07-16 20:40:21 +00:00
|
|
|
struct demuxer *demuxer = mpctx->demuxer;
|
|
|
|
if (!demuxer)
|
2014-04-09 17:15:23 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
switch (action) {
|
2014-07-01 23:46:04 +00:00
|
|
|
case M_PROPERTY_GET:
|
|
|
|
case M_PROPERTY_PRINT: {
|
2016-03-29 09:29:52 +00:00
|
|
|
struct stream_cache_info info = {0};
|
|
|
|
demux_stream_control(demuxer, STREAM_CTRL_GET_CACHE_INFO, &info);
|
|
|
|
if (info.size <= 0)
|
2014-04-09 17:15:23 +00:00
|
|
|
break;
|
2016-03-29 09:29:52 +00:00
|
|
|
return property_int_kb_size(info.size / 1024, action, arg);
|
2014-04-09 17:15:23 +00:00
|
|
|
}
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
case M_PROPERTY_GET_TYPE:
|
|
|
|
*(struct m_option *)arg = (struct m_option){
|
|
|
|
.type = CONF_TYPE_INT,
|
|
|
|
.flags = M_OPT_MIN,
|
|
|
|
.min = 0,
|
|
|
|
};
|
|
|
|
return M_PROPERTY_OK;
|
2014-04-09 17:15:23 +00:00
|
|
|
case M_PROPERTY_SET: {
|
|
|
|
int64_t size = *(int *)arg * 1024LL;
|
2014-07-16 20:40:21 +00:00
|
|
|
int r = demux_stream_control(demuxer, STREAM_CTRL_SET_CACHE_SIZE, &size);
|
2014-04-09 17:15:23 +00:00
|
|
|
if (r == STREAM_UNSUPPORTED)
|
|
|
|
break;
|
|
|
|
if (r == STREAM_OK)
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
return M_PROPERTY_ERROR;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return M_PROPERTY_NOT_IMPLEMENTED;
|
|
|
|
}
|
|
|
|
|
2014-07-01 22:14:30 +00:00
|
|
|
static int mp_property_cache_used(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
2014-07-16 20:40:21 +00:00
|
|
|
if (!mpctx->demuxer)
|
2014-07-01 22:14:30 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
2016-03-29 09:29:52 +00:00
|
|
|
struct stream_cache_info info = {0};
|
|
|
|
demux_stream_control(mpctx->demuxer, STREAM_CTRL_GET_CACHE_INFO, &info);
|
|
|
|
if (info.size <= 0)
|
2014-07-01 23:46:04 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
2016-03-29 09:29:52 +00:00
|
|
|
return property_int_kb_size(info.fill / 1024, action, arg);
|
2014-07-01 22:14:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int mp_property_cache_free(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
2014-07-16 20:40:21 +00:00
|
|
|
if (!mpctx->demuxer)
|
2014-07-01 22:14:30 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
2016-03-29 09:29:52 +00:00
|
|
|
struct stream_cache_info info = {0};
|
|
|
|
demux_stream_control(mpctx->demuxer, STREAM_CTRL_GET_CACHE_INFO, &info);
|
|
|
|
if (info.size <= 0)
|
2014-07-01 23:46:04 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
2014-07-01 22:14:30 +00:00
|
|
|
|
2016-03-29 09:29:52 +00:00
|
|
|
return property_int_kb_size((info.size - info.fill) / 1024, action, arg);
|
2014-07-01 22:14:30 +00:00
|
|
|
}
|
|
|
|
|
2016-03-20 18:48:55 +00:00
|
|
|
static int mp_property_cache_speed(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
|
|
|
if (!mpctx->demuxer)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
2016-03-29 09:29:52 +00:00
|
|
|
struct stream_cache_info info = {0};
|
|
|
|
demux_stream_control(mpctx->demuxer, STREAM_CTRL_GET_CACHE_INFO, &info);
|
|
|
|
if (info.size <= 0)
|
2016-03-20 18:48:55 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
2016-03-22 21:29:15 +00:00
|
|
|
if (action == M_PROPERTY_PRINT) {
|
2016-03-29 09:29:52 +00:00
|
|
|
*(char **)arg = talloc_strdup_append(format_file_size(info.speed), "/s");
|
2016-03-22 21:29:15 +00:00
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
2016-03-29 09:29:52 +00:00
|
|
|
return m_property_int64_ro(action, arg, info.speed);
|
2016-03-20 18:48:55 +00:00
|
|
|
}
|
|
|
|
|
2014-07-31 02:25:39 +00:00
|
|
|
static int mp_property_cache_idle(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
2016-03-29 09:29:52 +00:00
|
|
|
struct stream_cache_info info = {0};
|
2014-07-31 02:25:39 +00:00
|
|
|
if (mpctx->demuxer)
|
2016-03-29 09:29:52 +00:00
|
|
|
demux_stream_control(mpctx->demuxer, STREAM_CTRL_GET_CACHE_INFO, &info);
|
|
|
|
if (info.size <= 0)
|
2014-07-31 02:25:39 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
2016-03-29 09:29:52 +00:00
|
|
|
return m_property_flag_ro(action, arg, info.idle);
|
2014-07-31 02:25:39 +00:00
|
|
|
}
|
|
|
|
|
2014-08-28 15:48:31 +00:00
|
|
|
static int mp_property_demuxer_cache_duration(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
|
|
|
if (!mpctx->demuxer)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
|
|
|
struct demux_ctrl_reader_state s;
|
|
|
|
if (demux_control(mpctx->demuxer, DEMUXER_CTRL_GET_READER_STATE, &s) < 1)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
|
|
|
if (s.ts_duration < 0)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
|
|
|
return m_property_double_ro(action, arg, s.ts_duration);
|
|
|
|
}
|
|
|
|
|
2015-04-20 21:47:13 +00:00
|
|
|
static int mp_property_demuxer_cache_time(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
|
|
|
if (!mpctx->demuxer)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
|
|
|
struct demux_ctrl_reader_state s;
|
|
|
|
if (demux_control(mpctx->demuxer, DEMUXER_CTRL_GET_READER_STATE, &s) < 1)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
|
|
|
double ts = s.ts_range[1];
|
|
|
|
if (ts == MP_NOPTS_VALUE)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
|
|
|
return m_property_double_ro(action, arg, ts);
|
|
|
|
}
|
|
|
|
|
2014-08-28 15:48:31 +00:00
|
|
|
static int mp_property_demuxer_cache_idle(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
|
|
|
if (!mpctx->demuxer)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
|
|
|
struct demux_ctrl_reader_state s;
|
|
|
|
if (demux_control(mpctx->demuxer, DEMUXER_CTRL_GET_READER_STATE, &s) < 1)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
|
|
|
return m_property_flag_ro(action, arg, s.idle);
|
|
|
|
}
|
|
|
|
|
2017-03-10 00:44:55 +00:00
|
|
|
static int mp_property_demuxer_start_time(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
|
|
|
if (!mpctx->demuxer)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
|
|
|
return m_property_double_ro(action, arg, mpctx->demuxer->start_time);
|
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_paused_for_cache(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2014-04-12 18:26:28 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2015-05-26 19:42:34 +00:00
|
|
|
if (!mpctx->playback_initialized)
|
2014-09-01 19:44:54 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return m_property_flag_ro(action, arg, mpctx->paused_for_cache);
|
2014-04-12 18:26:28 +00:00
|
|
|
}
|
|
|
|
|
2014-10-07 20:07:07 +00:00
|
|
|
static int mp_property_cache_buffering(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
2016-04-19 20:01:30 +00:00
|
|
|
int state = get_cache_buffering_percentage(mpctx);
|
2014-10-07 20:07:07 +00:00
|
|
|
if (state < 0)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
2016-04-19 20:01:30 +00:00
|
|
|
return m_property_int_ro(action, arg, state);
|
2014-10-07 20:07:07 +00:00
|
|
|
}
|
|
|
|
|
2017-03-24 14:31:01 +00:00
|
|
|
static int mp_property_demuxer_is_network(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
|
|
|
if (!mpctx->demuxer)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
|
|
|
return m_property_flag_ro(action, arg, mpctx->demuxer->is_network);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_clock(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2013-06-04 11:33:01 +00:00
|
|
|
{
|
|
|
|
char outstr[6];
|
|
|
|
time_t t = time(NULL);
|
|
|
|
struct tm *tmp = localtime(&t);
|
|
|
|
|
2013-06-13 22:46:28 +00:00
|
|
|
if ((tmp != NULL) && (strftime(outstr, sizeof(outstr), "%H:%M", tmp) == 5))
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return m_property_strdup_ro(action, arg, outstr);
|
2013-06-04 11:33:01 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_seekable(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2014-02-28 14:04:10 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2014-02-28 14:04:10 +00:00
|
|
|
if (!mpctx->demuxer)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return m_property_flag_ro(action, arg, mpctx->demuxer->seekable);
|
2014-02-28 14:04:10 +00:00
|
|
|
}
|
|
|
|
|
2015-01-26 12:46:33 +00:00
|
|
|
static int mp_property_partially_seekable(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
|
|
|
if (!mpctx->demuxer)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
return m_property_flag_ro(action, arg, mpctx->demuxer->partially_seekable);
|
|
|
|
}
|
|
|
|
|
2016-01-26 14:12:42 +00:00
|
|
|
static int mp_property_mixer_active(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
2017-09-21 10:48:30 +00:00
|
|
|
return m_property_flag_ro(action, arg, !!mpctx->ao);
|
2016-01-26 14:12:42 +00:00
|
|
|
}
|
|
|
|
|
2007-02-21 00:49:24 +00:00
|
|
|
/// Volume (RW)
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_volume(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2007-02-21 00:49:24 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2016-07-09 16:31:18 +00:00
|
|
|
struct MPOpts *opts = mpctx->opts;
|
|
|
|
|
2007-02-21 00:49:24 +00:00
|
|
|
switch (action) {
|
player: more option/property consistency fixes
Some properties had a different type from their equivalent options (such
as mute, volume, deinterlace, edition). This wasn't really sane, as raw
option values should be always within their bounds. On the other hand,
these properties use a different type to reflect runtime limits (such as
range of available editions), or simply to improve the "UI" (you don't
want to cycle throuhg the completely useless "auto" value when cycling
the "mute" property).
Handle this by making them always return the option type, but also
allowing them to provide a "constricted" type, which is used for UI
purposes. All M_PROPERTY_GET_CONSTRICTED_TYPE changes are related to
this.
One consequence is that you can set the volume property to arbitrary
high values just like with the --volume option, but using the "add"
command it still restricts it to the --volume-max range.
Also deprecate --chapter, as it is grossly incompatible to the chapter
property. We pondered renaming it to --chapters, or introducing a more
powerful --range option, but concluded that --start --end is actually
enough.
These changes appear to take care of the last gross property/option
incompatibilities, although there might still be a few lurking.
2016-09-18 14:06:12 +00:00
|
|
|
case M_PROPERTY_GET_CONSTRICTED_TYPE:
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
*(struct m_option *)arg = (struct m_option){
|
|
|
|
.type = CONF_TYPE_FLOAT,
|
|
|
|
.flags = M_OPT_RANGE,
|
|
|
|
.min = 0,
|
2016-07-09 16:31:18 +00:00
|
|
|
.max = opts->softvol_max,
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
};
|
|
|
|
return M_PROPERTY_OK;
|
2016-07-09 16:31:18 +00:00
|
|
|
case M_PROPERTY_PRINT:
|
|
|
|
*(char **)arg = talloc_asprintf(NULL, "%i", (int)opts->softvol_volume);
|
2010-05-03 23:34:38 +00:00
|
|
|
return M_PROPERTY_OK;
|
2007-02-21 00:49:24 +00:00
|
|
|
}
|
|
|
|
|
2017-04-26 19:45:50 +00:00
|
|
|
return mp_property_generic_option(mpctx, prop, action, arg);
|
2016-01-26 14:12:42 +00:00
|
|
|
}
|
|
|
|
|
2007-02-21 00:49:24 +00:00
|
|
|
/// Mute (RW)
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_mute(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2007-02-21 00:49:24 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2016-07-09 16:31:18 +00:00
|
|
|
|
player: more option/property consistency fixes
Some properties had a different type from their equivalent options (such
as mute, volume, deinterlace, edition). This wasn't really sane, as raw
option values should be always within their bounds. On the other hand,
these properties use a different type to reflect runtime limits (such as
range of available editions), or simply to improve the "UI" (you don't
want to cycle throuhg the completely useless "auto" value when cycling
the "mute" property).
Handle this by making them always return the option type, but also
allowing them to provide a "constricted" type, which is used for UI
purposes. All M_PROPERTY_GET_CONSTRICTED_TYPE changes are related to
this.
One consequence is that you can set the volume property to arbitrary
high values just like with the --volume option, but using the "add"
command it still restricts it to the --volume-max range.
Also deprecate --chapter, as it is grossly incompatible to the chapter
property. We pondered renaming it to --chapters, or introducing a more
powerful --range option, but concluded that --start --end is actually
enough.
These changes appear to take care of the last gross property/option
incompatibilities, although there might still be a few lurking.
2016-09-18 14:06:12 +00:00
|
|
|
if (action == M_PROPERTY_GET_CONSTRICTED_TYPE) {
|
2016-07-09 16:31:18 +00:00
|
|
|
*(struct m_option *)arg = (struct m_option){.type = CONF_TYPE_FLAG};
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
int r = mp_property_generic_option(mpctx, prop, action, arg);
|
|
|
|
if (action == M_PROPERTY_SET)
|
2016-07-17 17:21:28 +00:00
|
|
|
audio_update_volume(mpctx);
|
2016-07-09 16:31:18 +00:00
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int mp_property_ao_volume(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
|
|
|
struct ao *ao = mpctx->ao;
|
|
|
|
if (!ao)
|
|
|
|
return M_PROPERTY_NOT_IMPLEMENTED;
|
|
|
|
|
2007-02-21 00:49:24 +00:00
|
|
|
switch (action) {
|
2016-07-09 16:31:18 +00:00
|
|
|
case M_PROPERTY_SET: {
|
|
|
|
float value = *(float *)arg;
|
|
|
|
ao_control_vol_t vol = {value, value};
|
|
|
|
if (ao_control(ao, AOCONTROL_SET_VOLUME, &vol) != CONTROL_OK)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
2010-05-03 23:34:38 +00:00
|
|
|
return M_PROPERTY_OK;
|
2016-07-09 16:31:18 +00:00
|
|
|
}
|
|
|
|
case M_PROPERTY_GET: {
|
|
|
|
ao_control_vol_t vol = {0};
|
|
|
|
if (ao_control(ao, AOCONTROL_GET_VOLUME, &vol) != CONTROL_OK)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
*(float *)arg = (vol.left + vol.right) / 2.0f;
|
2012-09-18 18:07:24 +00:00
|
|
|
return M_PROPERTY_OK;
|
2016-07-09 16:31:18 +00:00
|
|
|
}
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
case M_PROPERTY_GET_TYPE:
|
2016-07-10 10:50:58 +00:00
|
|
|
*(struct m_option *)arg = (struct m_option){
|
|
|
|
.type = CONF_TYPE_FLOAT,
|
|
|
|
.flags = M_OPT_RANGE,
|
|
|
|
.min = 0,
|
|
|
|
.max = 100,
|
|
|
|
};
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return M_PROPERTY_OK;
|
2016-07-10 10:50:58 +00:00
|
|
|
case M_PROPERTY_PRINT: {
|
|
|
|
ao_control_vol_t vol = {0};
|
|
|
|
if (ao_control(ao, AOCONTROL_GET_VOLUME, &vol) != CONTROL_OK)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
*(char **)arg = talloc_asprintf(NULL, "%.f", (vol.left + vol.right) / 2.0f);
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
2007-02-21 00:49:24 +00:00
|
|
|
}
|
2012-09-18 18:07:24 +00:00
|
|
|
return M_PROPERTY_NOT_IMPLEMENTED;
|
2007-02-21 00:49:24 +00:00
|
|
|
}
|
|
|
|
|
2016-07-09 16:31:18 +00:00
|
|
|
|
|
|
|
static int mp_property_ao_mute(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2013-09-19 12:32:47 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2016-07-09 16:31:18 +00:00
|
|
|
struct ao *ao = mpctx->ao;
|
|
|
|
if (!ao)
|
|
|
|
return M_PROPERTY_NOT_IMPLEMENTED;
|
|
|
|
|
2013-09-19 12:32:47 +00:00
|
|
|
switch (action) {
|
2016-07-09 16:31:18 +00:00
|
|
|
case M_PROPERTY_SET: {
|
|
|
|
bool value = *(int *)arg;
|
|
|
|
if (ao_control(ao, AOCONTROL_SET_MUTE, &value) != CONTROL_OK)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
2013-09-19 12:32:47 +00:00
|
|
|
case M_PROPERTY_GET: {
|
2016-07-09 16:31:18 +00:00
|
|
|
bool value = false;
|
|
|
|
if (ao_control(ao, AOCONTROL_GET_MUTE, &value) != CONTROL_OK)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
*(int *)arg = value;
|
|
|
|
return M_PROPERTY_OK;
|
2013-09-19 12:32:47 +00:00
|
|
|
}
|
2016-07-09 16:31:18 +00:00
|
|
|
case M_PROPERTY_GET_TYPE:
|
|
|
|
*(struct m_option *)arg = (struct m_option){.type = CONF_TYPE_FLAG};
|
|
|
|
return M_PROPERTY_OK;
|
2013-09-19 12:32:47 +00:00
|
|
|
}
|
2016-07-09 16:31:18 +00:00
|
|
|
return M_PROPERTY_NOT_IMPLEMENTED;
|
2013-09-19 12:32:47 +00:00
|
|
|
}
|
|
|
|
|
2014-10-10 17:46:21 +00:00
|
|
|
static int get_device_entry(int item, int action, void *arg, void *ctx)
|
|
|
|
{
|
|
|
|
struct ao_device_list *list = ctx;
|
|
|
|
struct ao_device_desc *entry = &list->devices[item];
|
|
|
|
|
|
|
|
struct m_sub_property props[] = {
|
|
|
|
{"name", SUB_PROP_STR(entry->name)},
|
|
|
|
{"description", SUB_PROP_STR(entry->desc)},
|
|
|
|
{0}
|
|
|
|
};
|
|
|
|
|
|
|
|
return m_property_read_sub(props, action, arg);
|
|
|
|
}
|
|
|
|
|
2016-09-16 12:23:54 +00:00
|
|
|
static void create_hotplug(struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
struct command_ctx *cmd = mpctx->command_ctx;
|
|
|
|
|
|
|
|
if (!cmd->hotplug) {
|
|
|
|
cmd->hotplug = ao_hotplug_create(mpctx->global, mp_wakeup_core_cb,
|
|
|
|
mpctx);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-10-27 11:16:32 +00:00
|
|
|
static int mp_property_audio_device(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
struct MPContext *mpctx = ctx;
|
2015-02-16 20:35:13 +00:00
|
|
|
struct command_ctx *cmd = mpctx->command_ctx;
|
|
|
|
if (action == M_PROPERTY_PRINT) {
|
2016-09-16 12:23:54 +00:00
|
|
|
create_hotplug(mpctx);
|
|
|
|
|
2015-02-16 20:35:13 +00:00
|
|
|
struct ao_device_list *list = ao_hotplug_get_device_list(cmd->hotplug);
|
|
|
|
for (int n = 0; n < list->num_devices; n++) {
|
|
|
|
struct ao_device_desc *dev = &list->devices[n];
|
2015-10-13 20:09:13 +00:00
|
|
|
if (dev->name && strcmp(dev->name, mpctx->opts->audio_device) == 0) {
|
2015-02-16 20:35:13 +00:00
|
|
|
*(char **)arg = talloc_strdup(NULL, dev->desc ? dev->desc : "?");
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2016-10-05 14:45:04 +00:00
|
|
|
return mp_property_generic_option(mpctx, prop, action, arg);
|
2014-10-27 11:16:32 +00:00
|
|
|
}
|
|
|
|
|
2014-10-10 17:46:21 +00:00
|
|
|
static int mp_property_audio_devices(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
struct MPContext *mpctx = ctx;
|
|
|
|
struct command_ctx *cmd = mpctx->command_ctx;
|
2016-09-16 12:23:54 +00:00
|
|
|
create_hotplug(mpctx);
|
2014-10-10 17:46:21 +00:00
|
|
|
|
2015-02-12 15:53:56 +00:00
|
|
|
struct ao_device_list *list = ao_hotplug_get_device_list(cmd->hotplug);
|
|
|
|
return m_property_read_list(action, arg, list->num_devices,
|
|
|
|
get_device_entry, list);
|
2014-10-10 17:46:21 +00:00
|
|
|
}
|
|
|
|
|
2015-02-02 16:35:31 +00:00
|
|
|
static int mp_property_ao(void *ctx, struct m_property *p, int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
|
|
|
return m_property_strdup_ro(action, arg,
|
|
|
|
mpctx->ao ? ao_get_name(mpctx->ao) : NULL);
|
|
|
|
}
|
|
|
|
|
2007-02-21 00:49:24 +00:00
|
|
|
/// Audio delay (RW)
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_audio_delay(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2007-02-21 00:49:24 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2013-07-27 19:24:54 +00:00
|
|
|
float delay = mpctx->opts->audio_delay;
|
2007-02-21 00:49:24 +00:00
|
|
|
switch (action) {
|
2012-09-18 13:31:46 +00:00
|
|
|
case M_PROPERTY_PRINT:
|
2012-10-30 18:44:09 +00:00
|
|
|
*(char **)arg = format_delay(delay);
|
2012-09-18 13:31:46 +00:00
|
|
|
return M_PROPERTY_OK;
|
2012-09-18 18:07:24 +00:00
|
|
|
case M_PROPERTY_SET:
|
2015-01-29 11:10:07 +00:00
|
|
|
mpctx->opts->audio_delay = *(float *)arg;
|
2016-09-01 18:57:33 +00:00
|
|
|
if (mpctx->ao_chain && mpctx->vo_chain)
|
|
|
|
mpctx->delay += mpctx->opts->audio_delay - delay;
|
2016-09-16 12:24:15 +00:00
|
|
|
mp_wakeup_core(mpctx);
|
2010-05-03 23:34:38 +00:00
|
|
|
return M_PROPERTY_OK;
|
2007-02-21 00:49:24 +00:00
|
|
|
}
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return mp_property_generic_option(mpctx, prop, action, arg);
|
2007-02-21 00:49:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Audio codec tag (RO)
|
2015-05-22 18:05:04 +00:00
|
|
|
static int mp_property_audio_codec_name(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2007-02-21 00:49:24 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2016-01-21 21:24:20 +00:00
|
|
|
struct track *track = mpctx->current_track[0][STREAM_AUDIO];
|
|
|
|
const char *c = track && track->stream ? track->stream->codec->codec : NULL;
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return m_property_strdup_ro(action, arg, c);
|
2007-02-21 00:49:24 +00:00
|
|
|
}
|
|
|
|
|
2007-05-29 22:14:41 +00:00
|
|
|
/// Audio codec name (RO)
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_audio_codec(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2007-05-29 22:14:41 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2016-01-21 21:24:20 +00:00
|
|
|
struct track *track = mpctx->current_track[0][STREAM_AUDIO];
|
|
|
|
const char *c = track && track->d_audio ? track->d_audio->decoder_desc : NULL;
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return m_property_strdup_ro(action, arg, c);
|
2007-05-29 22:14:41 +00:00
|
|
|
}
|
|
|
|
|
audio: introduce a new type to hold audio frames
This is pretty pointless, but I believe it allows us to claim that the
new code is not affected by the copyright of the old code. This is
needed, because the original mp_audio struct was written by someone who
has disagreed with LGPL relicensing (it was called af_data at the time,
and was defined in af.h).
The "GPL'ed" struct contents that surive are pretty trivial: just the
data pointer, and some metadata like the format, samplerate, etc. - but
at least in this case, any new code would be extremely similar anyway,
and I'm not really sure whether it's OK to claim different copyright. So
what we do is we just use AVFrame (which of course is LGPL with 100%
certainty), and add some accessors around it to adapt it to mpv
conventions.
Also, this gets rid of some annoying conventions of mp_audio, like the
struct fields that require using an accessor to write to them anyway.
For the most part, this change is only dumb replacements of mp_audio
related functions and fields. One minor actual change is that you can't
allocate the new type on the stack anymore.
Some code still uses mp_audio. All audio filter code will be deleted, so
it makes no sense to convert this code. (Audio filters which are LGPL
and which we keep will have to be ported to a new filter infrastructure
anyway.) player/audio.c uses it because it interacts with the old filter
code. push.c has some complex use of mp_audio and mp_audio_buffer, but
this and pull.c will most likely be rewritten to do something else.
2017-08-16 19:00:20 +00:00
|
|
|
static int property_audiofmt(struct mp_aframe *fmt, int action, void *arg)
|
2015-05-22 18:23:47 +00:00
|
|
|
{
|
audio: introduce a new type to hold audio frames
This is pretty pointless, but I believe it allows us to claim that the
new code is not affected by the copyright of the old code. This is
needed, because the original mp_audio struct was written by someone who
has disagreed with LGPL relicensing (it was called af_data at the time,
and was defined in af.h).
The "GPL'ed" struct contents that surive are pretty trivial: just the
data pointer, and some metadata like the format, samplerate, etc. - but
at least in this case, any new code would be extremely similar anyway,
and I'm not really sure whether it's OK to claim different copyright. So
what we do is we just use AVFrame (which of course is LGPL with 100%
certainty), and add some accessors around it to adapt it to mpv
conventions.
Also, this gets rid of some annoying conventions of mp_audio, like the
struct fields that require using an accessor to write to them anyway.
For the most part, this change is only dumb replacements of mp_audio
related functions and fields. One minor actual change is that you can't
allocate the new type on the stack anymore.
Some code still uses mp_audio. All audio filter code will be deleted, so
it makes no sense to convert this code. (Audio filters which are LGPL
and which we keep will have to be ported to a new filter infrastructure
anyway.) player/audio.c uses it because it interacts with the old filter
code. push.c has some complex use of mp_audio and mp_audio_buffer, but
this and pull.c will most likely be rewritten to do something else.
2017-08-16 19:00:20 +00:00
|
|
|
if (!fmt || !mp_aframe_config_is_valid(fmt))
|
2015-05-22 18:23:47 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
audio: introduce a new type to hold audio frames
This is pretty pointless, but I believe it allows us to claim that the
new code is not affected by the copyright of the old code. This is
needed, because the original mp_audio struct was written by someone who
has disagreed with LGPL relicensing (it was called af_data at the time,
and was defined in af.h).
The "GPL'ed" struct contents that surive are pretty trivial: just the
data pointer, and some metadata like the format, samplerate, etc. - but
at least in this case, any new code would be extremely similar anyway,
and I'm not really sure whether it's OK to claim different copyright. So
what we do is we just use AVFrame (which of course is LGPL with 100%
certainty), and add some accessors around it to adapt it to mpv
conventions.
Also, this gets rid of some annoying conventions of mp_audio, like the
struct fields that require using an accessor to write to them anyway.
For the most part, this change is only dumb replacements of mp_audio
related functions and fields. One minor actual change is that you can't
allocate the new type on the stack anymore.
Some code still uses mp_audio. All audio filter code will be deleted, so
it makes no sense to convert this code. (Audio filters which are LGPL
and which we keep will have to be ported to a new filter infrastructure
anyway.) player/audio.c uses it because it interacts with the old filter
code. push.c has some complex use of mp_audio and mp_audio_buffer, but
this and pull.c will most likely be rewritten to do something else.
2017-08-16 19:00:20 +00:00
|
|
|
struct mp_chmap chmap = {0};
|
|
|
|
mp_aframe_get_chmap(fmt, &chmap);
|
|
|
|
|
2015-05-22 18:23:47 +00:00
|
|
|
struct m_sub_property props[] = {
|
audio: introduce a new type to hold audio frames
This is pretty pointless, but I believe it allows us to claim that the
new code is not affected by the copyright of the old code. This is
needed, because the original mp_audio struct was written by someone who
has disagreed with LGPL relicensing (it was called af_data at the time,
and was defined in af.h).
The "GPL'ed" struct contents that surive are pretty trivial: just the
data pointer, and some metadata like the format, samplerate, etc. - but
at least in this case, any new code would be extremely similar anyway,
and I'm not really sure whether it's OK to claim different copyright. So
what we do is we just use AVFrame (which of course is LGPL with 100%
certainty), and add some accessors around it to adapt it to mpv
conventions.
Also, this gets rid of some annoying conventions of mp_audio, like the
struct fields that require using an accessor to write to them anyway.
For the most part, this change is only dumb replacements of mp_audio
related functions and fields. One minor actual change is that you can't
allocate the new type on the stack anymore.
Some code still uses mp_audio. All audio filter code will be deleted, so
it makes no sense to convert this code. (Audio filters which are LGPL
and which we keep will have to be ported to a new filter infrastructure
anyway.) player/audio.c uses it because it interacts with the old filter
code. push.c has some complex use of mp_audio and mp_audio_buffer, but
this and pull.c will most likely be rewritten to do something else.
2017-08-16 19:00:20 +00:00
|
|
|
{"samplerate", SUB_PROP_INT(mp_aframe_get_rate(fmt))},
|
|
|
|
{"channel-count", SUB_PROP_INT(chmap.num)},
|
|
|
|
{"channels", SUB_PROP_STR(mp_chmap_to_str(&chmap))},
|
|
|
|
{"hr-channels", SUB_PROP_STR(mp_chmap_to_str_hr(&chmap))},
|
|
|
|
{"format", SUB_PROP_STR(af_fmt_to_str(mp_aframe_get_format(fmt)))},
|
2015-05-22 18:23:47 +00:00
|
|
|
{0}
|
|
|
|
};
|
|
|
|
|
|
|
|
return m_property_read_sub(props, action, arg);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int mp_property_audio_params(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
audio: introduce a new type to hold audio frames
This is pretty pointless, but I believe it allows us to claim that the
new code is not affected by the copyright of the old code. This is
needed, because the original mp_audio struct was written by someone who
has disagreed with LGPL relicensing (it was called af_data at the time,
and was defined in af.h).
The "GPL'ed" struct contents that surive are pretty trivial: just the
data pointer, and some metadata like the format, samplerate, etc. - but
at least in this case, any new code would be extremely similar anyway,
and I'm not really sure whether it's OK to claim different copyright. So
what we do is we just use AVFrame (which of course is LGPL with 100%
certainty), and add some accessors around it to adapt it to mpv
conventions.
Also, this gets rid of some annoying conventions of mp_audio, like the
struct fields that require using an accessor to write to them anyway.
For the most part, this change is only dumb replacements of mp_audio
related functions and fields. One minor actual change is that you can't
allocate the new type on the stack anymore.
Some code still uses mp_audio. All audio filter code will be deleted, so
it makes no sense to convert this code. (Audio filters which are LGPL
and which we keep will have to be ported to a new filter infrastructure
anyway.) player/audio.c uses it because it interacts with the old filter
code. push.c has some complex use of mp_audio and mp_audio_buffer, but
this and pull.c will most likely be rewritten to do something else.
2017-08-16 19:00:20 +00:00
|
|
|
return property_audiofmt(mpctx->ao_chain ? mpctx->ao_chain->input_format : NULL,
|
|
|
|
action, arg);
|
2015-05-22 18:23:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int mp_property_audio_out_params(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
audio: introduce a new type to hold audio frames
This is pretty pointless, but I believe it allows us to claim that the
new code is not affected by the copyright of the old code. This is
needed, because the original mp_audio struct was written by someone who
has disagreed with LGPL relicensing (it was called af_data at the time,
and was defined in af.h).
The "GPL'ed" struct contents that surive are pretty trivial: just the
data pointer, and some metadata like the format, samplerate, etc. - but
at least in this case, any new code would be extremely similar anyway,
and I'm not really sure whether it's OK to claim different copyright. So
what we do is we just use AVFrame (which of course is LGPL with 100%
certainty), and add some accessors around it to adapt it to mpv
conventions.
Also, this gets rid of some annoying conventions of mp_audio, like the
struct fields that require using an accessor to write to them anyway.
For the most part, this change is only dumb replacements of mp_audio
related functions and fields. One minor actual change is that you can't
allocate the new type on the stack anymore.
Some code still uses mp_audio. All audio filter code will be deleted, so
it makes no sense to convert this code. (Audio filters which are LGPL
and which we keep will have to be ported to a new filter infrastructure
anyway.) player/audio.c uses it because it interacts with the old filter
code. push.c has some complex use of mp_audio and mp_audio_buffer, but
this and pull.c will most likely be rewritten to do something else.
2017-08-16 19:00:20 +00:00
|
|
|
struct mp_aframe *frame = NULL;
|
|
|
|
if (mpctx->ao) {
|
|
|
|
frame = mp_aframe_create();
|
|
|
|
int samplerate;
|
|
|
|
int format;
|
|
|
|
struct mp_chmap channels;
|
|
|
|
ao_get_format(mpctx->ao, &samplerate, &format, &channels);
|
|
|
|
mp_aframe_set_rate(frame, samplerate);
|
|
|
|
mp_aframe_set_format(frame, format);
|
|
|
|
mp_aframe_set_chmap(frame, &channels);
|
|
|
|
}
|
|
|
|
int r = property_audiofmt(frame, action, arg);
|
|
|
|
talloc_free(frame);
|
|
|
|
return r;
|
2015-05-22 18:23:47 +00:00
|
|
|
}
|
|
|
|
|
2007-06-20 02:26:20 +00:00
|
|
|
/// Balance (RW)
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_balance(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2007-06-20 02:26:20 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2007-06-20 02:26:20 +00:00
|
|
|
|
2016-07-17 17:21:28 +00:00
|
|
|
if (action == M_PROPERTY_PRINT) {
|
2011-08-07 01:45:40 +00:00
|
|
|
char **str = arg;
|
2016-07-17 17:21:28 +00:00
|
|
|
float bal = mpctx->opts->balance;
|
2011-08-07 01:45:40 +00:00
|
|
|
if (bal == 0.f)
|
|
|
|
*str = talloc_strdup(NULL, "center");
|
|
|
|
else if (bal == -1.f)
|
|
|
|
*str = talloc_strdup(NULL, "left only");
|
|
|
|
else if (bal == 1.f)
|
|
|
|
*str = talloc_strdup(NULL, "right only");
|
|
|
|
else {
|
|
|
|
unsigned right = (bal + 1.f) / 2.f * 100.f;
|
|
|
|
*str = talloc_asprintf(NULL, "left %d%%, right %d%%",
|
|
|
|
100 - right, right);
|
2010-05-03 23:34:38 +00:00
|
|
|
}
|
2011-08-07 01:45:40 +00:00
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
2016-07-17 17:21:28 +00:00
|
|
|
|
|
|
|
int r = mp_property_generic_option(mpctx, prop, action, arg);
|
|
|
|
if (action == M_PROPERTY_SET)
|
|
|
|
audio_update_balance(mpctx);
|
|
|
|
return r;
|
2007-06-20 02:26:20 +00:00
|
|
|
}
|
|
|
|
|
2016-02-03 08:05:05 +00:00
|
|
|
static struct track* track_next(struct MPContext *mpctx, enum stream_type type,
|
|
|
|
int direction, struct track *track)
|
2012-08-19 16:01:30 +00:00
|
|
|
{
|
|
|
|
assert(direction == -1 || direction == +1);
|
|
|
|
struct track *prev = NULL, *next = NULL;
|
|
|
|
bool seen = track == NULL;
|
|
|
|
for (int n = 0; n < mpctx->num_tracks; n++) {
|
|
|
|
struct track *cur = mpctx->tracks[n];
|
|
|
|
if (cur->type == type) {
|
|
|
|
if (cur == track) {
|
|
|
|
seen = true;
|
2016-02-03 08:05:05 +00:00
|
|
|
} else if (!cur->selected) {
|
2012-08-19 16:01:30 +00:00
|
|
|
if (seen && !next) {
|
|
|
|
next = cur;
|
2013-07-21 16:06:52 +00:00
|
|
|
}
|
|
|
|
if (!seen || !track) {
|
2012-08-19 16:01:30 +00:00
|
|
|
prev = cur;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return direction > 0 ? next : prev;
|
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int property_switch_track(struct m_property *prop, int action, void *arg,
|
2013-12-24 16:46:14 +00:00
|
|
|
MPContext *mpctx, int order,
|
|
|
|
enum stream_type type)
|
2007-02-21 00:49:24 +00:00
|
|
|
{
|
2013-12-24 16:46:14 +00:00
|
|
|
struct track *track = mpctx->current_track[order][type];
|
2007-02-21 00:49:24 +00:00
|
|
|
|
|
|
|
switch (action) {
|
|
|
|
case M_PROPERTY_GET:
|
2015-07-28 22:09:44 +00:00
|
|
|
if (mpctx->playback_initialized) {
|
|
|
|
*(int *)arg = track ? track->user_tid : -2;
|
|
|
|
} else {
|
|
|
|
*(int *)arg = mpctx->opts->stream_id[order][type];
|
|
|
|
}
|
2010-05-03 23:34:38 +00:00
|
|
|
return M_PROPERTY_OK;
|
2007-02-21 00:49:24 +00:00
|
|
|
case M_PROPERTY_PRINT:
|
2012-08-19 16:01:30 +00:00
|
|
|
if (!track)
|
2012-11-20 13:00:12 +00:00
|
|
|
*(char **) arg = talloc_strdup(NULL, "no");
|
2012-02-19 13:15:41 +00:00
|
|
|
else {
|
2012-08-19 16:01:30 +00:00
|
|
|
char *lang = track->lang;
|
2012-02-19 13:15:41 +00:00
|
|
|
if (!lang)
|
2013-12-16 19:40:02 +00:00
|
|
|
lang = "unknown";
|
2012-02-19 13:15:41 +00:00
|
|
|
|
2012-08-19 16:01:30 +00:00
|
|
|
if (track->title)
|
2011-07-03 17:41:46 +00:00
|
|
|
*(char **)arg = talloc_asprintf(NULL, "(%d) %s (\"%s\")",
|
2012-08-19 16:01:30 +00:00
|
|
|
track->user_tid, lang, track->title);
|
2011-07-03 17:41:46 +00:00
|
|
|
else
|
2012-08-19 16:01:30 +00:00
|
|
|
*(char **)arg = talloc_asprintf(NULL, "(%d) %s",
|
|
|
|
track->user_tid, lang);
|
2010-05-03 23:34:38 +00:00
|
|
|
}
|
|
|
|
return M_PROPERTY_OK;
|
2007-02-21 00:49:24 +00:00
|
|
|
|
2012-09-22 04:15:36 +00:00
|
|
|
case M_PROPERTY_SWITCH: {
|
2015-05-26 19:42:34 +00:00
|
|
|
if (!mpctx->playback_initialized)
|
2015-05-26 19:33:34 +00:00
|
|
|
return M_PROPERTY_ERROR;
|
2012-09-22 04:15:36 +00:00
|
|
|
struct m_property_switch_arg *sarg = arg;
|
2016-09-03 14:39:59 +00:00
|
|
|
do {
|
|
|
|
track = track_next(mpctx, type, sarg->inc >= 0 ? +1 : -1, track);
|
|
|
|
mp_switch_track_n(mpctx, order, type, track, FLAG_MARK_SELECTION);
|
|
|
|
} while (mpctx->current_track[order][type] != track);
|
2015-06-03 19:52:32 +00:00
|
|
|
print_track_list(mpctx, "Track switched:");
|
2012-09-18 12:00:08 +00:00
|
|
|
return M_PROPERTY_OK;
|
2012-09-22 04:15:36 +00:00
|
|
|
}
|
2012-09-18 12:00:08 +00:00
|
|
|
case M_PROPERTY_SET:
|
2015-05-26 19:42:34 +00:00
|
|
|
if (mpctx->playback_initialized) {
|
2015-05-26 19:33:34 +00:00
|
|
|
track = mp_track_by_tid(mpctx, type, *(int *)arg);
|
|
|
|
mp_switch_track_n(mpctx, order, type, track, FLAG_MARK_SELECTION);
|
2015-06-03 19:52:32 +00:00
|
|
|
print_track_list(mpctx, "Track switched:");
|
2016-09-16 12:24:15 +00:00
|
|
|
mp_wakeup_core(mpctx);
|
2015-05-26 19:33:34 +00:00
|
|
|
} else {
|
|
|
|
mpctx->opts->stream_id[order][type] = *(int *)arg;
|
|
|
|
}
|
2010-05-03 23:34:38 +00:00
|
|
|
return M_PROPERTY_OK;
|
2007-02-21 00:49:24 +00:00
|
|
|
}
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return mp_property_generic_option(mpctx, prop, action, arg);
|
2012-08-19 16:01:30 +00:00
|
|
|
}
|
2007-02-21 00:49:24 +00:00
|
|
|
|
2014-10-21 11:16:48 +00:00
|
|
|
// Similar, less featured, for selecting by ff-index.
|
|
|
|
static int property_switch_track_ff(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
|
|
|
enum stream_type type = (intptr_t)prop->priv;
|
|
|
|
struct track *track = mpctx->current_track[0][type];
|
|
|
|
|
|
|
|
switch (action) {
|
|
|
|
case M_PROPERTY_GET:
|
|
|
|
*(int *) arg = track ? track->ff_index : -2;
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
case M_PROPERTY_SET: {
|
2014-10-23 10:03:26 +00:00
|
|
|
int id = *(int *)arg;
|
2015-05-26 19:42:34 +00:00
|
|
|
if (mpctx->playback_initialized) {
|
2015-05-22 19:05:03 +00:00
|
|
|
track = NULL;
|
|
|
|
for (int n = 0; n < mpctx->num_tracks; n++) {
|
|
|
|
struct track *cur = mpctx->tracks[n];
|
|
|
|
if (cur->type == type && cur->ff_index == id) {
|
|
|
|
track = cur;
|
|
|
|
break;
|
|
|
|
}
|
2014-10-21 11:16:48 +00:00
|
|
|
}
|
2015-05-22 19:05:03 +00:00
|
|
|
if (!track && id >= 0)
|
|
|
|
return M_PROPERTY_ERROR;
|
2015-05-26 12:01:23 +00:00
|
|
|
mp_switch_track_n(mpctx, 0, type, track, 0);
|
2015-06-03 19:52:32 +00:00
|
|
|
print_track_list(mpctx, "Track switched:");
|
2015-05-22 19:05:03 +00:00
|
|
|
} else {
|
|
|
|
mpctx->opts->stream_id_ff[type] = *(int *)arg;
|
2014-10-21 11:16:48 +00:00
|
|
|
}
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return mp_property_generic_option(mpctx, prop, action, arg);
|
|
|
|
}
|
|
|
|
|
2015-07-03 00:33:54 +00:00
|
|
|
static int track_channels(struct track *track)
|
|
|
|
{
|
2016-01-12 22:48:19 +00:00
|
|
|
return track->stream ? track->stream->codec->channels.num : 0;
|
2015-07-03 00:33:54 +00:00
|
|
|
}
|
|
|
|
|
2014-02-15 15:53:11 +00:00
|
|
|
static int get_track_entry(int item, int action, void *arg, void *ctx)
|
|
|
|
{
|
|
|
|
struct MPContext *mpctx = ctx;
|
|
|
|
struct track *track = mpctx->tracks[item];
|
|
|
|
|
2016-02-29 19:55:44 +00:00
|
|
|
struct mp_codec_params p =
|
|
|
|
track->stream ? *track->stream->codec : (struct mp_codec_params){0};
|
|
|
|
|
|
|
|
const char *decoder_desc = NULL;
|
|
|
|
if (track->d_video)
|
|
|
|
decoder_desc = track->d_video->decoder_desc;
|
|
|
|
if (track->d_audio)
|
|
|
|
decoder_desc = track->d_audio->decoder_desc;
|
2014-02-18 23:21:56 +00:00
|
|
|
|
2017-02-20 13:02:10 +00:00
|
|
|
bool has_rg = track->stream && track->stream->codec->replaygain_data;
|
2016-08-13 13:21:09 +00:00
|
|
|
struct replaygain_data rg = has_rg ? *track->stream->codec->replaygain_data
|
|
|
|
: (struct replaygain_data){0};
|
|
|
|
|
2014-02-15 15:53:11 +00:00
|
|
|
struct m_sub_property props[] = {
|
|
|
|
{"id", SUB_PROP_INT(track->user_tid)},
|
|
|
|
{"type", SUB_PROP_STR(stream_type_name(track->type)),
|
|
|
|
.unavailable = !stream_type_name(track->type)},
|
|
|
|
{"src-id", SUB_PROP_INT(track->demuxer_id),
|
|
|
|
.unavailable = track->demuxer_id == -1},
|
|
|
|
{"title", SUB_PROP_STR(track->title),
|
|
|
|
.unavailable = !track->title},
|
|
|
|
{"lang", SUB_PROP_STR(track->lang),
|
|
|
|
.unavailable = !track->lang},
|
2015-07-03 00:33:54 +00:00
|
|
|
{"audio-channels", SUB_PROP_INT(track_channels(track)),
|
|
|
|
.unavailable = track_channels(track) <= 0},
|
2014-02-15 15:53:11 +00:00
|
|
|
{"albumart", SUB_PROP_FLAG(track->attached_picture)},
|
|
|
|
{"default", SUB_PROP_FLAG(track->default_track)},
|
2015-06-27 20:02:24 +00:00
|
|
|
{"forced", SUB_PROP_FLAG(track->forced_track)},
|
2014-02-15 15:53:11 +00:00
|
|
|
{"external", SUB_PROP_FLAG(track->is_external)},
|
|
|
|
{"selected", SUB_PROP_FLAG(track->selected)},
|
|
|
|
{"external-filename", SUB_PROP_STR(track->external_filename),
|
|
|
|
.unavailable = !track->external_filename},
|
2014-10-21 11:16:48 +00:00
|
|
|
{"ff-index", SUB_PROP_INT(track->ff_index)},
|
2016-02-29 19:55:44 +00:00
|
|
|
{"decoder-desc", SUB_PROP_STR(decoder_desc),
|
|
|
|
.unavailable = !decoder_desc},
|
|
|
|
{"codec", SUB_PROP_STR(p.codec),
|
|
|
|
.unavailable = !p.codec},
|
|
|
|
{"demux-w", SUB_PROP_INT(p.disp_w), .unavailable = !p.disp_w},
|
|
|
|
{"demux-h", SUB_PROP_INT(p.disp_h), .unavailable = !p.disp_h},
|
|
|
|
{"demux-channel-count", SUB_PROP_INT(p.channels.num),
|
|
|
|
.unavailable = !p.channels.num},
|
|
|
|
{"demux-channels", SUB_PROP_STR(mp_chmap_to_str(&p.channels)),
|
|
|
|
.unavailable = !p.channels.num},
|
|
|
|
{"demux-samplerate", SUB_PROP_INT(p.samplerate),
|
|
|
|
.unavailable = !p.samplerate},
|
|
|
|
{"demux-fps", SUB_PROP_DOUBLE(p.fps), .unavailable = p.fps <= 0},
|
2016-08-13 13:21:09 +00:00
|
|
|
{"replaygain-track-peak", SUB_PROP_FLOAT(rg.track_peak),
|
|
|
|
.unavailable = !has_rg},
|
|
|
|
{"replaygain-track-gain", SUB_PROP_FLOAT(rg.track_gain),
|
|
|
|
.unavailable = !has_rg},
|
|
|
|
{"replaygain-album-peak", SUB_PROP_FLOAT(rg.album_peak),
|
|
|
|
.unavailable = !has_rg},
|
|
|
|
{"replaygain-album-gain", SUB_PROP_FLOAT(rg.album_gain),
|
|
|
|
.unavailable = !has_rg},
|
2014-02-15 15:53:11 +00:00
|
|
|
{0}
|
|
|
|
};
|
|
|
|
|
|
|
|
return m_property_read_sub(props, action, arg);
|
|
|
|
}
|
|
|
|
|
2013-05-15 00:17:47 +00:00
|
|
|
static const char *track_type_name(enum stream_type t)
|
|
|
|
{
|
|
|
|
switch (t) {
|
|
|
|
case STREAM_VIDEO: return "Video";
|
|
|
|
case STREAM_AUDIO: return "Audio";
|
|
|
|
case STREAM_SUB: return "Sub";
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int property_list_tracks(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2013-05-15 00:17:47 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2014-02-15 15:53:11 +00:00
|
|
|
if (action == M_PROPERTY_PRINT) {
|
2013-05-15 00:17:47 +00:00
|
|
|
char *res = NULL;
|
|
|
|
|
|
|
|
for (int type = 0; type < STREAM_TYPE_COUNT; type++) {
|
|
|
|
for (int n = 0; n < mpctx->num_tracks; n++) {
|
|
|
|
struct track *track = mpctx->tracks[n];
|
|
|
|
if (track->type != type)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
res = talloc_asprintf_append(res, "%s: ",
|
|
|
|
track_type_name(track->type));
|
2016-05-03 20:41:53 +00:00
|
|
|
res = talloc_strdup_append(res,
|
|
|
|
track->selected ? list_current : list_normal);
|
2013-05-15 00:17:47 +00:00
|
|
|
res = talloc_asprintf_append(res, "(%d) ", track->user_tid);
|
|
|
|
if (track->title)
|
|
|
|
res = talloc_asprintf_append(res, "'%s' ", track->title);
|
|
|
|
if (track->lang)
|
|
|
|
res = talloc_asprintf_append(res, "(%s) ", track->lang);
|
|
|
|
if (track->is_external)
|
|
|
|
res = talloc_asprintf_append(res, "(external) ");
|
|
|
|
res = talloc_asprintf_append(res, "\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
res = talloc_asprintf_append(res, "\n");
|
|
|
|
}
|
|
|
|
|
2016-02-15 20:03:51 +00:00
|
|
|
struct demuxer *demuxer = mpctx->demuxer;
|
2013-05-15 00:17:47 +00:00
|
|
|
if (demuxer && demuxer->num_editions > 1)
|
|
|
|
res = talloc_asprintf_append(res, "\nEdition: %d of %d\n",
|
|
|
|
demuxer->edition + 1,
|
|
|
|
demuxer->num_editions);
|
|
|
|
|
|
|
|
*(char **)arg = res;
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
2014-02-15 15:53:11 +00:00
|
|
|
return m_property_read_list(action, arg, mpctx->num_tracks,
|
|
|
|
get_track_entry, mpctx);
|
2013-05-15 00:17:47 +00:00
|
|
|
}
|
|
|
|
|
2012-08-19 16:01:30 +00:00
|
|
|
/// Selected audio id (RW)
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_audio(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2012-08-19 16:01:30 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return property_switch_track(prop, action, arg, ctx, 0, STREAM_AUDIO);
|
2007-02-21 00:49:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Selected video id (RW)
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_video(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2007-02-21 00:49:24 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return property_switch_track(prop, action, arg, ctx, 0, STREAM_VIDEO);
|
2007-02-21 00:49:24 +00:00
|
|
|
}
|
|
|
|
|
2012-09-26 21:56:48 +00:00
|
|
|
static struct track *find_track_by_demuxer_id(MPContext *mpctx,
|
|
|
|
enum stream_type type,
|
|
|
|
int demuxer_id)
|
|
|
|
{
|
|
|
|
for (int n = 0; n < mpctx->num_tracks; n++) {
|
|
|
|
struct track *track = mpctx->tracks[n];
|
|
|
|
if (track->type == type && track->demuxer_id == demuxer_id)
|
|
|
|
return track;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_program(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2007-02-21 00:49:24 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2017-06-19 15:54:02 +00:00
|
|
|
demux_program_t prog = {0};
|
2007-02-21 00:49:24 +00:00
|
|
|
|
2016-02-15 20:03:51 +00:00
|
|
|
struct demuxer *demuxer = mpctx->demuxer;
|
2016-09-10 11:51:17 +00:00
|
|
|
if (!demuxer || !mpctx->playback_initialized)
|
mplayer: fix idle mode regressions
Commit 89a17bcda6c16 simplified the idle loop to run any commands
mplayer receives, not just playlist related commands. Unfortunately, it
turns out many slave commands always assume the presence of a demuxer.
MPContext->demuxer is assumed not to be NULL. This made the player
crash when receiving slave commands like pause/unpause, chapter
control, subtitle selection.
We want mplayer being able to handle this. Any slave command or
property, as long as it's backed by a persistent setting, should be run
successfully, even if no file is being played. If the slave command
doesn't make sense in this state, it shouldn't crash the player.
Insert some NULL checks when accessing demuxers. If sh_video or
sh_audio are not NULL, assume demuxer can't be NULL.
(There actually aren't that many properties which need to be changed. If
it gets too complicated, we could employ alternative mechanisms instead,
such as explicitly marking safe properties with a flag.)
2012-08-04 00:00:28 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
2007-02-21 00:49:24 +00:00
|
|
|
switch (action) {
|
2012-09-18 12:00:08 +00:00
|
|
|
case M_PROPERTY_SWITCH:
|
2007-02-21 00:49:24 +00:00
|
|
|
case M_PROPERTY_SET:
|
2010-05-03 23:34:38 +00:00
|
|
|
if (action == M_PROPERTY_SET && arg)
|
|
|
|
prog.progid = *((int *) arg);
|
|
|
|
else
|
|
|
|
prog.progid = -1;
|
2012-08-19 16:07:06 +00:00
|
|
|
if (demux_control(demuxer, DEMUXER_CTRL_IDENTIFY_PROGRAM, &prog) ==
|
2017-06-19 15:54:02 +00:00
|
|
|
CONTROL_UNKNOWN)
|
2010-05-03 23:34:38 +00:00
|
|
|
return M_PROPERTY_ERROR;
|
|
|
|
|
|
|
|
if (prog.aid < 0 && prog.vid < 0) {
|
2013-12-19 20:28:55 +00:00
|
|
|
MP_ERR(mpctx, "Selected program contains no audio or video streams!\n");
|
2010-05-03 23:34:38 +00:00
|
|
|
return M_PROPERTY_ERROR;
|
|
|
|
}
|
2012-09-26 21:56:48 +00:00
|
|
|
mp_switch_track(mpctx, STREAM_VIDEO,
|
2015-05-26 12:01:23 +00:00
|
|
|
find_track_by_demuxer_id(mpctx, STREAM_VIDEO, prog.vid), 0);
|
2013-04-14 19:32:34 +00:00
|
|
|
mp_switch_track(mpctx, STREAM_AUDIO,
|
2015-05-26 12:01:23 +00:00
|
|
|
find_track_by_demuxer_id(mpctx, STREAM_AUDIO, prog.aid), 0);
|
2013-04-14 19:32:34 +00:00
|
|
|
mp_switch_track(mpctx, STREAM_SUB,
|
2015-05-26 12:01:23 +00:00
|
|
|
find_track_by_demuxer_id(mpctx, STREAM_VIDEO, prog.sid), 0);
|
2015-06-03 19:52:32 +00:00
|
|
|
print_track_list(mpctx, "Program switched:");
|
2010-05-03 23:34:38 +00:00
|
|
|
return M_PROPERTY_OK;
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
case M_PROPERTY_GET_TYPE:
|
|
|
|
*(struct m_option *)arg = (struct m_option){
|
|
|
|
.type = CONF_TYPE_INT,
|
|
|
|
.flags = CONF_RANGE,
|
|
|
|
.min = -1,
|
|
|
|
.max = (1 << 16) - 1,
|
|
|
|
};
|
|
|
|
return M_PROPERTY_OK;
|
2007-02-21 00:49:24 +00:00
|
|
|
}
|
2012-09-18 18:07:24 +00:00
|
|
|
return M_PROPERTY_NOT_IMPLEMENTED;
|
2007-02-21 00:49:24 +00:00
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_hwdec(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2014-04-22 23:17:28 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2016-01-17 17:07:50 +00:00
|
|
|
struct track *track = mpctx->current_track[0][STREAM_VIDEO];
|
|
|
|
struct dec_video *vd = track ? track->d_video : NULL;
|
2014-04-22 23:17:28 +00:00
|
|
|
struct MPOpts *opts = mpctx->opts;
|
|
|
|
|
2015-05-25 19:44:48 +00:00
|
|
|
if (action == M_PROPERTY_SET) {
|
2014-04-22 23:17:28 +00:00
|
|
|
int new = *(int *)arg;
|
2015-05-25 19:44:48 +00:00
|
|
|
|
|
|
|
if (opts->hwdec_api == new)
|
2014-04-22 23:17:28 +00:00
|
|
|
return M_PROPERTY_OK;
|
2015-05-25 19:44:48 +00:00
|
|
|
|
2014-04-22 23:17:28 +00:00
|
|
|
opts->hwdec_api = new;
|
2015-05-25 19:44:48 +00:00
|
|
|
|
|
|
|
if (!vd)
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
|
|
|
|
int current = -2;
|
|
|
|
video_vd_control(vd, VDCTRL_GET_HWDEC, ¤t);
|
|
|
|
if (current != opts->hwdec_api) {
|
2016-01-29 21:47:27 +00:00
|
|
|
video_vd_control(vd, VDCTRL_REINIT, NULL);
|
2015-05-25 19:44:48 +00:00
|
|
|
double last_pts = mpctx->last_vo_pts;
|
|
|
|
if (last_pts != MP_NOPTS_VALUE)
|
2016-08-15 19:07:32 +00:00
|
|
|
queue_seek(mpctx, MPSEEK_ABSOLUTE, last_pts, MPSEEK_EXACT, 0);
|
2015-05-25 19:44:48 +00:00
|
|
|
}
|
2014-04-22 23:17:28 +00:00
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return mp_property_generic_option(mpctx, prop, action, arg);
|
2014-04-22 23:17:28 +00:00
|
|
|
}
|
2007-02-21 00:49:24 +00:00
|
|
|
|
2016-05-04 14:55:26 +00:00
|
|
|
static int mp_property_hwdec_current(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
|
|
|
struct track *track = mpctx->current_track[0][STREAM_VIDEO];
|
|
|
|
struct dec_video *vd = track ? track->d_video : NULL;
|
|
|
|
|
|
|
|
if (!vd)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
|
|
|
switch (action) {
|
|
|
|
case M_PROPERTY_GET_TYPE: {
|
|
|
|
// Abuse another hwdec option to resolve the value names
|
|
|
|
struct m_property dummy = {.name = "hwdec"};
|
|
|
|
return mp_property_generic_option(mpctx, &dummy, action, arg);
|
|
|
|
}
|
|
|
|
case M_PROPERTY_GET: {
|
|
|
|
int current = HWDEC_NONE;
|
|
|
|
video_vd_control(vd, VDCTRL_GET_HWDEC, ¤t);
|
|
|
|
*(int *)arg = current;
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return M_PROPERTY_NOT_IMPLEMENTED;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int mp_property_hwdec_interop(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
2016-05-09 17:42:03 +00:00
|
|
|
if (!mpctx->video_out || !mpctx->video_out->hwdec_devs)
|
2016-05-04 14:55:26 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
2016-05-09 17:42:03 +00:00
|
|
|
struct mp_hwdec_ctx *hwctx =
|
|
|
|
hwdec_devices_get_first(mpctx->video_out->hwdec_devs);
|
|
|
|
|
2016-05-04 14:55:26 +00:00
|
|
|
const char *name = hwctx ? hwctx->driver_name : NULL;
|
2016-05-09 17:42:03 +00:00
|
|
|
if (!name && hwctx)
|
2016-05-04 14:55:26 +00:00
|
|
|
name = m_opt_choice_str(mp_hwdec_names, hwctx->type);
|
|
|
|
|
|
|
|
return m_property_strdup_ro(action, arg, name);
|
|
|
|
}
|
|
|
|
|
2007-02-21 00:49:24 +00:00
|
|
|
/// Helper to set vo flags.
|
|
|
|
/** \ingroup PropertyImplHelper
|
|
|
|
*/
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_vo_flag(struct m_property *prop, int action, void *arg,
|
2010-05-07 19:02:47 +00:00
|
|
|
int vo_ctrl, int *vo_var, MPContext *mpctx)
|
2007-02-21 00:49:24 +00:00
|
|
|
{
|
2016-08-30 21:52:16 +00:00
|
|
|
int old = *vo_var;
|
|
|
|
int res = mp_property_generic_option(mpctx, prop, action, arg);
|
|
|
|
if (action == M_PROPERTY_SET && old != *vo_var) {
|
|
|
|
if (mpctx->video_out)
|
2010-05-07 19:02:47 +00:00
|
|
|
vo_control(mpctx->video_out, vo_ctrl, 0);
|
2007-02-21 00:49:24 +00:00
|
|
|
}
|
2016-08-30 21:52:16 +00:00
|
|
|
return res;
|
2007-02-21 00:49:24 +00:00
|
|
|
}
|
|
|
|
|
2015-01-16 22:07:13 +00:00
|
|
|
/// Fullscreen state (RW)
|
|
|
|
static int mp_property_fullscreen(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
2016-08-30 21:50:57 +00:00
|
|
|
int oldval = mpctx->opts->vo->fullscreen;
|
2015-05-21 21:11:51 +00:00
|
|
|
int r = mp_property_vo_flag(prop, action, arg, VOCTRL_FULLSCREEN,
|
2016-08-30 21:50:57 +00:00
|
|
|
&mpctx->opts->vo->fullscreen, mpctx);
|
|
|
|
if (oldval && oldval != mpctx->opts->vo->fullscreen)
|
2015-05-21 21:11:51 +00:00
|
|
|
mpctx->mouse_event_ts--; // Show mouse cursor
|
|
|
|
return r;
|
2015-01-16 22:07:13 +00:00
|
|
|
}
|
|
|
|
|
2016-05-05 05:56:21 +00:00
|
|
|
/// Show playback progress in Windows 7+ taskbar (RW)
|
|
|
|
static int mp_property_taskbar_progress(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
|
|
|
if (action == M_PROPERTY_SET) {
|
|
|
|
int desired = !!*(int *) arg;
|
2016-08-30 21:50:57 +00:00
|
|
|
if (mpctx->opts->vo->taskbar_progress == desired)
|
2016-05-05 05:56:21 +00:00
|
|
|
return M_PROPERTY_OK;
|
2016-08-30 21:50:57 +00:00
|
|
|
mpctx->opts->vo->taskbar_progress = desired;
|
2016-05-05 05:56:21 +00:00
|
|
|
if (mpctx->video_out)
|
2016-08-30 21:45:20 +00:00
|
|
|
update_vo_playback_state(mpctx);
|
2016-05-05 05:56:21 +00:00
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
|
|
|
return mp_property_generic_option(mpctx, prop, action, arg);
|
|
|
|
}
|
|
|
|
|
2007-02-21 00:49:24 +00:00
|
|
|
/// Window always on top (RW)
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_ontop(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2007-02-21 00:49:24 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2008-04-19 04:45:16 +00:00
|
|
|
return mp_property_vo_flag(prop, action, arg, VOCTRL_ONTOP,
|
2016-08-30 21:50:57 +00:00
|
|
|
&mpctx->opts->vo->ontop, mpctx);
|
2007-02-21 00:49:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Show window borders (RW)
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_border(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2007-02-21 00:49:24 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2007-02-21 00:49:24 +00:00
|
|
|
return mp_property_vo_flag(prop, action, arg, VOCTRL_BORDER,
|
2016-08-30 21:50:57 +00:00
|
|
|
&mpctx->opts->vo->border, mpctx);
|
2007-02-21 00:49:24 +00:00
|
|
|
}
|
|
|
|
|
2015-01-16 22:38:47 +00:00
|
|
|
static int mp_property_all_workspaces(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
|
|
|
return mp_property_vo_flag(prop, action, arg, VOCTRL_ALL_WORKSPACES,
|
2016-08-30 21:50:57 +00:00
|
|
|
&mpctx->opts->vo->all_workspaces, mpctx);
|
2015-01-16 22:38:47 +00:00
|
|
|
}
|
|
|
|
|
2014-08-19 19:19:38 +00:00
|
|
|
static int get_frame_count(struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
struct demuxer *demuxer = mpctx->demuxer;
|
|
|
|
if (!demuxer)
|
2016-01-17 17:07:50 +00:00
|
|
|
return -1;
|
|
|
|
if (!mpctx->vo_chain)
|
|
|
|
return -1;
|
2014-10-29 20:54:59 +00:00
|
|
|
double len = get_time_length(mpctx);
|
2016-01-17 17:07:50 +00:00
|
|
|
double fps = mpctx->vo_chain->container_fps;
|
2014-10-29 20:54:59 +00:00
|
|
|
if (len < 0 || fps <= 0)
|
|
|
|
return 0;
|
2014-08-19 19:19:38 +00:00
|
|
|
|
2014-10-29 20:54:59 +00:00
|
|
|
return len * fps;
|
2014-08-19 19:19:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int mp_property_frame_number(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
2016-01-17 17:07:50 +00:00
|
|
|
int frames = get_frame_count(mpctx);
|
|
|
|
if (frames < 0)
|
2014-08-19 19:19:38 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
2015-12-26 17:36:45 +00:00
|
|
|
return m_property_int_ro(action, arg,
|
2016-01-17 17:07:50 +00:00
|
|
|
lrint(get_current_pos_ratio(mpctx, false) * frames));
|
2014-08-19 19:19:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int mp_property_frame_count(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
2016-01-17 17:07:50 +00:00
|
|
|
int frames = get_frame_count(mpctx);
|
|
|
|
if (frames < 0)
|
2014-08-19 19:19:38 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
2016-01-17 17:07:50 +00:00
|
|
|
return m_property_int_ro(action, arg, frames);
|
2007-02-21 00:49:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Video codec tag (RO)
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_video_format(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2007-02-21 00:49:24 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2016-01-17 17:07:50 +00:00
|
|
|
struct track *track = mpctx->current_track[0][STREAM_VIDEO];
|
|
|
|
const char *c = track && track->stream ? track->stream->codec->codec : NULL;
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return m_property_strdup_ro(action, arg, c);
|
2007-02-21 00:49:24 +00:00
|
|
|
}
|
|
|
|
|
2007-05-29 22:14:41 +00:00
|
|
|
/// Video codec name (RO)
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_video_codec(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2007-05-29 22:14:41 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2016-01-17 17:07:50 +00:00
|
|
|
struct track *track = mpctx->current_track[0][STREAM_VIDEO];
|
2016-01-18 19:10:28 +00:00
|
|
|
const char *c = track && track->d_video ? track->d_video->decoder_desc : NULL;
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return m_property_strdup_ro(action, arg, c);
|
2007-05-29 22:14:41 +00:00
|
|
|
}
|
|
|
|
|
2014-02-15 15:42:48 +00:00
|
|
|
static int property_imgparams(struct mp_image_params p, int action, void *arg)
|
2007-02-21 00:49:24 +00:00
|
|
|
{
|
2014-02-15 15:42:48 +00:00
|
|
|
if (!p.imgfmt)
|
2010-05-03 23:34:38 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
2007-02-21 00:49:24 +00:00
|
|
|
|
2015-12-19 19:04:31 +00:00
|
|
|
int d_w, d_h;
|
|
|
|
mp_image_params_get_dsize(&p, &d_w, &d_h);
|
2014-02-15 15:42:48 +00:00
|
|
|
|
2015-01-10 18:11:28 +00:00
|
|
|
struct mp_imgfmt_desc desc = mp_imgfmt_get_desc(p.imgfmt);
|
2015-01-10 11:29:10 +00:00
|
|
|
int bpp = 0;
|
2015-01-10 18:11:28 +00:00
|
|
|
for (int i = 0; i < desc.num_planes; i++)
|
|
|
|
bpp += desc.bpp[i] >> (desc.xs[i] + desc.ys[i]);
|
2015-01-10 11:29:10 +00:00
|
|
|
|
2014-02-15 15:42:48 +00:00
|
|
|
struct m_sub_property props[] = {
|
|
|
|
{"pixelformat", SUB_PROP_STR(mp_imgfmt_to_name(p.imgfmt))},
|
2015-01-10 20:16:34 +00:00
|
|
|
{"average-bpp", SUB_PROP_INT(bpp),
|
2015-01-10 18:11:28 +00:00
|
|
|
.unavailable = !bpp},
|
2015-01-10 20:16:34 +00:00
|
|
|
{"plane-depth", SUB_PROP_INT(desc.plane_bits),
|
2015-01-10 18:11:28 +00:00
|
|
|
.unavailable = !(desc.flags & MP_IMGFLAG_PLANAR)},
|
2014-02-15 15:42:48 +00:00
|
|
|
{"w", SUB_PROP_INT(p.w)},
|
|
|
|
{"h", SUB_PROP_INT(p.h)},
|
2015-12-19 19:04:31 +00:00
|
|
|
{"dw", SUB_PROP_INT(d_w)},
|
|
|
|
{"dh", SUB_PROP_INT(d_h)},
|
|
|
|
{"aspect", SUB_PROP_FLOAT(d_w / (double)d_h)},
|
|
|
|
{"par", SUB_PROP_FLOAT(p.p_w / (double)p.p_h)},
|
2015-03-30 21:52:28 +00:00
|
|
|
{"colormatrix",
|
2016-06-29 07:16:13 +00:00
|
|
|
SUB_PROP_STR(m_opt_choice_str(mp_csp_names, p.color.space))},
|
2015-03-30 21:52:28 +00:00
|
|
|
{"colorlevels",
|
2016-06-29 07:16:13 +00:00
|
|
|
SUB_PROP_STR(m_opt_choice_str(mp_csp_levels_names, p.color.levels))},
|
2015-03-30 21:52:28 +00:00
|
|
|
{"primaries",
|
2016-06-29 07:16:13 +00:00
|
|
|
SUB_PROP_STR(m_opt_choice_str(mp_csp_prim_names, p.color.primaries))},
|
2015-03-31 02:50:49 +00:00
|
|
|
{"gamma",
|
2016-06-29 07:16:13 +00:00
|
|
|
SUB_PROP_STR(m_opt_choice_str(mp_csp_trc_names, p.color.gamma))},
|
2016-07-09 02:18:45 +00:00
|
|
|
{"sig-peak", SUB_PROP_FLOAT(p.color.sig_peak)},
|
2017-06-14 18:06:56 +00:00
|
|
|
{"light",
|
|
|
|
SUB_PROP_STR(m_opt_choice_str(mp_csp_light_names, p.color.light))},
|
2015-03-30 21:52:28 +00:00
|
|
|
{"chroma-location",
|
|
|
|
SUB_PROP_STR(m_opt_choice_str(mp_chroma_names, p.chroma_location))},
|
2015-06-23 13:20:21 +00:00
|
|
|
{"stereo-in",
|
|
|
|
SUB_PROP_STR(m_opt_choice_str(mp_stereo3d_names, p.stereo_in))},
|
|
|
|
{"stereo-out",
|
|
|
|
SUB_PROP_STR(m_opt_choice_str(mp_stereo3d_names, p.stereo_out))},
|
2014-04-21 20:54:43 +00:00
|
|
|
{"rotate", SUB_PROP_INT(p.rotate)},
|
2014-02-15 15:42:48 +00:00
|
|
|
{0}
|
|
|
|
};
|
|
|
|
|
|
|
|
return m_property_read_sub(props, action, arg);
|
2007-02-21 00:49:24 +00:00
|
|
|
}
|
|
|
|
|
2014-01-09 20:19:19 +00:00
|
|
|
static struct mp_image_params get_video_out_params(struct MPContext *mpctx)
|
2013-03-25 20:25:11 +00:00
|
|
|
{
|
2016-01-13 23:18:48 +00:00
|
|
|
if (!mpctx->vo_chain || mpctx->vo_chain->vf->initialized < 1)
|
2014-01-09 20:19:19 +00:00
|
|
|
return (struct mp_image_params){0};
|
|
|
|
|
2016-01-13 23:18:48 +00:00
|
|
|
return mpctx->vo_chain->vf->output_params;
|
2013-03-25 20:25:11 +00:00
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_vo_imgparams(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2013-03-25 20:25:11 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return property_imgparams(get_video_out_params(ctx), action, arg);
|
2013-03-25 20:25:11 +00:00
|
|
|
}
|
|
|
|
|
2016-09-20 13:40:44 +00:00
|
|
|
static int mp_property_dec_imgparams(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
|
|
|
struct mp_image_params p = {0};
|
|
|
|
struct vo_chain *vo_c = mpctx->vo_chain;
|
|
|
|
if (vo_c && vo_c->video_src)
|
|
|
|
video_get_dec_params(vo_c->video_src, &p);
|
|
|
|
if (!p.imgfmt)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
return property_imgparams(p, action, arg);
|
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_vd_imgparams(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2013-03-25 20:25:11 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2016-01-13 23:18:48 +00:00
|
|
|
struct vo_chain *vo_c = mpctx->vo_chain;
|
2016-02-01 21:28:47 +00:00
|
|
|
if (!vo_c)
|
2014-01-09 20:19:19 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
2016-02-01 21:28:47 +00:00
|
|
|
struct track *track = mpctx->current_track[0][STREAM_VIDEO];
|
2016-01-17 17:07:50 +00:00
|
|
|
struct mp_codec_params *c =
|
|
|
|
track && track->stream ? track->stream->codec : NULL;
|
2016-01-13 23:18:48 +00:00
|
|
|
if (vo_c->vf->input_params.imgfmt) {
|
|
|
|
return property_imgparams(vo_c->vf->input_params, action, arg);
|
2016-01-17 17:07:50 +00:00
|
|
|
} else if (c && c->disp_w && c->disp_h) {
|
2014-02-15 15:42:48 +00:00
|
|
|
// Simplistic fallback for stupid scripts querying "width"/"height"
|
|
|
|
// before the first frame is decoded.
|
|
|
|
struct m_sub_property props[] = {
|
2016-01-12 22:48:19 +00:00
|
|
|
{"w", SUB_PROP_INT(c->disp_w)},
|
|
|
|
{"h", SUB_PROP_INT(c->disp_h)},
|
2014-02-15 15:42:48 +00:00
|
|
|
{0}
|
|
|
|
};
|
|
|
|
return m_property_read_sub(props, action, arg);
|
|
|
|
}
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
2013-03-25 20:25:11 +00:00
|
|
|
}
|
|
|
|
|
2015-11-22 17:54:22 +00:00
|
|
|
static int mp_property_video_frame_info(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
|
|
|
struct mp_image *f =
|
|
|
|
mpctx->video_out ? vo_get_current_frame(mpctx->video_out) : NULL;
|
|
|
|
if (!f)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
|
|
|
const char *pict_types[] = {0, "I", "P", "B"};
|
|
|
|
const char *pict_type = f->pict_type >= 1 && f->pict_type <= 3
|
|
|
|
? pict_types[f->pict_type] : NULL;
|
|
|
|
|
|
|
|
struct m_sub_property props[] = {
|
|
|
|
{"picture-type", SUB_PROP_STR(pict_type), .unavailable = !pict_type},
|
|
|
|
{"interlaced", SUB_PROP_FLAG(!!(f->fields & MP_IMGFIELD_INTERLACED))},
|
|
|
|
{"tff", SUB_PROP_FLAG(!!(f->fields & MP_IMGFIELD_TOP_FIRST))},
|
|
|
|
{"repeat", SUB_PROP_FLAG(!!(f->fields & MP_IMGFIELD_REPEAT_FIRST))},
|
|
|
|
{0}
|
|
|
|
};
|
|
|
|
|
2016-04-24 18:11:36 +00:00
|
|
|
talloc_free(f);
|
2015-11-22 17:54:22 +00:00
|
|
|
return m_property_read_sub(props, action, arg);
|
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_window_scale(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2013-10-31 19:19:40 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2013-10-31 19:19:40 +00:00
|
|
|
struct vo *vo = mpctx->video_out;
|
2014-01-09 20:19:19 +00:00
|
|
|
if (!vo)
|
2016-10-25 14:05:46 +00:00
|
|
|
goto generic;
|
2013-10-31 19:19:40 +00:00
|
|
|
|
2014-01-09 20:19:19 +00:00
|
|
|
struct mp_image_params params = get_video_out_params(mpctx);
|
2015-12-19 19:04:31 +00:00
|
|
|
int vid_w, vid_h;
|
|
|
|
mp_image_params_get_dsize(¶ms, &vid_w, &vid_h);
|
2013-10-31 19:19:40 +00:00
|
|
|
if (vid_w < 1 || vid_h < 1)
|
2016-10-25 14:05:46 +00:00
|
|
|
goto generic;
|
2013-10-31 19:19:40 +00:00
|
|
|
|
|
|
|
switch (action) {
|
|
|
|
case M_PROPERTY_SET: {
|
|
|
|
double scale = *(double *)arg;
|
|
|
|
int s[2] = {vid_w * scale, vid_h * scale};
|
2016-10-25 14:05:46 +00:00
|
|
|
if (s[0] > 0 && s[1] > 0)
|
|
|
|
vo_control(vo, VOCTRL_SET_UNFS_WINDOW_SIZE, s);
|
|
|
|
goto generic;
|
2013-10-31 19:19:40 +00:00
|
|
|
}
|
|
|
|
case M_PROPERTY_GET: {
|
|
|
|
int s[2];
|
2014-09-04 20:53:50 +00:00
|
|
|
if (vo_control(vo, VOCTRL_GET_UNFS_WINDOW_SIZE, s) <= 0 ||
|
|
|
|
s[0] < 1 || s[1] < 1)
|
2016-10-25 14:05:46 +00:00
|
|
|
goto generic;
|
2013-10-31 19:19:40 +00:00
|
|
|
double xs = (double)s[0] / vid_w;
|
|
|
|
double ys = (double)s[1] / vid_h;
|
|
|
|
*(double *)arg = (xs + ys) / 2;
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
|
|
|
}
|
2016-10-25 14:05:46 +00:00
|
|
|
generic:
|
|
|
|
return mp_property_generic_option(mpctx, prop, action, arg);
|
2013-10-31 19:19:40 +00:00
|
|
|
}
|
|
|
|
|
2014-11-02 19:48:45 +00:00
|
|
|
static int mp_property_win_minimized(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
|
|
|
struct vo *vo = mpctx->video_out;
|
|
|
|
if (!vo)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
|
|
|
int state = 0;
|
|
|
|
if (vo_control(vo, VOCTRL_GET_WIN_STATE, &state) < 1)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
|
|
|
return m_property_flag_ro(action, arg, state & VO_WIN_STATE_MINIMIZED);
|
|
|
|
}
|
|
|
|
|
2015-03-10 13:50:56 +00:00
|
|
|
static int mp_property_display_fps(void *ctx, struct m_property *prop,
|
2015-03-12 22:41:25 +00:00
|
|
|
int action, void *arg)
|
2015-03-10 13:50:56 +00:00
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
2015-11-09 12:52:46 +00:00
|
|
|
double fps = mpctx->opts->frame_drop_fps;
|
2015-03-10 13:50:56 +00:00
|
|
|
struct vo *vo = mpctx->video_out;
|
2015-11-09 12:52:46 +00:00
|
|
|
if (vo)
|
|
|
|
fps = vo_get_display_fps(vo);
|
|
|
|
if (action == M_PROPERTY_SET) {
|
|
|
|
int ret = mp_property_generic_option(mpctx, prop, action, arg);
|
|
|
|
if (vo)
|
|
|
|
vo_event(vo, VO_EVENT_WIN_STATE);
|
|
|
|
return ret;
|
|
|
|
}
|
2015-03-13 12:14:11 +00:00
|
|
|
return m_property_double_ro(action, arg, fps);
|
2015-03-10 13:50:56 +00:00
|
|
|
}
|
|
|
|
|
2016-09-08 16:53:20 +00:00
|
|
|
static int mp_property_framedrop(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
|
|
|
int ret = mp_property_generic_option(mpctx, prop, action, arg);
|
|
|
|
if (action == M_PROPERTY_SET && ret == M_PROPERTY_OK && mpctx->video_out)
|
|
|
|
vo_event(mpctx->video_out, VO_EVENT_WIN_STATE);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2015-11-25 21:07:56 +00:00
|
|
|
static int mp_property_estimated_display_fps(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
|
|
|
struct vo *vo = mpctx->video_out;
|
|
|
|
if (!vo)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
double interval = vo_get_estimated_vsync_interval(vo);
|
|
|
|
if (interval <= 0)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
return m_property_double_ro(action, arg, 1.0 / interval);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int mp_property_vsync_jitter(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
|
|
|
struct vo *vo = mpctx->video_out;
|
|
|
|
if (!vo)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
double stddev = vo_get_estimated_vsync_jitter(vo);
|
|
|
|
if (stddev < 0)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
return m_property_double_ro(action, arg, stddev);
|
|
|
|
}
|
|
|
|
|
2014-11-06 02:16:32 +00:00
|
|
|
static int mp_property_display_names(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
|
|
|
struct vo *vo = mpctx->video_out;
|
|
|
|
if (!vo)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
|
|
|
switch (action) {
|
|
|
|
case M_PROPERTY_GET_TYPE:
|
|
|
|
*(struct m_option *)arg = (struct m_option){.type = CONF_TYPE_STRING_LIST};
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
case M_PROPERTY_GET: {
|
|
|
|
char** display_names;
|
|
|
|
if (vo_control(vo, VOCTRL_GET_DISPLAY_NAMES, &display_names) < 1)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
|
|
|
*(char ***)arg = display_names;
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return M_PROPERTY_NOT_IMPLEMENTED;
|
|
|
|
}
|
|
|
|
|
2014-10-24 13:34:53 +00:00
|
|
|
static int mp_property_vo_configured(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
|
|
|
return m_property_flag_ro(action, arg,
|
|
|
|
mpctx->video_out && mpctx->video_out->config_ok);
|
|
|
|
}
|
|
|
|
|
vo_opengl: refactor vo performance subsystem
This replaces `vo-performance` by `vo-passes`, bringing with it a number
of changes and improvements:
1. mpv users can now introspect the vo_opengl passes, which is something
that has been requested multiple times.
2. performance data is now measured per-pass, which helps both
development and debugging.
3. since adding more passes is cheap, we can now report information for
more passes (e.g. the blit pass, and the osd pass). Note: we also
switch to nanosecond scale, to be able to measure these passes
better.
4. `--user-shaders` authors can now describe their own passes, helping
users both identify which user shaders are active at any given time
as well as helping shader authors identify performance issues.
5. the timing data per pass is now exported as a full list of samples,
so projects like Argon-/mpv-stats can immediately read out all of the
samples and render a graph without having to manually poll this
option constantly.
Due to gl_timer's design being complicated (directly reading performance
data would block, so we delay the actual read-back until the next _start
command), it's vital not to conflate different passes that might be
doing different things from one frame to another. To accomplish this,
the actual timers are stored as part of the gl_shader_cache's sc_entry,
which makes them unique for that exact shader.
Starting and stopping the time measurement is easy to unify with the
gl_sc architecture, because the existing API already relies on a
"generate, render, reset" flow, so we can just put timer_start and
timer_stop in sc_generate and sc_reset, respectively.
The ugliest thing about this code is that due to the need to keep pass
information relatively stable in between frames, we need to distinguish
between "new" and "redrawn" frames, which bloats the code somewhat and
also feels hacky and vo_opengl-specific. (But then again, this entire
thing is vo_opengl-specific)
2017-06-29 15:00:06 +00:00
|
|
|
static void get_frame_perf(struct mpv_node *node, struct mp_frame_perf *perf)
|
|
|
|
{
|
|
|
|
for (int i = 0; i < perf->count; i++) {
|
|
|
|
struct mp_pass_perf *data = &perf->perf[i];
|
|
|
|
struct mpv_node *pass = node_array_add(node, MPV_FORMAT_NODE_MAP);
|
|
|
|
|
|
|
|
node_map_add_string(pass, "desc", perf->desc[i]);
|
|
|
|
node_map_add(pass, "last", MPV_FORMAT_INT64)->u.int64 = data->last;
|
|
|
|
node_map_add(pass, "avg", MPV_FORMAT_INT64)->u.int64 = data->avg;
|
|
|
|
node_map_add(pass, "peak", MPV_FORMAT_INT64)->u.int64 = data->peak;
|
|
|
|
node_map_add(pass, "count", MPV_FORMAT_INT64)->u.int64 = data->count;
|
|
|
|
struct mpv_node *samples = node_map_add(pass, "samples", MPV_FORMAT_NODE_ARRAY);
|
2017-09-10 22:27:27 +00:00
|
|
|
for (int n = 0; n < data->count; n++)
|
|
|
|
node_array_add(samples, MPV_FORMAT_INT64)->u.int64 = data->samples[n];
|
vo_opengl: refactor vo performance subsystem
This replaces `vo-performance` by `vo-passes`, bringing with it a number
of changes and improvements:
1. mpv users can now introspect the vo_opengl passes, which is something
that has been requested multiple times.
2. performance data is now measured per-pass, which helps both
development and debugging.
3. since adding more passes is cheap, we can now report information for
more passes (e.g. the blit pass, and the osd pass). Note: we also
switch to nanosecond scale, to be able to measure these passes
better.
4. `--user-shaders` authors can now describe their own passes, helping
users both identify which user shaders are active at any given time
as well as helping shader authors identify performance issues.
5. the timing data per pass is now exported as a full list of samples,
so projects like Argon-/mpv-stats can immediately read out all of the
samples and render a graph without having to manually poll this
option constantly.
Due to gl_timer's design being complicated (directly reading performance
data would block, so we delay the actual read-back until the next _start
command), it's vital not to conflate different passes that might be
doing different things from one frame to another. To accomplish this,
the actual timers are stored as part of the gl_shader_cache's sc_entry,
which makes them unique for that exact shader.
Starting and stopping the time measurement is easy to unify with the
gl_sc architecture, because the existing API already relies on a
"generate, render, reset" flow, so we can just put timer_start and
timer_stop in sc_generate and sc_reset, respectively.
The ugliest thing about this code is that due to the need to keep pass
information relatively stable in between frames, we need to distinguish
between "new" and "redrawn" frames, which bloats the code somewhat and
also feels hacky and vo_opengl-specific. (But then again, this entire
thing is vo_opengl-specific)
2017-06-29 15:00:06 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static char *asprint_perf(char *res, struct mp_frame_perf *perf)
|
|
|
|
{
|
|
|
|
for (int i = 0; i < perf->count; i++) {
|
|
|
|
struct mp_pass_perf *pass = &perf->perf[i];
|
|
|
|
res = talloc_asprintf_append(res,
|
|
|
|
"- %s: last %dus avg %dus peak %dus\n", perf->desc[i],
|
|
|
|
(int)pass->last/1000, (int)pass->avg/1000, (int)pass->peak/1000);
|
|
|
|
}
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int mp_property_vo_passes(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2016-06-08 09:39:31 +00:00
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
|
|
|
if (!mpctx->video_out)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
|
|
|
// Return the type right away if requested, to avoid having to
|
|
|
|
// go through a completely unnecessary VOCTRL
|
|
|
|
if (action == M_PROPERTY_GET_TYPE) {
|
|
|
|
*(struct m_option *)arg = (struct m_option){.type = CONF_TYPE_NODE};
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
|
|
|
|
2017-09-11 16:20:18 +00:00
|
|
|
int ret = M_PROPERTY_UNAVAILABLE;
|
|
|
|
struct voctrl_performance_data *data = talloc_ptrtype(NULL, data);
|
|
|
|
if (vo_control(mpctx->video_out, VOCTRL_PERFORMANCE_DATA, data) <= 0)
|
|
|
|
goto out;
|
2016-06-08 09:39:31 +00:00
|
|
|
|
vo_opengl: refactor vo performance subsystem
This replaces `vo-performance` by `vo-passes`, bringing with it a number
of changes and improvements:
1. mpv users can now introspect the vo_opengl passes, which is something
that has been requested multiple times.
2. performance data is now measured per-pass, which helps both
development and debugging.
3. since adding more passes is cheap, we can now report information for
more passes (e.g. the blit pass, and the osd pass). Note: we also
switch to nanosecond scale, to be able to measure these passes
better.
4. `--user-shaders` authors can now describe their own passes, helping
users both identify which user shaders are active at any given time
as well as helping shader authors identify performance issues.
5. the timing data per pass is now exported as a full list of samples,
so projects like Argon-/mpv-stats can immediately read out all of the
samples and render a graph without having to manually poll this
option constantly.
Due to gl_timer's design being complicated (directly reading performance
data would block, so we delay the actual read-back until the next _start
command), it's vital not to conflate different passes that might be
doing different things from one frame to another. To accomplish this,
the actual timers are stored as part of the gl_shader_cache's sc_entry,
which makes them unique for that exact shader.
Starting and stopping the time measurement is easy to unify with the
gl_sc architecture, because the existing API already relies on a
"generate, render, reset" flow, so we can just put timer_start and
timer_stop in sc_generate and sc_reset, respectively.
The ugliest thing about this code is that due to the need to keep pass
information relatively stable in between frames, we need to distinguish
between "new" and "redrawn" frames, which bloats the code somewhat and
also feels hacky and vo_opengl-specific. (But then again, this entire
thing is vo_opengl-specific)
2017-06-29 15:00:06 +00:00
|
|
|
switch (action) {
|
|
|
|
case M_PROPERTY_PRINT: {
|
|
|
|
char *res = NULL;
|
|
|
|
res = talloc_asprintf_append(res, "fresh:\n");
|
2017-09-11 16:20:18 +00:00
|
|
|
res = asprint_perf(res, &data->fresh);
|
vo_opengl: refactor vo performance subsystem
This replaces `vo-performance` by `vo-passes`, bringing with it a number
of changes and improvements:
1. mpv users can now introspect the vo_opengl passes, which is something
that has been requested multiple times.
2. performance data is now measured per-pass, which helps both
development and debugging.
3. since adding more passes is cheap, we can now report information for
more passes (e.g. the blit pass, and the osd pass). Note: we also
switch to nanosecond scale, to be able to measure these passes
better.
4. `--user-shaders` authors can now describe their own passes, helping
users both identify which user shaders are active at any given time
as well as helping shader authors identify performance issues.
5. the timing data per pass is now exported as a full list of samples,
so projects like Argon-/mpv-stats can immediately read out all of the
samples and render a graph without having to manually poll this
option constantly.
Due to gl_timer's design being complicated (directly reading performance
data would block, so we delay the actual read-back until the next _start
command), it's vital not to conflate different passes that might be
doing different things from one frame to another. To accomplish this,
the actual timers are stored as part of the gl_shader_cache's sc_entry,
which makes them unique for that exact shader.
Starting and stopping the time measurement is easy to unify with the
gl_sc architecture, because the existing API already relies on a
"generate, render, reset" flow, so we can just put timer_start and
timer_stop in sc_generate and sc_reset, respectively.
The ugliest thing about this code is that due to the need to keep pass
information relatively stable in between frames, we need to distinguish
between "new" and "redrawn" frames, which bloats the code somewhat and
also feels hacky and vo_opengl-specific. (But then again, this entire
thing is vo_opengl-specific)
2017-06-29 15:00:06 +00:00
|
|
|
res = talloc_asprintf_append(res, "\nredraw:\n");
|
2017-09-11 16:20:18 +00:00
|
|
|
res = asprint_perf(res, &data->redraw);
|
vo_opengl: refactor vo performance subsystem
This replaces `vo-performance` by `vo-passes`, bringing with it a number
of changes and improvements:
1. mpv users can now introspect the vo_opengl passes, which is something
that has been requested multiple times.
2. performance data is now measured per-pass, which helps both
development and debugging.
3. since adding more passes is cheap, we can now report information for
more passes (e.g. the blit pass, and the osd pass). Note: we also
switch to nanosecond scale, to be able to measure these passes
better.
4. `--user-shaders` authors can now describe their own passes, helping
users both identify which user shaders are active at any given time
as well as helping shader authors identify performance issues.
5. the timing data per pass is now exported as a full list of samples,
so projects like Argon-/mpv-stats can immediately read out all of the
samples and render a graph without having to manually poll this
option constantly.
Due to gl_timer's design being complicated (directly reading performance
data would block, so we delay the actual read-back until the next _start
command), it's vital not to conflate different passes that might be
doing different things from one frame to another. To accomplish this,
the actual timers are stored as part of the gl_shader_cache's sc_entry,
which makes them unique for that exact shader.
Starting and stopping the time measurement is easy to unify with the
gl_sc architecture, because the existing API already relies on a
"generate, render, reset" flow, so we can just put timer_start and
timer_stop in sc_generate and sc_reset, respectively.
The ugliest thing about this code is that due to the need to keep pass
information relatively stable in between frames, we need to distinguish
between "new" and "redrawn" frames, which bloats the code somewhat and
also feels hacky and vo_opengl-specific. (But then again, this entire
thing is vo_opengl-specific)
2017-06-29 15:00:06 +00:00
|
|
|
*(char **)arg = res;
|
2017-09-11 16:20:18 +00:00
|
|
|
ret = M_PROPERTY_OK;
|
|
|
|
goto out;
|
vo_opengl: refactor vo performance subsystem
This replaces `vo-performance` by `vo-passes`, bringing with it a number
of changes and improvements:
1. mpv users can now introspect the vo_opengl passes, which is something
that has been requested multiple times.
2. performance data is now measured per-pass, which helps both
development and debugging.
3. since adding more passes is cheap, we can now report information for
more passes (e.g. the blit pass, and the osd pass). Note: we also
switch to nanosecond scale, to be able to measure these passes
better.
4. `--user-shaders` authors can now describe their own passes, helping
users both identify which user shaders are active at any given time
as well as helping shader authors identify performance issues.
5. the timing data per pass is now exported as a full list of samples,
so projects like Argon-/mpv-stats can immediately read out all of the
samples and render a graph without having to manually poll this
option constantly.
Due to gl_timer's design being complicated (directly reading performance
data would block, so we delay the actual read-back until the next _start
command), it's vital not to conflate different passes that might be
doing different things from one frame to another. To accomplish this,
the actual timers are stored as part of the gl_shader_cache's sc_entry,
which makes them unique for that exact shader.
Starting and stopping the time measurement is easy to unify with the
gl_sc architecture, because the existing API already relies on a
"generate, render, reset" flow, so we can just put timer_start and
timer_stop in sc_generate and sc_reset, respectively.
The ugliest thing about this code is that due to the need to keep pass
information relatively stable in between frames, we need to distinguish
between "new" and "redrawn" frames, which bloats the code somewhat and
also feels hacky and vo_opengl-specific. (But then again, this entire
thing is vo_opengl-specific)
2017-06-29 15:00:06 +00:00
|
|
|
}
|
2016-06-08 09:39:31 +00:00
|
|
|
|
vo_opengl: refactor vo performance subsystem
This replaces `vo-performance` by `vo-passes`, bringing with it a number
of changes and improvements:
1. mpv users can now introspect the vo_opengl passes, which is something
that has been requested multiple times.
2. performance data is now measured per-pass, which helps both
development and debugging.
3. since adding more passes is cheap, we can now report information for
more passes (e.g. the blit pass, and the osd pass). Note: we also
switch to nanosecond scale, to be able to measure these passes
better.
4. `--user-shaders` authors can now describe their own passes, helping
users both identify which user shaders are active at any given time
as well as helping shader authors identify performance issues.
5. the timing data per pass is now exported as a full list of samples,
so projects like Argon-/mpv-stats can immediately read out all of the
samples and render a graph without having to manually poll this
option constantly.
Due to gl_timer's design being complicated (directly reading performance
data would block, so we delay the actual read-back until the next _start
command), it's vital not to conflate different passes that might be
doing different things from one frame to another. To accomplish this,
the actual timers are stored as part of the gl_shader_cache's sc_entry,
which makes them unique for that exact shader.
Starting and stopping the time measurement is easy to unify with the
gl_sc architecture, because the existing API already relies on a
"generate, render, reset" flow, so we can just put timer_start and
timer_stop in sc_generate and sc_reset, respectively.
The ugliest thing about this code is that due to the need to keep pass
information relatively stable in between frames, we need to distinguish
between "new" and "redrawn" frames, which bloats the code somewhat and
also feels hacky and vo_opengl-specific. (But then again, this entire
thing is vo_opengl-specific)
2017-06-29 15:00:06 +00:00
|
|
|
case M_PROPERTY_GET: {
|
|
|
|
struct mpv_node node;
|
|
|
|
node_init(&node, MPV_FORMAT_NODE_MAP, NULL);
|
|
|
|
struct mpv_node *fresh = node_map_add(&node, "fresh", MPV_FORMAT_NODE_ARRAY);
|
|
|
|
struct mpv_node *redraw = node_map_add(&node, "redraw", MPV_FORMAT_NODE_ARRAY);
|
2017-09-11 16:20:18 +00:00
|
|
|
get_frame_perf(fresh, &data->fresh);
|
|
|
|
get_frame_perf(redraw, &data->redraw);
|
vo_opengl: refactor vo performance subsystem
This replaces `vo-performance` by `vo-passes`, bringing with it a number
of changes and improvements:
1. mpv users can now introspect the vo_opengl passes, which is something
that has been requested multiple times.
2. performance data is now measured per-pass, which helps both
development and debugging.
3. since adding more passes is cheap, we can now report information for
more passes (e.g. the blit pass, and the osd pass). Note: we also
switch to nanosecond scale, to be able to measure these passes
better.
4. `--user-shaders` authors can now describe their own passes, helping
users both identify which user shaders are active at any given time
as well as helping shader authors identify performance issues.
5. the timing data per pass is now exported as a full list of samples,
so projects like Argon-/mpv-stats can immediately read out all of the
samples and render a graph without having to manually poll this
option constantly.
Due to gl_timer's design being complicated (directly reading performance
data would block, so we delay the actual read-back until the next _start
command), it's vital not to conflate different passes that might be
doing different things from one frame to another. To accomplish this,
the actual timers are stored as part of the gl_shader_cache's sc_entry,
which makes them unique for that exact shader.
Starting and stopping the time measurement is easy to unify with the
gl_sc architecture, because the existing API already relies on a
"generate, render, reset" flow, so we can just put timer_start and
timer_stop in sc_generate and sc_reset, respectively.
The ugliest thing about this code is that due to the need to keep pass
information relatively stable in between frames, we need to distinguish
between "new" and "redrawn" frames, which bloats the code somewhat and
also feels hacky and vo_opengl-specific. (But then again, this entire
thing is vo_opengl-specific)
2017-06-29 15:00:06 +00:00
|
|
|
*(struct mpv_node *)arg = node;
|
2017-09-11 16:20:18 +00:00
|
|
|
ret = M_PROPERTY_OK;
|
|
|
|
goto out;
|
vo_opengl: refactor vo performance subsystem
This replaces `vo-performance` by `vo-passes`, bringing with it a number
of changes and improvements:
1. mpv users can now introspect the vo_opengl passes, which is something
that has been requested multiple times.
2. performance data is now measured per-pass, which helps both
development and debugging.
3. since adding more passes is cheap, we can now report information for
more passes (e.g. the blit pass, and the osd pass). Note: we also
switch to nanosecond scale, to be able to measure these passes
better.
4. `--user-shaders` authors can now describe their own passes, helping
users both identify which user shaders are active at any given time
as well as helping shader authors identify performance issues.
5. the timing data per pass is now exported as a full list of samples,
so projects like Argon-/mpv-stats can immediately read out all of the
samples and render a graph without having to manually poll this
option constantly.
Due to gl_timer's design being complicated (directly reading performance
data would block, so we delay the actual read-back until the next _start
command), it's vital not to conflate different passes that might be
doing different things from one frame to another. To accomplish this,
the actual timers are stored as part of the gl_shader_cache's sc_entry,
which makes them unique for that exact shader.
Starting and stopping the time measurement is easy to unify with the
gl_sc architecture, because the existing API already relies on a
"generate, render, reset" flow, so we can just put timer_start and
timer_stop in sc_generate and sc_reset, respectively.
The ugliest thing about this code is that due to the need to keep pass
information relatively stable in between frames, we need to distinguish
between "new" and "redrawn" frames, which bloats the code somewhat and
also feels hacky and vo_opengl-specific. (But then again, this entire
thing is vo_opengl-specific)
2017-06-29 15:00:06 +00:00
|
|
|
}
|
|
|
|
}
|
2016-06-08 09:39:31 +00:00
|
|
|
|
2017-09-11 16:20:18 +00:00
|
|
|
ret = M_PROPERTY_NOT_IMPLEMENTED;
|
|
|
|
|
|
|
|
out:
|
|
|
|
talloc_free(data);
|
|
|
|
return ret;
|
2016-06-08 09:39:31 +00:00
|
|
|
}
|
|
|
|
|
2015-02-02 16:35:31 +00:00
|
|
|
static int mp_property_vo(void *ctx, struct m_property *p, int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
|
|
|
return m_property_strdup_ro(action, arg,
|
|
|
|
mpctx->video_out ? mpctx->video_out->driver->name : NULL);
|
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_osd_w(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2013-09-30 20:25:34 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2016-03-08 20:54:17 +00:00
|
|
|
struct mp_osd_res vo_res = osd_get_vo_res(mpctx->osd);
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return m_property_int_ro(action, arg, vo_res.w);
|
2013-09-30 20:25:34 +00:00
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_osd_h(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2013-09-30 20:25:34 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2016-03-08 20:54:17 +00:00
|
|
|
struct mp_osd_res vo_res = osd_get_vo_res(mpctx->osd);
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return m_property_int_ro(action, arg, vo_res.h);
|
2013-09-30 20:25:34 +00:00
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_osd_par(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2013-09-30 20:25:34 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2016-03-08 20:54:17 +00:00
|
|
|
struct mp_osd_res vo_res = osd_get_vo_res(mpctx->osd);
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return m_property_double_ro(action, arg, vo_res.display_par);
|
2013-09-30 20:25:34 +00:00
|
|
|
}
|
|
|
|
|
2014-09-17 22:12:59 +00:00
|
|
|
static int mp_property_osd_sym(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
|
|
|
char temp[20];
|
|
|
|
get_current_osd_sym(mpctx, temp, sizeof(temp));
|
|
|
|
return m_property_strdup_ro(action, arg, temp);
|
|
|
|
}
|
|
|
|
|
2014-09-17 22:49:55 +00:00
|
|
|
static int mp_property_osd_ass(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
struct m_sub_property props[] = {
|
2016-05-03 20:29:12 +00:00
|
|
|
{"0", SUB_PROP_STR(OSD_ASS_0)},
|
|
|
|
{"1", SUB_PROP_STR(OSD_ASS_1)},
|
2014-09-17 22:49:55 +00:00
|
|
|
{0}
|
|
|
|
};
|
|
|
|
return m_property_read_sub(props, action, arg);
|
|
|
|
}
|
|
|
|
|
2007-02-21 00:49:24 +00:00
|
|
|
/// Video fps (RO)
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_fps(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2007-02-21 00:49:24 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2016-01-17 17:07:50 +00:00
|
|
|
float fps = mpctx->vo_chain ? mpctx->vo_chain->container_fps : 0;
|
2014-11-28 23:34:53 +00:00
|
|
|
if (fps < 0.1 || !isfinite(fps))
|
|
|
|
return M_PROPERTY_UNAVAILABLE;;
|
|
|
|
return m_property_float_ro(action, arg, fps);
|
2007-02-21 00:49:24 +00:00
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_vf_fps(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2014-05-07 22:49:21 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2016-01-17 17:07:50 +00:00
|
|
|
if (!mpctx->vo_chain)
|
2014-05-07 22:49:21 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
player: refactor display-sync frame duration calculations
Get rid of get_past_frame_durations(), which was a bit too messy. Add
a past_frames array, which contains the same information in a more
reasonable way. This also means that we can get the exact current and
past frame durations without going through awful stuff. (The main
problem is that vo_pts_history contains future frames as well, which is
needed for frame backstepping etc., but gets in the way here.)
Also disable the automatic disabling of display-sync if the frame
duration changes, and extend the frame durations allowed for display
sync. To allow arbitrarily high durations, vo.c needs to be changed
to pause and potentially redraw OSD while showing a single frame, so
they're still limited.
In an attempt to deal with VFR, calculate the overall speed using the
average FPS. The frame scheduling itself does not use the average FPS,
but the duration of the current frame. This does not work too well,
but provides a good base for further improvements.
Where this commit actually helps a lot is dealing with rounded
timestamps, e.g. if the container framerate is wrong or unknown, or
if the muxer wrote incorrectly rounded timestamps. While the rounding
errors apparently can't be get rid of completely in the general case,
this is still much better than e.g. disabling display-sync completely
just because some frame durations go out of bounds.
2015-11-13 21:45:40 +00:00
|
|
|
double avg = calc_average_frame_duration(mpctx);
|
|
|
|
if (avg <= 0)
|
2015-08-10 16:38:57 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
player: refactor display-sync frame duration calculations
Get rid of get_past_frame_durations(), which was a bit too messy. Add
a past_frames array, which contains the same information in a more
reasonable way. This also means that we can get the exact current and
past frame durations without going through awful stuff. (The main
problem is that vo_pts_history contains future frames as well, which is
needed for frame backstepping etc., but gets in the way here.)
Also disable the automatic disabling of display-sync if the frame
duration changes, and extend the frame durations allowed for display
sync. To allow arbitrarily high durations, vo.c needs to be changed
to pause and potentially redraw OSD while showing a single frame, so
they're still limited.
In an attempt to deal with VFR, calculate the overall speed using the
average FPS. The frame scheduling itself does not use the average FPS,
but the duration of the current frame. This does not work too well,
but provides a good base for further improvements.
Where this commit actually helps a lot is dealing with rounded
timestamps, e.g. if the container framerate is wrong or unknown, or
if the muxer wrote incorrectly rounded timestamps. While the rounding
errors apparently can't be get rid of completely in the general case,
this is still much better than e.g. disabling display-sync completely
just because some frame durations go out of bounds.
2015-11-13 21:45:40 +00:00
|
|
|
return m_property_double_ro(action, arg, 1.0 / avg);
|
2014-05-07 22:49:21 +00:00
|
|
|
}
|
|
|
|
|
2007-02-21 00:49:24 +00:00
|
|
|
/// Video aspect (RO)
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_aspect(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2007-02-21 00:49:24 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2016-02-02 21:12:24 +00:00
|
|
|
|
|
|
|
float aspect = mpctx->opts->movie_aspect;
|
|
|
|
if (mpctx->vo_chain && aspect <= 0) {
|
|
|
|
struct mp_image_params *params = &mpctx->vo_chain->vf->input_params;
|
|
|
|
if (params && params->p_w > 0 && params->p_h > 0) {
|
|
|
|
int d_w, d_h;
|
|
|
|
mp_image_params_get_dsize(params, &d_w, &d_h);
|
|
|
|
aspect = (float)d_w / d_h;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
struct track *track = mpctx->current_track[0][STREAM_VIDEO];
|
|
|
|
if (track && track->d_video && aspect <= 0) {
|
|
|
|
struct dec_video *d_video = track->d_video;
|
|
|
|
struct mp_codec_params *c = d_video->header->codec;
|
|
|
|
if (c->disp_w && c->disp_h)
|
|
|
|
aspect = (float)c->disp_w / c->disp_h;
|
|
|
|
}
|
|
|
|
|
2012-09-22 03:13:29 +00:00
|
|
|
switch (action) {
|
2016-01-16 22:23:44 +00:00
|
|
|
case M_PROPERTY_PRINT: {
|
2016-09-18 10:10:22 +00:00
|
|
|
if (mpctx->opts->movie_aspect < 0) {
|
2016-02-02 21:12:24 +00:00
|
|
|
*(char **)arg = talloc_asprintf(NULL, "%.3f (original)", aspect);
|
2016-01-16 22:23:44 +00:00
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
2013-09-26 14:53:17 +00:00
|
|
|
case M_PROPERTY_GET: {
|
|
|
|
*(float *)arg = aspect;
|
2012-09-22 03:13:29 +00:00
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
2013-09-26 14:53:17 +00:00
|
|
|
}
|
2016-09-20 13:34:31 +00:00
|
|
|
return mp_property_generic_option(mpctx, prop, action, arg);
|
2007-02-21 00:49:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Selected subtitles (RW)
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_sub(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2007-02-21 00:49:24 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return property_switch_track(prop, action, arg, ctx, 0, STREAM_SUB);
|
2013-12-24 16:46:14 +00:00
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_sub2(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2013-12-24 16:46:14 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return property_switch_track(prop, action, arg, ctx, 1, STREAM_SUB);
|
2007-11-25 04:09:04 +00:00
|
|
|
}
|
|
|
|
|
2007-02-21 00:49:24 +00:00
|
|
|
/// Subtitle delay (RW)
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_sub_delay(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2007-02-21 00:49:24 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2013-07-27 19:24:54 +00:00
|
|
|
struct MPOpts *opts = mpctx->opts;
|
2012-09-18 13:31:46 +00:00
|
|
|
switch (action) {
|
|
|
|
case M_PROPERTY_PRINT:
|
2013-04-28 23:49:20 +00:00
|
|
|
*(char **)arg = format_delay(opts->sub_delay);
|
2012-09-18 13:31:46 +00:00
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
2016-09-19 18:16:44 +00:00
|
|
|
return mp_property_generic_option(mpctx, prop, action, arg);
|
2007-02-21 00:49:24 +00:00
|
|
|
}
|
|
|
|
|
2016-09-13 01:17:10 +00:00
|
|
|
/// Subtitle speed (RW)
|
|
|
|
static int mp_property_sub_speed(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
|
|
|
struct MPOpts *opts = mpctx->opts;
|
2017-04-10 19:22:26 +00:00
|
|
|
if (action == M_PROPERTY_PRINT) {
|
2016-09-13 01:17:40 +00:00
|
|
|
*(char **)arg = talloc_asprintf(NULL, "%4.1f%%", 100 * opts->sub_speed);
|
|
|
|
return M_PROPERTY_OK;
|
2016-09-13 01:17:10 +00:00
|
|
|
}
|
2016-09-19 18:16:44 +00:00
|
|
|
return mp_property_generic_option(mpctx, prop, action, arg);
|
2016-09-13 01:17:10 +00:00
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_sub_pos(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2012-09-25 01:24:38 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2013-07-27 19:24:54 +00:00
|
|
|
struct MPOpts *opts = mpctx->opts;
|
2012-09-25 01:24:38 +00:00
|
|
|
if (action == M_PROPERTY_PRINT) {
|
2013-04-28 23:49:20 +00:00
|
|
|
*(char **)arg = talloc_asprintf(NULL, "%d/100", opts->sub_pos);
|
2012-09-25 01:24:38 +00:00
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
2016-09-19 18:16:44 +00:00
|
|
|
return mp_property_generic_option(mpctx, prop, action, arg);
|
2012-09-25 01:24:38 +00:00
|
|
|
}
|
|
|
|
|
2016-08-27 19:14:41 +00:00
|
|
|
static int mp_property_sub_text(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
|
|
|
struct track *track = mpctx->current_track[0][STREAM_SUB];
|
|
|
|
struct dec_sub *sub = track ? track->d_sub : NULL;
|
|
|
|
double pts = mpctx->playback_pts;
|
|
|
|
if (!sub || pts == MP_NOPTS_VALUE)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
|
|
|
pts -= mpctx->opts->sub_delay;
|
|
|
|
|
|
|
|
char *text = sub_get_text(sub, pts);
|
|
|
|
if (!text)
|
|
|
|
text = "";
|
|
|
|
|
|
|
|
return m_property_strdup_ro(action, arg, text);
|
|
|
|
}
|
|
|
|
|
2014-10-21 11:41:19 +00:00
|
|
|
static int mp_property_cursor_autohide(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
|
|
|
struct MPOpts *opts = mpctx->opts;
|
|
|
|
int old_value = opts->cursor_autohide_delay;
|
|
|
|
int r = mp_property_generic_option(mpctx, prop, action, arg);
|
|
|
|
if (opts->cursor_autohide_delay != old_value)
|
|
|
|
mpctx->mouse_timer = 0;
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
command: redo ancient TV/DVB/PVR commands
Convert all these commands to properties. (Except tv_last_channel, not
sure what to do with this.) Also, internally, don't access stream
details directly, but dispatch commands with stream ctrls.
Many of the new properties are a bit strange, because they're write-
only. Also remove some OSD output these commands produced, because I
couldn't be bothered to port these.
In general, this makes everything much cleaner, and will also make it
easier to e.g. move the demuxer to its own thread.
Don't bother updating input.conf, but changes.rst documents how old
commands map to the new ones.
Mostly untested, due to lack of hardware.
2014-06-09 21:38:28 +00:00
|
|
|
static int prop_stream_ctrl(struct MPContext *mpctx, int ctrl, void *arg)
|
2012-08-19 16:07:06 +00:00
|
|
|
{
|
2014-07-16 20:40:21 +00:00
|
|
|
if (!mpctx->demuxer)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
int r = demux_stream_control(mpctx->demuxer, ctrl, arg);
|
command: redo ancient TV/DVB/PVR commands
Convert all these commands to properties. (Except tv_last_channel, not
sure what to do with this.) Also, internally, don't access stream
details directly, but dispatch commands with stream ctrls.
Many of the new properties are a bit strange, because they're write-
only. Also remove some OSD output these commands produced, because I
couldn't be bothered to port these.
In general, this makes everything much cleaner, and will also make it
easier to e.g. move the demuxer to its own thread.
Don't bother updating input.conf, but changes.rst documents how old
commands map to the new ones.
Mostly untested, due to lack of hardware.
2014-06-09 21:38:28 +00:00
|
|
|
switch (r) {
|
|
|
|
case STREAM_OK: return M_PROPERTY_OK;
|
|
|
|
case STREAM_UNSUPPORTED: return M_PROPERTY_UNAVAILABLE;
|
|
|
|
default: return M_PROPERTY_ERROR;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_tv_norm(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
command: redo ancient TV/DVB/PVR commands
Convert all these commands to properties. (Except tv_last_channel, not
sure what to do with this.) Also, internally, don't access stream
details directly, but dispatch commands with stream ctrls.
Many of the new properties are a bit strange, because they're write-
only. Also remove some OSD output these commands produced, because I
couldn't be bothered to port these.
In general, this makes everything much cleaner, and will also make it
easier to e.g. move the demuxer to its own thread.
Don't bother updating input.conf, but changes.rst documents how old
commands map to the new ones.
Mostly untested, due to lack of hardware.
2014-06-09 21:38:28 +00:00
|
|
|
{
|
|
|
|
switch (action) {
|
|
|
|
case M_PROPERTY_SET:
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return prop_stream_ctrl(ctx, STREAM_CTRL_TV_SET_NORM, *(char **)arg);
|
command: redo ancient TV/DVB/PVR commands
Convert all these commands to properties. (Except tv_last_channel, not
sure what to do with this.) Also, internally, don't access stream
details directly, but dispatch commands with stream ctrls.
Many of the new properties are a bit strange, because they're write-
only. Also remove some OSD output these commands produced, because I
couldn't be bothered to port these.
In general, this makes everything much cleaner, and will also make it
easier to e.g. move the demuxer to its own thread.
Don't bother updating input.conf, but changes.rst documents how old
commands map to the new ones.
Mostly untested, due to lack of hardware.
2014-06-09 21:38:28 +00:00
|
|
|
case M_PROPERTY_SWITCH:
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return prop_stream_ctrl(ctx, STREAM_CTRL_TV_STEP_NORM, NULL);
|
|
|
|
case M_PROPERTY_GET_TYPE:
|
|
|
|
*(struct m_option *)arg = (struct m_option){.type = CONF_TYPE_STRING};
|
|
|
|
return M_PROPERTY_OK;
|
command: redo ancient TV/DVB/PVR commands
Convert all these commands to properties. (Except tv_last_channel, not
sure what to do with this.) Also, internally, don't access stream
details directly, but dispatch commands with stream ctrls.
Many of the new properties are a bit strange, because they're write-
only. Also remove some OSD output these commands produced, because I
couldn't be bothered to port these.
In general, this makes everything much cleaner, and will also make it
easier to e.g. move the demuxer to its own thread.
Don't bother updating input.conf, but changes.rst documents how old
commands map to the new ones.
Mostly untested, due to lack of hardware.
2014-06-09 21:38:28 +00:00
|
|
|
}
|
|
|
|
return M_PROPERTY_NOT_IMPLEMENTED;
|
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_tv_scan(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
command: redo ancient TV/DVB/PVR commands
Convert all these commands to properties. (Except tv_last_channel, not
sure what to do with this.) Also, internally, don't access stream
details directly, but dispatch commands with stream ctrls.
Many of the new properties are a bit strange, because they're write-
only. Also remove some OSD output these commands produced, because I
couldn't be bothered to port these.
In general, this makes everything much cleaner, and will also make it
easier to e.g. move the demuxer to its own thread.
Don't bother updating input.conf, but changes.rst documents how old
commands map to the new ones.
Mostly untested, due to lack of hardware.
2014-06-09 21:38:28 +00:00
|
|
|
{
|
|
|
|
switch (action) {
|
|
|
|
case M_PROPERTY_SET:
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return prop_stream_ctrl(ctx, STREAM_CTRL_TV_SET_SCAN, arg);
|
|
|
|
case M_PROPERTY_GET_TYPE:
|
|
|
|
*(struct m_option *)arg = (struct m_option){.type = CONF_TYPE_FLAG};
|
|
|
|
return M_PROPERTY_OK;
|
command: redo ancient TV/DVB/PVR commands
Convert all these commands to properties. (Except tv_last_channel, not
sure what to do with this.) Also, internally, don't access stream
details directly, but dispatch commands with stream ctrls.
Many of the new properties are a bit strange, because they're write-
only. Also remove some OSD output these commands produced, because I
couldn't be bothered to port these.
In general, this makes everything much cleaner, and will also make it
easier to e.g. move the demuxer to its own thread.
Don't bother updating input.conf, but changes.rst documents how old
commands map to the new ones.
Mostly untested, due to lack of hardware.
2014-06-09 21:38:28 +00:00
|
|
|
}
|
|
|
|
return M_PROPERTY_NOT_IMPLEMENTED;
|
2012-08-19 16:07:06 +00:00
|
|
|
}
|
|
|
|
|
2007-02-21 00:49:24 +00:00
|
|
|
/// TV color settings (RW)
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_tv_color(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2007-02-21 00:49:24 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
int req[2] = {(intptr_t)prop->priv};
|
command: redo ancient TV/DVB/PVR commands
Convert all these commands to properties. (Except tv_last_channel, not
sure what to do with this.) Also, internally, don't access stream
details directly, but dispatch commands with stream ctrls.
Many of the new properties are a bit strange, because they're write-
only. Also remove some OSD output these commands produced, because I
couldn't be bothered to port these.
In general, this makes everything much cleaner, and will also make it
easier to e.g. move the demuxer to its own thread.
Don't bother updating input.conf, but changes.rst documents how old
commands map to the new ones.
Mostly untested, due to lack of hardware.
2014-06-09 21:38:28 +00:00
|
|
|
switch (action) {
|
|
|
|
case M_PROPERTY_SET:
|
|
|
|
req[1] = *(int *)arg;
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return prop_stream_ctrl(ctx, STREAM_CTRL_SET_TV_COLORS, req);
|
command: redo ancient TV/DVB/PVR commands
Convert all these commands to properties. (Except tv_last_channel, not
sure what to do with this.) Also, internally, don't access stream
details directly, but dispatch commands with stream ctrls.
Many of the new properties are a bit strange, because they're write-
only. Also remove some OSD output these commands produced, because I
couldn't be bothered to port these.
In general, this makes everything much cleaner, and will also make it
easier to e.g. move the demuxer to its own thread.
Don't bother updating input.conf, but changes.rst documents how old
commands map to the new ones.
Mostly untested, due to lack of hardware.
2014-06-09 21:38:28 +00:00
|
|
|
case M_PROPERTY_GET: {
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
int r = prop_stream_ctrl(ctx, STREAM_CTRL_GET_TV_COLORS, req);
|
command: redo ancient TV/DVB/PVR commands
Convert all these commands to properties. (Except tv_last_channel, not
sure what to do with this.) Also, internally, don't access stream
details directly, but dispatch commands with stream ctrls.
Many of the new properties are a bit strange, because they're write-
only. Also remove some OSD output these commands produced, because I
couldn't be bothered to port these.
In general, this makes everything much cleaner, and will also make it
easier to e.g. move the demuxer to its own thread.
Don't bother updating input.conf, but changes.rst documents how old
commands map to the new ones.
Mostly untested, due to lack of hardware.
2014-06-09 21:38:28 +00:00
|
|
|
if (r == M_PROPERTY_OK)
|
|
|
|
*(int *)arg = req[1];
|
|
|
|
return r;
|
|
|
|
}
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
case M_PROPERTY_GET_TYPE:
|
|
|
|
*(struct m_option *)arg = (struct m_option){
|
|
|
|
.type = CONF_TYPE_INT,
|
|
|
|
.flags = M_OPT_RANGE,
|
|
|
|
.min = -100,
|
|
|
|
.max = 100,
|
|
|
|
};
|
|
|
|
return M_PROPERTY_OK;
|
command: redo ancient TV/DVB/PVR commands
Convert all these commands to properties. (Except tv_last_channel, not
sure what to do with this.) Also, internally, don't access stream
details directly, but dispatch commands with stream ctrls.
Many of the new properties are a bit strange, because they're write-
only. Also remove some OSD output these commands produced, because I
couldn't be bothered to port these.
In general, this makes everything much cleaner, and will also make it
easier to e.g. move the demuxer to its own thread.
Don't bother updating input.conf, but changes.rst documents how old
commands map to the new ones.
Mostly untested, due to lack of hardware.
2014-06-09 21:38:28 +00:00
|
|
|
}
|
|
|
|
return M_PROPERTY_NOT_IMPLEMENTED;
|
|
|
|
}
|
2007-02-21 00:49:24 +00:00
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_tv_freq(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
command: redo ancient TV/DVB/PVR commands
Convert all these commands to properties. (Except tv_last_channel, not
sure what to do with this.) Also, internally, don't access stream
details directly, but dispatch commands with stream ctrls.
Many of the new properties are a bit strange, because they're write-
only. Also remove some OSD output these commands produced, because I
couldn't be bothered to port these.
In general, this makes everything much cleaner, and will also make it
easier to e.g. move the demuxer to its own thread.
Don't bother updating input.conf, but changes.rst documents how old
commands map to the new ones.
Mostly untested, due to lack of hardware.
2014-06-09 21:38:28 +00:00
|
|
|
{
|
2007-02-21 00:49:24 +00:00
|
|
|
switch (action) {
|
|
|
|
case M_PROPERTY_SET:
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return prop_stream_ctrl(ctx, STREAM_CTRL_SET_TV_FREQ, arg);
|
2007-02-21 00:49:24 +00:00
|
|
|
case M_PROPERTY_GET:
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return prop_stream_ctrl(ctx, STREAM_CTRL_GET_TV_FREQ, arg);
|
|
|
|
case M_PROPERTY_GET_TYPE:
|
|
|
|
*(struct m_option *)arg = (struct m_option){.type = CONF_TYPE_FLOAT};
|
|
|
|
return M_PROPERTY_OK;
|
2007-02-21 00:49:24 +00:00
|
|
|
}
|
|
|
|
return M_PROPERTY_NOT_IMPLEMENTED;
|
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_tv_channel(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
command: redo ancient TV/DVB/PVR commands
Convert all these commands to properties. (Except tv_last_channel, not
sure what to do with this.) Also, internally, don't access stream
details directly, but dispatch commands with stream ctrls.
Many of the new properties are a bit strange, because they're write-
only. Also remove some OSD output these commands produced, because I
couldn't be bothered to port these.
In general, this makes everything much cleaner, and will also make it
easier to e.g. move the demuxer to its own thread.
Don't bother updating input.conf, but changes.rst documents how old
commands map to the new ones.
Mostly untested, due to lack of hardware.
2014-06-09 21:38:28 +00:00
|
|
|
{
|
|
|
|
switch (action) {
|
2014-06-25 15:41:16 +00:00
|
|
|
case M_PROPERTY_GET_TYPE:
|
|
|
|
*(struct m_option *)arg = (struct m_option){.type = CONF_TYPE_STRING};
|
|
|
|
return M_PROPERTY_OK;
|
command: redo ancient TV/DVB/PVR commands
Convert all these commands to properties. (Except tv_last_channel, not
sure what to do with this.) Also, internally, don't access stream
details directly, but dispatch commands with stream ctrls.
Many of the new properties are a bit strange, because they're write-
only. Also remove some OSD output these commands produced, because I
couldn't be bothered to port these.
In general, this makes everything much cleaner, and will also make it
easier to e.g. move the demuxer to its own thread.
Don't bother updating input.conf, but changes.rst documents how old
commands map to the new ones.
Mostly untested, due to lack of hardware.
2014-06-09 21:38:28 +00:00
|
|
|
case M_PROPERTY_SET:
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return prop_stream_ctrl(ctx, STREAM_CTRL_TV_SET_CHAN, *(char **)arg);
|
2015-02-02 15:47:32 +00:00
|
|
|
case M_PROPERTY_GET:
|
|
|
|
return prop_stream_ctrl(ctx, STREAM_CTRL_TV_GET_CHAN, arg);
|
command: redo ancient TV/DVB/PVR commands
Convert all these commands to properties. (Except tv_last_channel, not
sure what to do with this.) Also, internally, don't access stream
details directly, but dispatch commands with stream ctrls.
Many of the new properties are a bit strange, because they're write-
only. Also remove some OSD output these commands produced, because I
couldn't be bothered to port these.
In general, this makes everything much cleaner, and will also make it
easier to e.g. move the demuxer to its own thread.
Don't bother updating input.conf, but changes.rst documents how old
commands map to the new ones.
Mostly untested, due to lack of hardware.
2014-06-09 21:38:28 +00:00
|
|
|
case M_PROPERTY_SWITCH: {
|
|
|
|
struct m_property_switch_arg *sa = arg;
|
|
|
|
int dir = sa->inc >= 0 ? 1 : -1;
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return prop_stream_ctrl(ctx, STREAM_CTRL_TV_STEP_CHAN, &dir);
|
command: redo ancient TV/DVB/PVR commands
Convert all these commands to properties. (Except tv_last_channel, not
sure what to do with this.) Also, internally, don't access stream
details directly, but dispatch commands with stream ctrls.
Many of the new properties are a bit strange, because they're write-
only. Also remove some OSD output these commands produced, because I
couldn't be bothered to port these.
In general, this makes everything much cleaner, and will also make it
easier to e.g. move the demuxer to its own thread.
Don't bother updating input.conf, but changes.rst documents how old
commands map to the new ones.
Mostly untested, due to lack of hardware.
2014-06-09 21:38:28 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return M_PROPERTY_NOT_IMPLEMENTED;
|
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_dvb_channel(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
command: redo ancient TV/DVB/PVR commands
Convert all these commands to properties. (Except tv_last_channel, not
sure what to do with this.) Also, internally, don't access stream
details directly, but dispatch commands with stream ctrls.
Many of the new properties are a bit strange, because they're write-
only. Also remove some OSD output these commands produced, because I
couldn't be bothered to port these.
In general, this makes everything much cleaner, and will also make it
easier to e.g. move the demuxer to its own thread.
Don't bother updating input.conf, but changes.rst documents how old
commands map to the new ones.
Mostly untested, due to lack of hardware.
2014-06-09 21:38:28 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
command: redo ancient TV/DVB/PVR commands
Convert all these commands to properties. (Except tv_last_channel, not
sure what to do with this.) Also, internally, don't access stream
details directly, but dispatch commands with stream ctrls.
Many of the new properties are a bit strange, because they're write-
only. Also remove some OSD output these commands produced, because I
couldn't be bothered to port these.
In general, this makes everything much cleaner, and will also make it
easier to e.g. move the demuxer to its own thread.
Don't bother updating input.conf, but changes.rst documents how old
commands map to the new ones.
Mostly untested, due to lack of hardware.
2014-06-09 21:38:28 +00:00
|
|
|
int r;
|
|
|
|
switch (action) {
|
|
|
|
case M_PROPERTY_SET:
|
|
|
|
r = prop_stream_ctrl(mpctx, STREAM_CTRL_DVB_SET_CHANNEL, arg);
|
2015-07-08 19:31:31 +00:00
|
|
|
if (r == M_PROPERTY_OK && !mpctx->stop_play)
|
2015-07-02 12:38:03 +00:00
|
|
|
mpctx->stop_play = PT_RELOAD_FILE;
|
command: redo ancient TV/DVB/PVR commands
Convert all these commands to properties. (Except tv_last_channel, not
sure what to do with this.) Also, internally, don't access stream
details directly, but dispatch commands with stream ctrls.
Many of the new properties are a bit strange, because they're write-
only. Also remove some OSD output these commands produced, because I
couldn't be bothered to port these.
In general, this makes everything much cleaner, and will also make it
easier to e.g. move the demuxer to its own thread.
Don't bother updating input.conf, but changes.rst documents how old
commands map to the new ones.
Mostly untested, due to lack of hardware.
2014-06-09 21:38:28 +00:00
|
|
|
return r;
|
|
|
|
case M_PROPERTY_SWITCH: {
|
|
|
|
struct m_property_switch_arg *sa = arg;
|
|
|
|
int dir = sa->inc >= 0 ? 1 : -1;
|
|
|
|
r = prop_stream_ctrl(mpctx, STREAM_CTRL_DVB_STEP_CHANNEL, &dir);
|
2015-07-08 19:31:31 +00:00
|
|
|
if (r == M_PROPERTY_OK && !mpctx->stop_play)
|
2015-07-02 12:38:03 +00:00
|
|
|
mpctx->stop_play = PT_RELOAD_FILE;
|
command: redo ancient TV/DVB/PVR commands
Convert all these commands to properties. (Except tv_last_channel, not
sure what to do with this.) Also, internally, don't access stream
details directly, but dispatch commands with stream ctrls.
Many of the new properties are a bit strange, because they're write-
only. Also remove some OSD output these commands produced, because I
couldn't be bothered to port these.
In general, this makes everything much cleaner, and will also make it
easier to e.g. move the demuxer to its own thread.
Don't bother updating input.conf, but changes.rst documents how old
commands map to the new ones.
Mostly untested, due to lack of hardware.
2014-06-09 21:38:28 +00:00
|
|
|
return r;
|
|
|
|
}
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
case M_PROPERTY_GET_TYPE:
|
|
|
|
*(struct m_option *)arg = (struct m_option){.type = &m_option_type_intpair};
|
|
|
|
return M_PROPERTY_OK;
|
command: redo ancient TV/DVB/PVR commands
Convert all these commands to properties. (Except tv_last_channel, not
sure what to do with this.) Also, internally, don't access stream
details directly, but dispatch commands with stream ctrls.
Many of the new properties are a bit strange, because they're write-
only. Also remove some OSD output these commands produced, because I
couldn't be bothered to port these.
In general, this makes everything much cleaner, and will also make it
easier to e.g. move the demuxer to its own thread.
Don't bother updating input.conf, but changes.rst documents how old
commands map to the new ones.
Mostly untested, due to lack of hardware.
2014-06-09 21:38:28 +00:00
|
|
|
}
|
|
|
|
return M_PROPERTY_NOT_IMPLEMENTED;
|
|
|
|
}
|
2007-02-21 00:49:24 +00:00
|
|
|
|
2016-01-08 19:19:57 +00:00
|
|
|
static int mp_property_dvb_channel_name(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
|
|
|
int r;
|
|
|
|
switch (action) {
|
|
|
|
case M_PROPERTY_SET:
|
|
|
|
r = prop_stream_ctrl(mpctx, STREAM_CTRL_DVB_SET_CHANNEL_NAME, arg);
|
|
|
|
if (r == M_PROPERTY_OK && !mpctx->stop_play)
|
|
|
|
mpctx->stop_play = PT_RELOAD_FILE;
|
|
|
|
return r;
|
2016-01-08 19:36:23 +00:00
|
|
|
case M_PROPERTY_SWITCH: {
|
|
|
|
struct m_property_switch_arg *sa = arg;
|
|
|
|
int dir = sa->inc >= 0 ? 1 : -1;
|
|
|
|
r = prop_stream_ctrl(mpctx, STREAM_CTRL_DVB_STEP_CHANNEL, &dir);
|
|
|
|
if (r == M_PROPERTY_OK && !mpctx->stop_play)
|
|
|
|
mpctx->stop_play = PT_RELOAD_FILE;
|
|
|
|
return r;
|
|
|
|
}
|
2016-01-08 19:19:57 +00:00
|
|
|
case M_PROPERTY_GET: {
|
|
|
|
return prop_stream_ctrl(mpctx, STREAM_CTRL_DVB_GET_CHANNEL_NAME, arg);
|
|
|
|
}
|
|
|
|
case M_PROPERTY_GET_TYPE:
|
|
|
|
*(struct m_option *)arg = (struct m_option){.type = CONF_TYPE_STRING};
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
|
|
|
return M_PROPERTY_NOT_IMPLEMENTED;
|
|
|
|
}
|
|
|
|
|
2016-05-26 16:43:49 +00:00
|
|
|
static int mp_property_playlist_pos_x(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg, int base)
|
2013-06-28 20:16:29 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2013-06-28 20:16:29 +00:00
|
|
|
struct playlist *pl = mpctx->playlist;
|
|
|
|
if (!pl->first)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
|
|
|
switch (action) {
|
|
|
|
case M_PROPERTY_GET: {
|
|
|
|
int pos = playlist_entry_to_index(pl, pl->current);
|
|
|
|
if (pos < 0)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
2016-05-26 16:43:49 +00:00
|
|
|
*(int *)arg = pos + base;
|
2013-06-28 20:16:29 +00:00
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
|
|
|
case M_PROPERTY_SET: {
|
2016-05-26 16:43:49 +00:00
|
|
|
int pos = *(int *)arg - base;
|
|
|
|
struct playlist_entry *e = playlist_entry_from_index(pl, pos);
|
2013-06-28 20:16:29 +00:00
|
|
|
if (!e)
|
|
|
|
return M_PROPERTY_ERROR;
|
|
|
|
mp_set_playlist_entry(mpctx, e);
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
|
|
|
case M_PROPERTY_GET_TYPE: {
|
|
|
|
struct m_option opt = {
|
|
|
|
.type = CONF_TYPE_INT,
|
|
|
|
.flags = CONF_RANGE,
|
2016-05-26 16:43:49 +00:00
|
|
|
.min = base,
|
|
|
|
.max = playlist_entry_count(pl) - 1 + base,
|
2013-06-28 20:16:29 +00:00
|
|
|
};
|
|
|
|
*(struct m_option *)arg = opt;
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return M_PROPERTY_NOT_IMPLEMENTED;
|
|
|
|
}
|
|
|
|
|
2016-05-26 16:43:49 +00:00
|
|
|
static int mp_property_playlist_pos(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
return mp_property_playlist_pos_x(ctx, prop, action, arg, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int mp_property_playlist_pos_1(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
return mp_property_playlist_pos_x(ctx, prop, action, arg, 1);
|
|
|
|
}
|
|
|
|
|
2016-08-19 13:13:54 +00:00
|
|
|
struct get_playlist_ctx {
|
|
|
|
struct MPContext *mpctx;
|
|
|
|
int last_index;
|
|
|
|
struct playlist_entry *last_entry;
|
|
|
|
};
|
|
|
|
|
2014-02-15 15:54:55 +00:00
|
|
|
static int get_playlist_entry(int item, int action, void *arg, void *ctx)
|
2013-06-28 20:16:29 +00:00
|
|
|
{
|
2016-08-19 13:13:54 +00:00
|
|
|
struct get_playlist_ctx *p = ctx;
|
|
|
|
struct MPContext *mpctx = p->mpctx;
|
|
|
|
|
|
|
|
struct playlist_entry *e;
|
|
|
|
// This is an optimization that prevents O(n^2) behaviour when the entire
|
|
|
|
// playlist is requested. If a request is made for the last requested entry
|
|
|
|
// or the entry immediately following it, it can be found without a full
|
|
|
|
// traversal of the linked list.
|
|
|
|
if (p->last_entry && item == p->last_index)
|
|
|
|
e = p->last_entry;
|
|
|
|
else if (p->last_entry && item == p->last_index + 1)
|
|
|
|
e = p->last_entry->next;
|
|
|
|
else
|
|
|
|
e = playlist_entry_from_index(mpctx->playlist, item);
|
|
|
|
p->last_index = item;
|
|
|
|
p->last_entry = e;
|
2014-02-15 15:54:55 +00:00
|
|
|
if (!e)
|
|
|
|
return M_PROPERTY_ERROR;
|
|
|
|
|
2014-11-17 21:43:30 +00:00
|
|
|
bool current = mpctx->playlist->current == e;
|
|
|
|
bool playing = mpctx->playing == e;
|
2014-02-15 15:54:55 +00:00
|
|
|
struct m_sub_property props[] = {
|
|
|
|
{"filename", SUB_PROP_STR(e->filename)},
|
2014-11-17 21:43:30 +00:00
|
|
|
{"current", SUB_PROP_FLAG(1), .unavailable = !current},
|
2014-11-17 21:07:50 +00:00
|
|
|
{"playing", SUB_PROP_FLAG(1), .unavailable = !playing},
|
2015-07-10 19:22:35 +00:00
|
|
|
{"title", SUB_PROP_STR(e->title), .unavailable = !e->title},
|
2014-02-15 15:54:55 +00:00
|
|
|
{0}
|
|
|
|
};
|
|
|
|
|
|
|
|
return m_property_read_sub(props, action, arg);
|
2013-06-28 20:16:29 +00:00
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_playlist(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2013-05-15 00:17:47 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
MPContext *mpctx = ctx;
|
2014-02-15 15:54:55 +00:00
|
|
|
if (action == M_PROPERTY_PRINT) {
|
2017-01-26 17:24:53 +00:00
|
|
|
struct playlist *pl = mpctx->playlist;
|
2013-05-15 00:17:47 +00:00
|
|
|
char *res = talloc_strdup(NULL, "");
|
|
|
|
|
2017-01-26 17:24:53 +00:00
|
|
|
for (struct playlist_entry *e = pl->first; e; e = e->next)
|
2013-05-15 00:17:47 +00:00
|
|
|
{
|
2014-12-27 20:19:52 +00:00
|
|
|
char *p = e->filename;
|
|
|
|
if (!mp_is_url(bstr0(p))) {
|
|
|
|
char *s = mp_basename(e->filename);
|
|
|
|
if (s[0])
|
|
|
|
p = s;
|
|
|
|
}
|
2017-01-26 17:24:53 +00:00
|
|
|
const char *m = pl->current == e ? list_current : list_normal;
|
2016-05-03 20:41:53 +00:00
|
|
|
res = talloc_asprintf_append(res, "%s%s\n", m, p);
|
2013-05-15 00:17:47 +00:00
|
|
|
}
|
|
|
|
|
2017-01-26 17:24:53 +00:00
|
|
|
*(char **)arg =
|
|
|
|
cut_osd_list(mpctx, res, playlist_entry_to_index(pl, pl->current));
|
2013-05-15 00:17:47 +00:00
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
2016-08-19 13:13:54 +00:00
|
|
|
|
|
|
|
struct get_playlist_ctx p = { .mpctx = mpctx };
|
2014-02-15 15:54:55 +00:00
|
|
|
return m_property_read_list(action, arg, playlist_entry_count(mpctx->playlist),
|
2016-08-19 13:13:54 +00:00
|
|
|
get_playlist_entry, &p);
|
2013-05-15 00:17:47 +00:00
|
|
|
}
|
|
|
|
|
2013-08-03 11:41:38 +00:00
|
|
|
static char *print_obj_osd_list(struct m_obj_settings *list)
|
|
|
|
{
|
|
|
|
char *res = NULL;
|
|
|
|
for (int n = 0; list && list[n].name; n++) {
|
|
|
|
res = talloc_asprintf_append(res, "%s [", list[n].name);
|
|
|
|
for (int i = 0; list[n].attribs && list[n].attribs[i]; i += 2) {
|
|
|
|
res = talloc_asprintf_append(res, "%s%s=%s", i > 0 ? " " : "",
|
|
|
|
list[n].attribs[i],
|
|
|
|
list[n].attribs[i + 1]);
|
|
|
|
}
|
2017-03-25 16:07:40 +00:00
|
|
|
res = talloc_asprintf_append(res, "]");
|
|
|
|
if (!list[n].enabled)
|
|
|
|
res = talloc_strdup_append(res, " (disabled)");
|
|
|
|
res = talloc_strdup_append(res, "\n");
|
2013-08-03 11:41:38 +00:00
|
|
|
}
|
|
|
|
if (!res)
|
|
|
|
res = talloc_strdup(NULL, "(empty)");
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int property_filter(struct m_property *prop, int action, void *arg,
|
2013-08-03 11:41:38 +00:00
|
|
|
MPContext *mpctx, enum stream_type mt)
|
|
|
|
{
|
|
|
|
switch (action) {
|
|
|
|
case M_PROPERTY_PRINT: {
|
|
|
|
struct m_config_option *opt = m_config_get_co(mpctx->mconfig,
|
|
|
|
bstr0(prop->name));
|
|
|
|
*(char **)arg = print_obj_osd_list(*(struct m_obj_settings **)opt->data);
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
|
|
|
case M_PROPERTY_SET:
|
|
|
|
return set_filters(mpctx, mt, *(struct m_obj_settings **)arg) >= 0
|
|
|
|
? M_PROPERTY_OK : M_PROPERTY_ERROR;
|
|
|
|
}
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return mp_property_generic_option(mpctx, prop, action, arg);
|
2013-08-03 11:41:38 +00:00
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_vf(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2013-08-03 11:41:38 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return property_filter(prop, action, arg, ctx, STREAM_VIDEO);
|
2013-08-03 11:41:38 +00:00
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_af(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2013-08-03 11:41:38 +00:00
|
|
|
{
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return property_filter(prop, action, arg, ctx, STREAM_AUDIO);
|
2013-08-03 11:41:38 +00:00
|
|
|
}
|
|
|
|
|
2014-11-17 23:09:42 +00:00
|
|
|
static int mp_property_ab_loop(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
2014-11-18 19:28:54 +00:00
|
|
|
struct MPContext *mpctx = ctx;
|
|
|
|
struct MPOpts *opts = mpctx->opts;
|
2014-11-17 23:09:42 +00:00
|
|
|
if (action == M_PROPERTY_KEY_ACTION) {
|
|
|
|
double val;
|
|
|
|
if (mp_property_generic_option(mpctx, prop, M_PROPERTY_GET, &val) < 1)
|
|
|
|
return M_PROPERTY_ERROR;
|
|
|
|
|
|
|
|
return property_time(action, arg, val);
|
|
|
|
}
|
2014-11-18 19:28:54 +00:00
|
|
|
int r = mp_property_generic_option(mpctx, prop, action, arg);
|
|
|
|
if (r > 0 && action == M_PROPERTY_SET) {
|
2016-08-18 18:40:23 +00:00
|
|
|
mpctx->ab_loop_clip = mpctx->playback_pts < opts->ab_loop[1];
|
2014-11-18 19:28:54 +00:00
|
|
|
if (strcmp(prop->name, "ab-loop-b") == 0) {
|
2016-08-18 18:40:23 +00:00
|
|
|
if (opts->ab_loop[1] != MP_NOPTS_VALUE &&
|
|
|
|
mpctx->playback_pts <= opts->ab_loop[1])
|
|
|
|
mpctx->ab_loop_clip = true;
|
2014-11-18 19:28:54 +00:00
|
|
|
}
|
|
|
|
// Update if visible
|
|
|
|
set_osd_bar_chapters(mpctx, OSD_BAR_SEEK);
|
2016-09-16 12:24:15 +00:00
|
|
|
mp_wakeup_core(mpctx);
|
2014-11-18 19:28:54 +00:00
|
|
|
}
|
|
|
|
return r;
|
2014-11-17 23:09:42 +00:00
|
|
|
}
|
|
|
|
|
2014-12-12 00:00:58 +00:00
|
|
|
static int mp_property_packet_bitrate(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
2015-04-20 18:52:16 +00:00
|
|
|
int type = (uintptr_t)prop->priv & ~0x100;
|
|
|
|
bool old = (uintptr_t)prop->priv & 0x100;
|
2014-12-12 00:00:58 +00:00
|
|
|
|
2015-10-23 12:58:01 +00:00
|
|
|
struct demuxer *demuxer = NULL;
|
|
|
|
if (mpctx->current_track[0][type])
|
|
|
|
demuxer = mpctx->current_track[0][type]->demuxer;
|
|
|
|
if (!demuxer)
|
|
|
|
demuxer = mpctx->demuxer;
|
|
|
|
if (!demuxer)
|
2014-12-12 00:00:58 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
|
|
|
|
|
|
|
double r[STREAM_TYPE_COUNT];
|
2015-10-23 12:58:01 +00:00
|
|
|
if (demux_control(demuxer, DEMUXER_CTRL_GET_BITRATE_STATS, &r) < 1)
|
2014-12-12 00:00:58 +00:00
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
2015-10-23 12:53:19 +00:00
|
|
|
if (r[type] < 0)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
2014-12-12 00:00:58 +00:00
|
|
|
|
2015-04-20 18:52:16 +00:00
|
|
|
// r[type] is in bytes/second -> bits
|
|
|
|
double rate = r[type] * 8;
|
|
|
|
|
|
|
|
// Same story, but used kilobits for some reason.
|
|
|
|
if (old)
|
|
|
|
return m_property_int64_ro(action, arg, rate / 1000.0 + 0.5);
|
|
|
|
|
|
|
|
if (action == M_PROPERTY_PRINT) {
|
|
|
|
rate /= 1000;
|
|
|
|
if (rate < 1000) {
|
|
|
|
*(char **)arg = talloc_asprintf(NULL, "%d kbps", (int)rate);
|
|
|
|
} else {
|
|
|
|
*(char **)arg = talloc_asprintf(NULL, "%.3f mbps", rate / 1000.0);
|
|
|
|
}
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
|
|
|
return m_property_int64_ro(action, arg, rate);
|
2014-12-12 00:00:58 +00:00
|
|
|
}
|
|
|
|
|
2015-03-24 21:00:01 +00:00
|
|
|
static int mp_property_cwd(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
switch (action) {
|
|
|
|
case M_PROPERTY_GET: {
|
|
|
|
char *cwd = mp_getcwd(NULL);
|
|
|
|
if (!cwd)
|
|
|
|
return M_PROPERTY_ERROR;
|
|
|
|
*(char **)arg = cwd;
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
|
|
|
case M_PROPERTY_GET_TYPE:
|
|
|
|
*(struct m_option *)arg = (struct m_option){.type = CONF_TYPE_STRING};
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
|
|
|
return M_PROPERTY_NOT_IMPLEMENTED;
|
|
|
|
}
|
|
|
|
|
2017-02-07 16:05:17 +00:00
|
|
|
static int mp_property_record_file(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
struct MPContext *mpctx = ctx;
|
|
|
|
struct MPOpts *opts = mpctx->opts;
|
|
|
|
if (action == M_PROPERTY_SET) {
|
|
|
|
char *new = *(char **)arg;
|
|
|
|
if (!bstr_equals(bstr0(new), bstr0(opts->record_file))) {
|
|
|
|
talloc_free(opts->record_file);
|
|
|
|
opts->record_file = talloc_strdup(NULL, new);
|
|
|
|
open_recorder(mpctx, false);
|
|
|
|
// open_recorder() unsets it on failure.
|
|
|
|
if (new && !opts->record_file)
|
|
|
|
return M_PROPERTY_ERROR;
|
|
|
|
}
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
|
|
|
return mp_property_generic_option(mpctx, prop, action, arg);
|
|
|
|
}
|
|
|
|
|
2015-05-23 13:26:55 +00:00
|
|
|
static int mp_property_protocols(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
switch (action) {
|
|
|
|
case M_PROPERTY_GET:
|
|
|
|
*(char ***)arg = stream_get_proto_list();
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
case M_PROPERTY_GET_TYPE:
|
|
|
|
*(struct m_option *)arg = (struct m_option){.type = CONF_TYPE_STRING_LIST};
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
|
|
|
return M_PROPERTY_NOT_IMPLEMENTED;
|
|
|
|
}
|
|
|
|
|
2016-02-29 19:57:31 +00:00
|
|
|
static int get_decoder_entry(int item, int action, void *arg, void *ctx)
|
|
|
|
{
|
|
|
|
struct mp_decoder_list *codecs = ctx;
|
|
|
|
struct mp_decoder_entry *c = &codecs->entries[item];
|
|
|
|
|
|
|
|
struct m_sub_property props[] = {
|
|
|
|
{"family", SUB_PROP_STR(c->family)},
|
|
|
|
{"codec", SUB_PROP_STR(c->codec)},
|
2016-03-01 20:46:49 +00:00
|
|
|
{"driver" , SUB_PROP_STR(c->decoder)},
|
2016-02-29 19:57:31 +00:00
|
|
|
{"description", SUB_PROP_STR(c->desc)},
|
|
|
|
{0}
|
|
|
|
};
|
|
|
|
|
|
|
|
return m_property_read_sub(props, action, arg);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int mp_property_decoders(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
struct mp_decoder_list *codecs = talloc_zero(NULL, struct mp_decoder_list);
|
|
|
|
struct mp_decoder_list *v = talloc_steal(codecs, video_decoder_list());
|
|
|
|
struct mp_decoder_list *a = talloc_steal(codecs, audio_decoder_list());
|
|
|
|
mp_append_decoders(codecs, v);
|
|
|
|
mp_append_decoders(codecs, a);
|
|
|
|
int r = m_property_read_list(action, arg, codecs->num_entries,
|
|
|
|
get_decoder_entry, codecs);
|
|
|
|
talloc_free(codecs);
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2016-03-01 20:46:49 +00:00
|
|
|
static int mp_property_encoders(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
struct mp_decoder_list *codecs = talloc_zero(NULL, struct mp_decoder_list);
|
|
|
|
mp_add_lavc_encoders(codecs);
|
|
|
|
int r = m_property_read_list(action, arg, codecs->num_entries,
|
|
|
|
get_decoder_entry, codecs);
|
|
|
|
talloc_free(codecs);
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2014-11-02 16:44:24 +00:00
|
|
|
static int mp_property_version(void *ctx, struct m_property *prop,
|
2014-11-17 23:09:42 +00:00
|
|
|
int action, void *arg)
|
2014-11-02 16:44:24 +00:00
|
|
|
{
|
|
|
|
return m_property_strdup_ro(action, arg, mpv_version);
|
|
|
|
}
|
|
|
|
|
2014-11-13 15:18:40 +00:00
|
|
|
static int mp_property_configuration(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
return m_property_strdup_ro(action, arg, CONFIGURATION);
|
|
|
|
}
|
|
|
|
|
2016-02-29 19:59:20 +00:00
|
|
|
static int mp_property_ffmpeg(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
return m_property_strdup_ro(action, arg, av_version_info());
|
|
|
|
}
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
static int mp_property_alias(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2013-04-14 22:22:51 +00:00
|
|
|
{
|
|
|
|
const char *real_property = prop->priv;
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
return mp_property_do(real_property, action, arg, ctx);
|
2013-04-14 22:22:51 +00:00
|
|
|
}
|
|
|
|
|
2015-05-22 18:01:12 +00:00
|
|
|
static int mp_property_deprecated_alias(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
|
|
|
struct command_ctx *cmd = mpctx->command_ctx;
|
|
|
|
const char *real_property = prop->priv;
|
2016-11-23 16:30:46 +00:00
|
|
|
for (int n = 0; n < cmd->num_warned_deprecated; n++) {
|
|
|
|
if (strcmp(cmd->warned_deprecated[n], prop->name) == 0)
|
|
|
|
goto done;
|
2015-05-22 18:01:12 +00:00
|
|
|
}
|
2016-11-23 16:30:46 +00:00
|
|
|
MP_WARN(mpctx, "Warning: property '%s' was replaced with '%s' and "
|
|
|
|
"might be removed in the future.\n", prop->name, real_property);
|
|
|
|
MP_TARRAY_APPEND(cmd, cmd->warned_deprecated, cmd->num_warned_deprecated,
|
|
|
|
(char *)prop->name);
|
|
|
|
|
|
|
|
done:
|
2015-05-22 18:01:12 +00:00
|
|
|
return mp_property_do(real_property, action, arg, ctx);
|
|
|
|
}
|
|
|
|
|
2017-07-02 14:26:41 +00:00
|
|
|
static int mp_property_shitfuck(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
|
|
|
int flags = M_SETOPT_RUNTIME;
|
|
|
|
const char *rname = prop->priv;
|
|
|
|
|
|
|
|
MP_WARN(mpctx, "Do not use %s, use %s, bug reports will be ignored.\n",
|
|
|
|
prop->name, rname);
|
|
|
|
|
|
|
|
struct m_config_option *co = m_config_get_co_raw(mpctx->mconfig, bstr0(rname));
|
|
|
|
if (!co)
|
|
|
|
return M_PROPERTY_UNKNOWN;
|
|
|
|
|
|
|
|
switch (action) {
|
|
|
|
case M_PROPERTY_GET_TYPE:
|
|
|
|
*(struct m_option *)arg = *(co->opt);
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
case M_PROPERTY_GET:
|
|
|
|
if (!co->data)
|
|
|
|
return M_PROPERTY_NOT_IMPLEMENTED;
|
|
|
|
m_option_copy(co->opt, arg, co->data);
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
case M_PROPERTY_SET:
|
|
|
|
if (m_config_set_option_raw_direct(mpctx->mconfig, co, arg, flags) < 0)
|
|
|
|
return M_PROPERTY_ERROR;
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
|
|
|
return M_PROPERTY_NOT_IMPLEMENTED;
|
|
|
|
}
|
|
|
|
|
2014-10-15 20:39:33 +00:00
|
|
|
static int access_options(struct m_property_action_arg *ka, bool local,
|
|
|
|
MPContext *mpctx)
|
2013-07-25 21:36:01 +00:00
|
|
|
{
|
|
|
|
struct m_config_option *opt = m_config_get_co(mpctx->mconfig,
|
|
|
|
bstr0(ka->key));
|
|
|
|
if (!opt)
|
|
|
|
return M_PROPERTY_UNKNOWN;
|
2013-07-27 19:24:44 +00:00
|
|
|
if (!opt->data)
|
|
|
|
return M_PROPERTY_UNAVAILABLE;
|
2013-07-25 21:36:01 +00:00
|
|
|
|
|
|
|
switch (ka->action) {
|
|
|
|
case M_PROPERTY_GET:
|
|
|
|
m_option_copy(opt->opt, ka->arg, opt->data);
|
|
|
|
return M_PROPERTY_OK;
|
2014-05-18 16:57:02 +00:00
|
|
|
case M_PROPERTY_SET: {
|
2014-10-15 20:39:33 +00:00
|
|
|
if (local && !mpctx->playing)
|
|
|
|
return M_PROPERTY_ERROR;
|
|
|
|
int flags = M_SETOPT_RUNTIME | (local ? M_SETOPT_BACKUP : 0);
|
|
|
|
int r = m_config_set_option_raw(mpctx->mconfig, opt, ka->arg, flags);
|
2016-09-16 12:24:15 +00:00
|
|
|
mp_wakeup_core(mpctx);
|
2014-05-18 16:57:02 +00:00
|
|
|
return r < 0 ? M_PROPERTY_ERROR : M_PROPERTY_OK;
|
|
|
|
}
|
2013-07-25 21:36:01 +00:00
|
|
|
case M_PROPERTY_GET_TYPE:
|
|
|
|
*(struct m_option *)ka->arg = *opt->opt;
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
2014-02-24 20:18:53 +00:00
|
|
|
return M_PROPERTY_NOT_IMPLEMENTED;
|
|
|
|
}
|
2013-07-25 21:36:01 +00:00
|
|
|
|
2014-10-15 20:39:33 +00:00
|
|
|
static int access_option_list(int action, void *arg, bool local, MPContext *mpctx)
|
2014-02-24 20:18:53 +00:00
|
|
|
{
|
|
|
|
switch (action) {
|
|
|
|
case M_PROPERTY_GET_TYPE:
|
|
|
|
*(struct m_option *)arg = (struct m_option){.type = CONF_TYPE_STRING_LIST};
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
case M_PROPERTY_GET:
|
|
|
|
*(char ***)arg = m_config_list_options(NULL, mpctx->mconfig);
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
case M_PROPERTY_KEY_ACTION:
|
2014-10-15 20:39:33 +00:00
|
|
|
return access_options(arg, local, mpctx);
|
2014-02-24 20:18:53 +00:00
|
|
|
}
|
2013-07-25 21:36:01 +00:00
|
|
|
return M_PROPERTY_NOT_IMPLEMENTED;
|
|
|
|
}
|
|
|
|
|
2014-10-15 20:39:33 +00:00
|
|
|
|
|
|
|
static int mp_property_options(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
|
|
|
return access_option_list(action, arg, false, mpctx);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int mp_property_local_options(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
|
|
|
return access_option_list(action, arg, true, mpctx);
|
|
|
|
}
|
|
|
|
|
2014-11-13 16:27:31 +00:00
|
|
|
static int mp_property_option_info(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
2014-11-07 15:33:41 +00:00
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
|
|
|
switch (action) {
|
|
|
|
case M_PROPERTY_KEY_ACTION: {
|
|
|
|
struct m_property_action_arg *ka = arg;
|
|
|
|
bstr key;
|
|
|
|
char *rem;
|
|
|
|
m_property_split_path(ka->key, &key, &rem);
|
|
|
|
struct m_config_option *co = m_config_get_co(mpctx->mconfig, key);
|
|
|
|
if (!co)
|
|
|
|
return M_PROPERTY_UNKNOWN;
|
|
|
|
|
2014-11-13 17:00:07 +00:00
|
|
|
union m_option_value def = {0};
|
|
|
|
if (co->default_data)
|
|
|
|
memcpy(&def, co->default_data, co->opt->type->size);
|
|
|
|
|
|
|
|
const struct m_option *opt = co->opt;
|
|
|
|
bool has_minmax =
|
|
|
|
opt->type == &m_option_type_int ||
|
|
|
|
opt->type == &m_option_type_int64 ||
|
|
|
|
opt->type == &m_option_type_float ||
|
|
|
|
opt->type == &m_option_type_double;
|
|
|
|
char **choices = NULL;
|
|
|
|
|
|
|
|
if (opt->type == &m_option_type_choice) {
|
|
|
|
has_minmax = true;
|
|
|
|
struct m_opt_choice_alternatives *alt = opt->priv;
|
|
|
|
int num = 0;
|
|
|
|
for ( ; alt->name; alt++)
|
|
|
|
MP_TARRAY_APPEND(NULL, choices, num, alt->name);
|
|
|
|
MP_TARRAY_APPEND(NULL, choices, num, NULL);
|
2014-11-14 13:52:51 +00:00
|
|
|
}
|
|
|
|
if (opt->type == &m_option_type_obj_settings_list) {
|
|
|
|
struct m_obj_list *objs = opt->priv;
|
|
|
|
int num = 0;
|
|
|
|
for (int n = 0; ; n++) {
|
|
|
|
struct m_obj_desc desc = {0};
|
|
|
|
if (!objs->get_desc(&desc, n))
|
|
|
|
break;
|
|
|
|
MP_TARRAY_APPEND(NULL, choices, num, (char *)desc.name);
|
|
|
|
}
|
|
|
|
MP_TARRAY_APPEND(NULL, choices, num, NULL);
|
2014-11-13 17:00:07 +00:00
|
|
|
}
|
|
|
|
|
2014-11-07 15:33:41 +00:00
|
|
|
struct m_sub_property props[] = {
|
2014-11-13 17:00:07 +00:00
|
|
|
{"name", SUB_PROP_STR(co->name)},
|
|
|
|
{"type", SUB_PROP_STR(opt->type->name)},
|
2014-11-07 15:33:41 +00:00
|
|
|
{"set-from-commandline", SUB_PROP_FLAG(co->is_set_from_cmdline)},
|
2015-07-23 20:59:04 +00:00
|
|
|
{"set-locally", SUB_PROP_FLAG(co->is_set_locally)},
|
2014-11-13 17:00:07 +00:00
|
|
|
{"default-value", *opt, def},
|
|
|
|
{"min", SUB_PROP_DOUBLE(opt->min),
|
|
|
|
.unavailable = !(has_minmax && (opt->flags & M_OPT_MIN))},
|
|
|
|
{"max", SUB_PROP_DOUBLE(opt->max),
|
|
|
|
.unavailable = !(has_minmax && (opt->flags & M_OPT_MAX))},
|
|
|
|
{"choices", .type = {.type = CONF_TYPE_STRING_LIST},
|
|
|
|
.value = {.string_list = choices}, .unavailable = !choices},
|
2014-11-07 15:33:41 +00:00
|
|
|
{0}
|
|
|
|
};
|
|
|
|
|
2014-11-08 09:19:17 +00:00
|
|
|
struct m_property_action_arg next_ka = *ka;
|
|
|
|
next_ka.key = rem;
|
2014-11-13 17:00:07 +00:00
|
|
|
int r = m_property_read_sub(props, M_PROPERTY_KEY_ACTION, &next_ka);
|
|
|
|
talloc_free(choices);
|
|
|
|
return r;
|
2014-11-07 15:33:41 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return M_PROPERTY_NOT_IMPLEMENTED;
|
|
|
|
}
|
|
|
|
|
2014-08-01 23:35:32 +00:00
|
|
|
static int mp_property_list(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
2016-09-01 18:00:43 +00:00
|
|
|
struct MPContext *mpctx = ctx;
|
|
|
|
struct command_ctx *cmd = mpctx->command_ctx;
|
|
|
|
|
2014-08-01 23:35:32 +00:00
|
|
|
switch (action) {
|
|
|
|
case M_PROPERTY_GET_TYPE:
|
|
|
|
*(struct m_option *)arg = (struct m_option){.type = CONF_TYPE_STRING_LIST};
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
case M_PROPERTY_GET: {
|
|
|
|
char **list = NULL;
|
|
|
|
int num = 0;
|
2016-09-01 18:00:43 +00:00
|
|
|
for (int n = 0; cmd->properties[n].name; n++) {
|
2014-08-01 23:35:32 +00:00
|
|
|
MP_TARRAY_APPEND(NULL, list, num,
|
2016-09-01 18:00:43 +00:00
|
|
|
talloc_strdup(NULL, cmd->properties[n].name));
|
2014-08-01 23:35:32 +00:00
|
|
|
}
|
|
|
|
MP_TARRAY_APPEND(NULL, list, num, NULL);
|
|
|
|
*(char ***)arg = list;
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return M_PROPERTY_NOT_IMPLEMENTED;
|
|
|
|
}
|
|
|
|
|
2016-08-28 17:42:03 +00:00
|
|
|
static int mp_profile_list(void *ctx, struct m_property *prop,
|
|
|
|
int action, void *arg)
|
|
|
|
{
|
|
|
|
MPContext *mpctx = ctx;
|
|
|
|
switch (action) {
|
|
|
|
case M_PROPERTY_GET_TYPE:
|
|
|
|
*(struct m_option *)arg = (struct m_option){.type = CONF_TYPE_NODE};
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
case M_PROPERTY_GET: {
|
|
|
|
*(struct mpv_node *)arg = m_config_get_profiles(mpctx->mconfig);
|
|
|
|
return M_PROPERTY_OK;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return M_PROPERTY_NOT_IMPLEMENTED;
|
|
|
|
}
|
|
|
|
|
2013-04-14 22:22:51 +00:00
|
|
|
// Redirect a property name to another
|
|
|
|
#define M_PROPERTY_ALIAS(name, real_property) \
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
{(name), mp_property_alias, .priv = (real_property)}
|
2014-02-15 15:42:48 +00:00
|
|
|
|
2015-05-22 18:01:12 +00:00
|
|
|
#define M_PROPERTY_DEPRECATED_ALIAS(name, real_property) \
|
|
|
|
{(name), mp_property_deprecated_alias, .priv = (real_property)}
|
|
|
|
|
2016-09-01 18:00:43 +00:00
|
|
|
// Base list of properties. This does not include option-mapped properties.
|
|
|
|
static const struct m_property mp_properties_base[] = {
|
2007-02-21 00:49:24 +00:00
|
|
|
// General
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
{"speed", mp_property_playback_speed},
|
2015-08-10 16:40:16 +00:00
|
|
|
{"audio-speed-correction", mp_property_av_speed_correction, .priv = "a"},
|
|
|
|
{"video-speed-correction", mp_property_av_speed_correction, .priv = "v"},
|
2015-08-10 16:43:25 +00:00
|
|
|
{"display-sync-active", mp_property_display_sync_active},
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
{"filename", mp_property_filename},
|
command: add a mechanism to allow scripts to intercept file loads
A vague idea to get something similar what libquvi did.
Undocumented because it might change a lot, or even be removed. To give
an idea what it does, a Lua script could do the following:
-- type ID priority
mp.commandv("hook_add", "on_load", 0, 0)
mp.register_script_message("hook_run", function(param, param2)
-- param is "0", the user-chosen ID from the hook_add command
-- param2 is the magic value that has to be passed to finish
-- the hook
mp.resume_all()
-- do something, maybe set options that are reset on end:
mp.set_property("file-local-options/name", "value")
-- or change the URL that's being opened:
local url = mp.get_property("stream-open-filename")
mp.set_property("stream-open-filename", url .. ".png")
-- let the player (or the next script) continue
mp.commandv("hook_ack", param2)
end)
2014-10-15 21:09:53 +00:00
|
|
|
{"stream-open-filename", mp_property_stream_open_filename},
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
{"file-size", mp_property_file_size},
|
|
|
|
{"path", mp_property_path},
|
|
|
|
{"media-title", mp_property_media_title},
|
|
|
|
{"stream-path", mp_property_stream_path},
|
2016-09-01 18:01:02 +00:00
|
|
|
{"current-demuxer", mp_property_demuxer},
|
2015-01-23 14:59:06 +00:00
|
|
|
{"file-format", mp_property_file_format},
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
{"stream-pos", mp_property_stream_pos},
|
|
|
|
{"stream-end", mp_property_stream_end},
|
2015-05-22 18:02:47 +00:00
|
|
|
{"duration", mp_property_duration},
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
{"avsync", mp_property_avsync},
|
|
|
|
{"total-avsync-change", mp_property_total_avsync_change},
|
2015-10-30 13:05:41 +00:00
|
|
|
{"mistimed-frame-count", mp_property_mistimed_frame_count},
|
2015-11-13 21:48:32 +00:00
|
|
|
{"vsync-ratio", mp_property_vsync_ratio},
|
2017-01-20 16:01:29 +00:00
|
|
|
{"decoder-frame-drop-count", mp_property_frame_drop_dec},
|
|
|
|
{"frame-drop-count", mp_property_frame_drop_vo},
|
2015-11-13 21:41:41 +00:00
|
|
|
{"vo-delayed-frame-count", mp_property_vo_delayed_frame_count},
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
{"percent-pos", mp_property_percent_pos},
|
|
|
|
{"time-start", mp_property_time_start},
|
|
|
|
{"time-pos", mp_property_time_pos},
|
|
|
|
{"time-remaining", mp_property_remaining},
|
2016-09-19 17:11:14 +00:00
|
|
|
{"audio-pts", mp_property_audio_pts},
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
{"playtime-remaining", mp_property_playtime_remaining},
|
2014-06-29 17:27:46 +00:00
|
|
|
{"playback-time", mp_property_playback_time},
|
2014-07-14 23:49:02 +00:00
|
|
|
{"disc-title", mp_property_disc_title},
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
{"chapter", mp_property_chapter},
|
|
|
|
{"edition", mp_property_edition},
|
2014-07-14 23:49:02 +00:00
|
|
|
{"disc-titles", mp_property_disc_titles},
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
{"chapters", mp_property_chapters},
|
|
|
|
{"editions", mp_property_editions},
|
2014-07-14 23:49:02 +00:00
|
|
|
{"angle", mp_property_angle},
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
{"metadata", mp_property_metadata},
|
2014-12-29 22:03:39 +00:00
|
|
|
{"filtered-metadata", mp_property_filtered_metadata},
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
{"chapter-metadata", mp_property_chapter_metadata},
|
2015-09-11 21:04:02 +00:00
|
|
|
{"vf-metadata", mp_property_filter_metadata, .priv = "vf"},
|
|
|
|
{"af-metadata", mp_property_filter_metadata, .priv = "af"},
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
{"pause", mp_property_pause},
|
|
|
|
{"core-idle", mp_property_core_idle},
|
|
|
|
{"eof-reached", mp_property_eof_reached},
|
2014-08-07 22:13:27 +00:00
|
|
|
{"seeking", mp_property_seeking},
|
2014-10-21 11:32:30 +00:00
|
|
|
{"playback-abort", mp_property_playback_abort},
|
2016-09-02 07:42:19 +00:00
|
|
|
{"cache-percent", mp_property_cache},
|
2014-07-01 22:14:30 +00:00
|
|
|
{"cache-free", mp_property_cache_free},
|
|
|
|
{"cache-used", mp_property_cache_used},
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
{"cache-size", mp_property_cache_size},
|
2014-07-31 02:25:39 +00:00
|
|
|
{"cache-idle", mp_property_cache_idle},
|
2016-03-20 18:48:55 +00:00
|
|
|
{"cache-speed", mp_property_cache_speed},
|
2014-08-28 15:48:31 +00:00
|
|
|
{"demuxer-cache-duration", mp_property_demuxer_cache_duration},
|
2015-04-20 21:47:13 +00:00
|
|
|
{"demuxer-cache-time", mp_property_demuxer_cache_time},
|
2014-08-28 15:48:31 +00:00
|
|
|
{"demuxer-cache-idle", mp_property_demuxer_cache_idle},
|
2017-03-10 00:44:55 +00:00
|
|
|
{"demuxer-start-time", mp_property_demuxer_start_time},
|
2014-10-07 20:07:07 +00:00
|
|
|
{"cache-buffering-state", mp_property_cache_buffering},
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
{"paused-for-cache", mp_property_paused_for_cache},
|
2017-03-24 14:31:01 +00:00
|
|
|
{"demuxer-via-network", mp_property_demuxer_is_network},
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
{"clock", mp_property_clock},
|
|
|
|
{"seekable", mp_property_seekable},
|
2015-01-26 12:46:33 +00:00
|
|
|
{"partially-seekable", mp_property_partially_seekable},
|
2016-09-01 18:01:02 +00:00
|
|
|
{"idle-active", mp_property_idle},
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
|
|
|
|
{"chapter-list", mp_property_list_chapters},
|
|
|
|
{"track-list", property_list_tracks},
|
|
|
|
{"edition-list", property_list_editions},
|
2014-12-13 19:25:31 +00:00
|
|
|
{"disc-title-list", mp_property_list_disc_titles},
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
|
|
|
|
{"playlist", mp_property_playlist},
|
|
|
|
{"playlist-pos", mp_property_playlist_pos},
|
2016-05-26 16:43:49 +00:00
|
|
|
{"playlist-pos-1", mp_property_playlist_pos_1},
|
2014-02-15 15:54:55 +00:00
|
|
|
M_PROPERTY_ALIAS("playlist-count", "playlist/count"),
|
2013-05-15 00:17:47 +00:00
|
|
|
|
2007-02-21 00:49:24 +00:00
|
|
|
// Audio
|
2016-01-26 14:12:42 +00:00
|
|
|
{"mixer-active", mp_property_mixer_active},
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
{"volume", mp_property_volume},
|
2014-08-29 07:48:45 +00:00
|
|
|
{"mute", mp_property_mute},
|
2016-07-09 16:31:18 +00:00
|
|
|
{"ao-volume", mp_property_ao_volume},
|
|
|
|
{"ao-mute", mp_property_ao_mute},
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
{"audio-delay", mp_property_audio_delay},
|
2015-05-22 18:05:04 +00:00
|
|
|
{"audio-codec-name", mp_property_audio_codec_name},
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
{"audio-codec", mp_property_audio_codec},
|
2015-05-22 18:23:47 +00:00
|
|
|
{"audio-params", mp_property_audio_params},
|
|
|
|
{"audio-out-params", mp_property_audio_out_params},
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
{"aid", mp_property_audio},
|
|
|
|
{"balance", mp_property_balance},
|
2014-10-27 11:16:32 +00:00
|
|
|
{"audio-device", mp_property_audio_device},
|
2014-10-10 17:46:21 +00:00
|
|
|
{"audio-device-list", mp_property_audio_devices},
|
2015-02-02 16:35:31 +00:00
|
|
|
{"current-ao", mp_property_ao},
|
2007-02-21 00:49:24 +00:00
|
|
|
|
|
|
|
// Video
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
{"fullscreen", mp_property_fullscreen},
|
2016-05-05 05:56:21 +00:00
|
|
|
{"taskbar-progress", mp_property_taskbar_progress},
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
{"ontop", mp_property_ontop},
|
|
|
|
{"border", mp_property_border},
|
2015-01-16 22:38:47 +00:00
|
|
|
{"on-all-workspaces", mp_property_all_workspaces},
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
{"video-out-params", mp_property_vo_imgparams},
|
2016-09-20 13:40:44 +00:00
|
|
|
{"video-dec-params", mp_property_dec_imgparams},
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
{"video-params", mp_property_vd_imgparams},
|
|
|
|
{"video-format", mp_property_video_format},
|
2015-11-22 17:54:22 +00:00
|
|
|
{"video-frame-info", mp_property_video_frame_info},
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
{"video-codec", mp_property_video_codec},
|
2014-02-15 15:42:48 +00:00
|
|
|
M_PROPERTY_ALIAS("dwidth", "video-out-params/dw"),
|
|
|
|
M_PROPERTY_ALIAS("dheight", "video-out-params/dh"),
|
|
|
|
M_PROPERTY_ALIAS("width", "video-params/w"),
|
|
|
|
M_PROPERTY_ALIAS("height", "video-params/h"),
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
{"window-scale", mp_property_window_scale},
|
2014-10-24 13:34:53 +00:00
|
|
|
{"vo-configured", mp_property_vo_configured},
|
vo_opengl: refactor vo performance subsystem
This replaces `vo-performance` by `vo-passes`, bringing with it a number
of changes and improvements:
1. mpv users can now introspect the vo_opengl passes, which is something
that has been requested multiple times.
2. performance data is now measured per-pass, which helps both
development and debugging.
3. since adding more passes is cheap, we can now report information for
more passes (e.g. the blit pass, and the osd pass). Note: we also
switch to nanosecond scale, to be able to measure these passes
better.
4. `--user-shaders` authors can now describe their own passes, helping
users both identify which user shaders are active at any given time
as well as helping shader authors identify performance issues.
5. the timing data per pass is now exported as a full list of samples,
so projects like Argon-/mpv-stats can immediately read out all of the
samples and render a graph without having to manually poll this
option constantly.
Due to gl_timer's design being complicated (directly reading performance
data would block, so we delay the actual read-back until the next _start
command), it's vital not to conflate different passes that might be
doing different things from one frame to another. To accomplish this,
the actual timers are stored as part of the gl_shader_cache's sc_entry,
which makes them unique for that exact shader.
Starting and stopping the time measurement is easy to unify with the
gl_sc architecture, because the existing API already relies on a
"generate, render, reset" flow, so we can just put timer_start and
timer_stop in sc_generate and sc_reset, respectively.
The ugliest thing about this code is that due to the need to keep pass
information relatively stable in between frames, we need to distinguish
between "new" and "redrawn" frames, which bloats the code somewhat and
also feels hacky and vo_opengl-specific. (But then again, this entire
thing is vo_opengl-specific)
2017-06-29 15:00:06 +00:00
|
|
|
{"vo-passes", mp_property_vo_passes},
|
2015-02-02 16:35:31 +00:00
|
|
|
{"current-vo", mp_property_vo},
|
2016-09-01 18:01:02 +00:00
|
|
|
{"container-fps", mp_property_fps},
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
{"estimated-vf-fps", mp_property_vf_fps},
|
|
|
|
{"video-aspect", mp_property_aspect},
|
|
|
|
{"vid", mp_property_video},
|
|
|
|
{"program", mp_property_program},
|
|
|
|
{"hwdec", mp_property_hwdec},
|
2016-05-04 14:55:26 +00:00
|
|
|
{"hwdec-current", mp_property_hwdec_current},
|
|
|
|
{"hwdec-interop", mp_property_hwdec_interop},
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
|
2014-08-19 19:19:38 +00:00
|
|
|
{"estimated-frame-count", mp_property_frame_count},
|
|
|
|
{"estimated-frame-number", mp_property_frame_number},
|
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
{"osd-width", mp_property_osd_w},
|
|
|
|
{"osd-height", mp_property_osd_h},
|
|
|
|
{"osd-par", mp_property_osd_par},
|
2013-09-30 20:25:34 +00:00
|
|
|
|
2014-09-17 22:12:59 +00:00
|
|
|
{"osd-sym-cc", mp_property_osd_sym},
|
2014-09-17 22:49:55 +00:00
|
|
|
{"osd-ass-cc", mp_property_osd_ass},
|
2014-09-17 22:12:59 +00:00
|
|
|
|
2007-02-21 00:49:24 +00:00
|
|
|
// Subs
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
{"sid", mp_property_sub},
|
|
|
|
{"secondary-sid", mp_property_sub2},
|
|
|
|
{"sub-delay", mp_property_sub_delay},
|
2016-09-13 01:17:10 +00:00
|
|
|
{"sub-speed", mp_property_sub_speed},
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
{"sub-pos", mp_property_sub_pos},
|
2016-08-27 19:14:41 +00:00
|
|
|
{"sub-text", mp_property_sub_text},
|
2007-02-21 00:49:24 +00:00
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
{"vf", mp_property_vf},
|
|
|
|
{"af", mp_property_af},
|
|
|
|
|
2014-11-17 23:09:42 +00:00
|
|
|
{"ab-loop-a", mp_property_ab_loop},
|
|
|
|
{"ab-loop-b", mp_property_ab_loop},
|
|
|
|
|
2015-04-20 18:52:16 +00:00
|
|
|
#define PROPERTY_BITRATE(name, old, type) \
|
|
|
|
{name, mp_property_packet_bitrate, (void *)(uintptr_t)((type)|(old?0x100:0))}
|
|
|
|
PROPERTY_BITRATE("packet-video-bitrate", true, STREAM_VIDEO),
|
|
|
|
PROPERTY_BITRATE("packet-audio-bitrate", true, STREAM_AUDIO),
|
|
|
|
PROPERTY_BITRATE("packet-sub-bitrate", true, STREAM_SUB),
|
|
|
|
|
|
|
|
PROPERTY_BITRATE("video-bitrate", false, STREAM_VIDEO),
|
|
|
|
PROPERTY_BITRATE("audio-bitrate", false, STREAM_AUDIO),
|
|
|
|
PROPERTY_BITRATE("sub-bitrate", false, STREAM_SUB),
|
2014-12-12 00:00:58 +00:00
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
#define PROPERTY_TV_COLOR(name, type) \
|
|
|
|
{name, mp_property_tv_color, (void *)(intptr_t)type}
|
|
|
|
PROPERTY_TV_COLOR("tv-brightness", TV_COLOR_BRIGHTNESS),
|
|
|
|
PROPERTY_TV_COLOR("tv-contrast", TV_COLOR_CONTRAST),
|
|
|
|
PROPERTY_TV_COLOR("tv-saturation", TV_COLOR_SATURATION),
|
|
|
|
PROPERTY_TV_COLOR("tv-hue", TV_COLOR_HUE),
|
|
|
|
{"tv-freq", mp_property_tv_freq},
|
|
|
|
{"tv-norm", mp_property_tv_norm},
|
|
|
|
{"tv-scan", mp_property_tv_scan},
|
|
|
|
{"tv-channel", mp_property_tv_channel},
|
|
|
|
{"dvb-channel", mp_property_dvb_channel},
|
2016-01-08 19:19:57 +00:00
|
|
|
{"dvb-channel-name", mp_property_dvb_channel_name},
|
2012-08-09 23:30:53 +00:00
|
|
|
|
2014-10-21 11:41:19 +00:00
|
|
|
{"cursor-autohide", mp_property_cursor_autohide},
|
|
|
|
|
2014-10-21 11:16:48 +00:00
|
|
|
#define TRACK_FF(name, type) \
|
|
|
|
{name, property_switch_track_ff, (void *)(intptr_t)type}
|
|
|
|
TRACK_FF("ff-vid", STREAM_VIDEO),
|
|
|
|
TRACK_FF("ff-aid", STREAM_AUDIO),
|
|
|
|
TRACK_FF("ff-sid", STREAM_SUB),
|
|
|
|
|
2014-11-02 19:48:45 +00:00
|
|
|
{"window-minimized", mp_property_win_minimized},
|
2014-11-06 02:16:32 +00:00
|
|
|
{"display-names", mp_property_display_names},
|
2015-03-10 13:50:56 +00:00
|
|
|
{"display-fps", mp_property_display_fps},
|
2015-11-25 21:07:56 +00:00
|
|
|
{"estimated-display-fps", mp_property_estimated_display_fps},
|
|
|
|
{"vsync-jitter", mp_property_vsync_jitter},
|
2016-09-08 16:53:20 +00:00
|
|
|
{"framedrop", mp_property_framedrop},
|
2014-11-02 19:48:45 +00:00
|
|
|
|
2015-03-24 21:00:01 +00:00
|
|
|
{"working-directory", mp_property_cwd},
|
|
|
|
|
2017-02-07 16:05:17 +00:00
|
|
|
{"record-file", mp_property_record_file},
|
|
|
|
|
2015-05-23 13:26:55 +00:00
|
|
|
{"protocol-list", mp_property_protocols},
|
2016-02-29 19:57:31 +00:00
|
|
|
{"decoder-list", mp_property_decoders},
|
2016-03-01 20:46:49 +00:00
|
|
|
{"encoder-list", mp_property_encoders},
|
2015-05-23 13:26:55 +00:00
|
|
|
|
2014-11-02 16:44:24 +00:00
|
|
|
{"mpv-version", mp_property_version},
|
2014-11-13 15:18:40 +00:00
|
|
|
{"mpv-configuration", mp_property_configuration},
|
2016-02-29 19:59:20 +00:00
|
|
|
{"ffmpeg-version", mp_property_ffmpeg},
|
2014-11-02 16:44:24 +00:00
|
|
|
|
command: redo the property type
Instead of absuing m_option to store the property list, introduce a
separate type for properties. m_option is still used to handle data
types. The property declaration itself now never contains the option
type, and instead it's always queried with M_PROPERTY_GET_TYPE. (This
was already done with some properties, now all properties use it.)
This also fixes that the function signatures did not match the function
type with which these functions were called. They were called as:
int (*)(const m_option_t*, int, void*, void*)
but the actual function signatures were:
int (*)(m_option_t*, int, void*, MPContext *)
Two arguments were mismatched.
This adds one line per property implementation. With additional the
reordering of the parameters, this makes most of the changes in this
commit.
2014-06-13 00:11:39 +00:00
|
|
|
{"options", mp_property_options},
|
2014-10-15 20:39:33 +00:00
|
|
|
{"file-local-options", mp_property_local_options},
|
2014-11-13 16:27:31 +00:00
|
|
|
{"option-info", mp_property_option_info},
|
2014-08-01 23:35:32 +00:00
|
|
|
{"property-list", mp_property_list},
|
2016-08-28 17:42:03 +00:00
|
|
|
{"profile-list", mp_profile_list},
|
2013-07-25 21:36:01 +00:00
|
|
|
|
2015-03-30 21:52:28 +00:00
|
|
|
M_PROPERTY_ALIAS("video", "vid"),
|
|
|
|
M_PROPERTY_ALIAS("audio", "aid"),
|
|
|
|
M_PROPERTY_ALIAS("sub", "sid"),
|
2016-09-01 18:00:43 +00:00
|
|
|
|
|
|
|
// compatibility
|
2015-03-30 21:52:28 +00:00
|
|
|
M_PROPERTY_ALIAS("colormatrix", "video-params/colormatrix"),
|
|
|
|
M_PROPERTY_ALIAS("colormatrix-input-range", "video-params/colorlevels"),
|
|
|
|
M_PROPERTY_ALIAS("colormatrix-primaries", "video-params/primaries"),
|
2015-03-31 02:50:49 +00:00
|
|
|
M_PROPERTY_ALIAS("colormatrix-gamma", "video-params/gamma"),
|
2017-01-20 16:01:29 +00:00
|
|
|
|
|
|
|
M_PROPERTY_DEPRECATED_ALIAS("drop-frame-count", "decoder-frame-drop-count"),
|
|
|
|
M_PROPERTY_DEPRECATED_ALIAS("vo-drop-frame-count", "frame-drop-count"),
|
2007-02-21 00:49:24 +00:00
|
|
|
};
|
|
|
|
|
2014-04-05 21:54:21 +00:00
|
|
|
// Each entry describes which properties an event (possibly) changes.
|
2014-06-10 21:56:05 +00:00
|
|
|
#define E(x, ...) [x] = (const char*const[]){__VA_ARGS__, NULL}
|
|
|
|
static const char *const *const mp_event_property_change[] = {
|
2014-04-05 21:54:21 +00:00
|
|
|
E(MPV_EVENT_START_FILE, "*"),
|
|
|
|
E(MPV_EVENT_END_FILE, "*"),
|
|
|
|
E(MPV_EVENT_FILE_LOADED, "*"),
|
2015-02-01 17:25:12 +00:00
|
|
|
E(MP_EVENT_CHANGE_ALL, "*"),
|
2014-04-05 21:54:21 +00:00
|
|
|
E(MPV_EVENT_TRACKS_CHANGED, "track-list"),
|
|
|
|
E(MPV_EVENT_TRACK_SWITCHED, "vid", "video", "aid", "audio", "sid", "sub",
|
|
|
|
"secondary-sid"),
|
|
|
|
E(MPV_EVENT_IDLE, "*"),
|
2017-04-14 16:56:03 +00:00
|
|
|
E(MPV_EVENT_PAUSE, "pause"),
|
|
|
|
E(MPV_EVENT_UNPAUSE, "pause"),
|
2016-09-19 17:11:14 +00:00
|
|
|
E(MPV_EVENT_TICK, "time-pos", "audio-pts", "stream-pos", "avsync",
|
2014-10-18 22:49:37 +00:00
|
|
|
"percent-pos", "time-remaining", "playtime-remaining", "playback-time",
|
2015-02-27 11:23:29 +00:00
|
|
|
"estimated-vf-fps", "drop-frame-count", "vo-drop-frame-count",
|
2015-08-10 16:43:25 +00:00
|
|
|
"total-avsync-change", "audio-speed-correction", "video-speed-correction",
|
2015-11-25 21:07:56 +00:00
|
|
|
"vo-delayed-frame-count", "mistimed-frame-count", "vsync-ratio",
|
2016-09-21 09:49:00 +00:00
|
|
|
"estimated-display-fps", "vsync-jitter", "sub-text", "audio-bitrate",
|
2017-01-20 16:01:29 +00:00
|
|
|
"video-bitrate", "sub-bitrate", "decoder-frame-drop-count",
|
|
|
|
"frame-drop-count"),
|
2014-04-05 21:54:21 +00:00
|
|
|
E(MPV_EVENT_VIDEO_RECONFIG, "video-out-params", "video-params",
|
|
|
|
"video-format", "video-codec", "video-bitrate", "dwidth", "dheight",
|
2015-02-02 21:43:05 +00:00
|
|
|
"width", "height", "fps", "aspect", "vo-configured", "current-vo",
|
2017-03-31 15:28:15 +00:00
|
|
|
"colormatrix", "colormatrix-input-range", "colormatrix-output-range",
|
|
|
|
"colormatrix-primaries", "video-aspect", "video-dec-params",
|
|
|
|
"hwdec", "hwdec-current", "hwdec-interop"),
|
2014-04-05 21:54:21 +00:00
|
|
|
E(MPV_EVENT_AUDIO_RECONFIG, "audio-format", "audio-codec", "audio-bitrate",
|
2015-02-01 17:21:48 +00:00
|
|
|
"samplerate", "channels", "audio", "volume", "mute", "balance",
|
2016-07-09 16:31:18 +00:00
|
|
|
"current-ao", "audio-codec-name", "audio-params",
|
2016-01-26 14:12:42 +00:00
|
|
|
"audio-out-params", "volume-max", "mixer-active"),
|
2015-12-24 16:36:02 +00:00
|
|
|
E(MPV_EVENT_SEEK, "seeking", "core-idle", "eof-reached"),
|
|
|
|
E(MPV_EVENT_PLAYBACK_RESTART, "seeking", "core-idle", "eof-reached"),
|
2015-03-15 14:41:01 +00:00
|
|
|
E(MPV_EVENT_METADATA_UPDATE, "metadata", "filtered-metadata", "media-title"),
|
2014-04-27 20:28:07 +00:00
|
|
|
E(MPV_EVENT_CHAPTER_CHANGE, "chapter", "chapter-metadata"),
|
2014-08-28 15:48:31 +00:00
|
|
|
E(MP_EVENT_CACHE_UPDATE, "cache", "cache-free", "cache-used", "cache-idle",
|
2015-04-20 21:47:13 +00:00
|
|
|
"demuxer-cache-duration", "demuxer-cache-idle", "paused-for-cache",
|
2016-09-02 07:42:19 +00:00
|
|
|
"demuxer-cache-time", "cache-buffering-state", "cache-speed",
|
|
|
|
"cache-percent"),
|
2016-01-15 21:53:53 +00:00
|
|
|
E(MP_EVENT_WIN_RESIZE, "window-scale", "osd-width", "osd-height", "osd-par"),
|
2016-06-20 19:35:59 +00:00
|
|
|
E(MP_EVENT_WIN_STATE, "window-minimized", "display-names", "display-fps",
|
|
|
|
"fullscreen"),
|
|
|
|
E(MP_EVENT_CHANGE_PLAYLIST, "playlist", "playlist-pos", "playlist-pos-1",
|
|
|
|
"playlist-count", "playlist/count"),
|
2017-04-14 16:56:03 +00:00
|
|
|
E(MP_EVENT_CORE_IDLE, "core-idle", "eof-reached"),
|
2014-04-05 21:54:21 +00:00
|
|
|
};
|
|
|
|
#undef E
|
|
|
|
|
2015-06-09 16:05:12 +00:00
|
|
|
// If there is no prefix, return length+1 (avoids matching full name as prefix).
|
2014-08-01 23:39:28 +00:00
|
|
|
static int prefix_len(const char *p)
|
|
|
|
{
|
|
|
|
const char *end = strchr(p, '/');
|
2015-06-09 16:05:12 +00:00
|
|
|
return end ? end - p : strlen(p) + 1;
|
2014-08-01 23:39:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static bool match_property(const char *a, const char *b)
|
|
|
|
{
|
|
|
|
if (strcmp(a, "*") == 0)
|
|
|
|
return true;
|
2016-09-23 18:49:08 +00:00
|
|
|
// Give options and properties the same ID each, so change notifications
|
|
|
|
// work both way.
|
|
|
|
if (strncmp(a, "options/", 8) == 0)
|
|
|
|
a += 8;
|
|
|
|
if (strncmp(b, "options/", 8) == 0)
|
|
|
|
b += 8;
|
2014-08-01 23:39:28 +00:00
|
|
|
int len_a = prefix_len(a);
|
|
|
|
int len_b = prefix_len(b);
|
|
|
|
return strncmp(a, b, MPMIN(len_a, len_b)) == 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Return a bitset of events which change the property.
|
|
|
|
uint64_t mp_get_property_event_mask(const char *name)
|
|
|
|
{
|
|
|
|
uint64_t mask = 0;
|
|
|
|
for (int n = 0; n < MP_ARRAY_SIZE(mp_event_property_change); n++) {
|
|
|
|
const char *const *const list = mp_event_property_change[n];
|
|
|
|
for (int i = 0; list && list[i]; i++) {
|
|
|
|
if (match_property(list[i], name))
|
|
|
|
mask |= 1ULL << n;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return mask;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Return an ID for the property. It might not be unique, but is good enough
|
|
|
|
// for property change handling. Return -1 if property unknown.
|
2016-09-01 18:00:43 +00:00
|
|
|
int mp_get_property_id(struct MPContext *mpctx, const char *name)
|
2014-08-01 23:39:28 +00:00
|
|
|
{
|
2016-09-01 18:00:43 +00:00
|
|
|
struct command_ctx *ctx = mpctx->command_ctx;
|
|
|
|
for (int n = 0; ctx->properties[n].name; n++) {
|
|
|
|
if (match_property(ctx->properties[n].name, name))
|
2014-08-01 23:39:28 +00:00
|
|
|
return n;
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2014-04-08 19:24:14 +00:00
|
|
|
static bool is_property_set(int action, void *val)
|
|
|
|
{
|
|
|
|
switch (action) {
|
|
|
|
case M_PROPERTY_SET:
|
|
|
|
case M_PROPERTY_SWITCH:
|
|
|
|
case M_PROPERTY_SET_STRING:
|
|
|
|
case M_PROPERTY_SET_NODE:
|
|
|
|
return true;
|
|
|
|
case M_PROPERTY_KEY_ACTION: {
|
|
|
|
struct m_property_action_arg *key = val;
|
|
|
|
return is_property_set(key->action, key->arg);
|
|
|
|
}
|
|
|
|
default:
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-09-17 18:48:22 +00:00
|
|
|
static int mp_property_do_silent(const char *name, int action, void *val,
|
|
|
|
struct MPContext *ctx)
|
2007-02-21 00:49:24 +00:00
|
|
|
{
|
2016-09-01 18:00:43 +00:00
|
|
|
struct command_ctx *cmd = ctx->command_ctx;
|
command: silence deprecation warnings with --reset-on-next-file=all
--reset-on-next-file=all triggers m_config_backup_all_opts(), which
backups all options (even deprecated ones). Later, when the option
values are reset with m_config_restore_backups(), mp_on_set_option() is
called, which in turn calls mp_property_do_silent(), which in turn will
call mp_property_generic_option() and m_config_get_co(), which triggers
the deprecation message.
Unfortunately there's no good way to determine whether an option has
actually changed (there's no option value compare operation), so the
deprecated options have to be set no matter what. On the other hand, we
can't pass through additional flags through the property layer. So we
add a dumb global flag to silence the deprecation warnings in these
cases.
Fortunately m_config_get_co_raw() works to silence the warnings.
m_config_get_co() also resolves aliases (deprecated and non-deprecated),
but aliased options are handled differently by the option-property
bridge, so we don't need to do that here, so the only purpose of it is
to trigger a warning for deprecated (non-alias) options.
2016-10-22 14:02:52 +00:00
|
|
|
cmd->silence_option_deprecations += 1;
|
2016-09-01 18:00:43 +00:00
|
|
|
int r = m_property_do(ctx->log, cmd->properties, name, action, val, ctx);
|
command: silence deprecation warnings with --reset-on-next-file=all
--reset-on-next-file=all triggers m_config_backup_all_opts(), which
backups all options (even deprecated ones). Later, when the option
values are reset with m_config_restore_backups(), mp_on_set_option() is
called, which in turn calls mp_property_do_silent(), which in turn will
call mp_property_generic_option() and m_config_get_co(), which triggers
the deprecation message.
Unfortunately there's no good way to determine whether an option has
actually changed (there's no option value compare operation), so the
deprecated options have to be set no matter what. On the other hand, we
can't pass through additional flags through the property layer. So we
add a dumb global flag to silence the deprecation warnings in these
cases.
Fortunately m_config_get_co_raw() works to silence the warnings.
m_config_get_co() also resolves aliases (deprecated and non-deprecated),
but aliased options are handled differently by the option-property
bridge, so we don't need to do that here, so the only purpose of it is
to trigger a warning for deprecated (non-alias) options.
2016-10-22 14:02:52 +00:00
|
|
|
cmd->silence_option_deprecations -= 1;
|
2014-04-08 19:24:14 +00:00
|
|
|
if (r == M_PROPERTY_OK && is_property_set(action, val))
|
|
|
|
mp_notify_property(ctx, (char *)name);
|
2016-09-17 18:48:22 +00:00
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
int mp_property_do(const char *name, int action, void *val,
|
|
|
|
struct MPContext *ctx)
|
|
|
|
{
|
|
|
|
int r = mp_property_do_silent(name, action, val, ctx);
|
2016-04-15 11:20:05 +00:00
|
|
|
if (mp_msg_test(ctx->log, MSGL_V) && is_property_set(action, val)) {
|
|
|
|
struct m_option ot = {0};
|
|
|
|
void *data = val;
|
|
|
|
switch (action) {
|
|
|
|
case M_PROPERTY_SET_NODE:
|
|
|
|
ot.type = &m_option_type_node;
|
|
|
|
break;
|
|
|
|
case M_PROPERTY_SET_STRING:
|
|
|
|
ot.type = &m_option_type_string;
|
|
|
|
data = &val;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
char *t = ot.type ? m_option_print(&ot, data) : NULL;
|
|
|
|
MP_VERBOSE(ctx, "Set property: %s%s%s -> %d\n",
|
|
|
|
name, t ? "=" : "", t ? t : "", r);
|
|
|
|
talloc_free(t);
|
|
|
|
}
|
2014-04-08 19:24:14 +00:00
|
|
|
return r;
|
2007-02-21 00:49:24 +00:00
|
|
|
}
|
|
|
|
|
2013-09-20 21:33:38 +00:00
|
|
|
char *mp_property_expand_string(struct MPContext *mpctx, const char *str)
|
2007-02-21 00:49:24 +00:00
|
|
|
{
|
2016-09-01 18:00:43 +00:00
|
|
|
struct command_ctx *ctx = mpctx->command_ctx;
|
|
|
|
return m_properties_expand_string(ctx->properties, str, mpctx);
|
2007-02-21 00:49:24 +00:00
|
|
|
}
|
|
|
|
|
2014-02-20 13:46:23 +00:00
|
|
|
// Before expanding properties, parse C-style escapes like "\n"
|
|
|
|
char *mp_property_expand_escaped_string(struct MPContext *mpctx, const char *str)
|
|
|
|
{
|
|
|
|
void *tmp = talloc_new(NULL);
|
|
|
|
bstr strb = bstr0(str);
|
|
|
|
bstr dst = {0};
|
|
|
|
while (strb.len) {
|
|
|
|
if (!mp_append_escaped_string(tmp, &dst, &strb)) {
|
|
|
|
talloc_free(tmp);
|
|
|
|
return talloc_strdup(NULL, "(broken escape sequences)");
|
|
|
|
}
|
|
|
|
// pass " through literally
|
|
|
|
if (!bstr_eatstart0(&strb, "\""))
|
|
|
|
break;
|
|
|
|
bstr_xappend(tmp, &dst, bstr0("\""));
|
|
|
|
}
|
|
|
|
char *r = mp_property_expand_string(mpctx, dst.start);
|
|
|
|
talloc_free(tmp);
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2016-09-01 18:00:43 +00:00
|
|
|
void property_print_help(struct MPContext *mpctx)
|
2007-02-21 00:49:24 +00:00
|
|
|
{
|
2016-09-01 18:00:43 +00:00
|
|
|
struct command_ctx *ctx = mpctx->command_ctx;
|
|
|
|
m_properties_print_help_list(mpctx->log, ctx->properties);
|
2007-02-21 00:49:24 +00:00
|
|
|
}
|
|
|
|
|
2009-09-19 01:17:30 +00:00
|
|
|
/* List of default ways to show a property on OSD.
|
|
|
|
*
|
2012-09-25 01:24:38 +00:00
|
|
|
* If osd_progbar is set, a bar showing the current position between min/max
|
|
|
|
* values of the property is shown. In this case osd_msg is only used for
|
|
|
|
* terminal output if there is no video; it'll be a label shown together with
|
|
|
|
* percentage.
|
2009-09-19 01:17:30 +00:00
|
|
|
*/
|
2014-06-10 21:56:05 +00:00
|
|
|
static const struct property_osd_display {
|
2012-09-25 01:24:38 +00:00
|
|
|
// property name
|
2009-09-19 01:17:30 +00:00
|
|
|
const char *name;
|
2012-09-25 01:24:38 +00:00
|
|
|
// name used on OSD
|
|
|
|
const char *osd_name;
|
|
|
|
// progressbar type
|
|
|
|
int osd_progbar;
|
|
|
|
// Needs special ways to display the new value (seeks are delayed)
|
|
|
|
int seek_msg, seek_bar;
|
2017-08-23 12:23:37 +00:00
|
|
|
// Show a marker thing on OSD bar. Ignored if osd_progbar==0.
|
|
|
|
float marker;
|
2013-09-20 21:33:38 +00:00
|
|
|
// Free-form message (if NULL, osd_name or the property name is used)
|
|
|
|
const char *msg;
|
2009-09-19 01:17:30 +00:00
|
|
|
} property_osd_display[] = {
|
|
|
|
// general
|
2017-04-11 10:15:38 +00:00
|
|
|
{ "loop-playlist", "Loop" },
|
2017-01-31 10:47:28 +00:00
|
|
|
{ "loop-file", "Loop current file" },
|
2012-09-25 01:24:38 +00:00
|
|
|
{ "chapter", .seek_msg = OSD_SEEK_INFO_CHAPTER_TEXT,
|
|
|
|
.seek_bar = OSD_SEEK_INFO_BAR },
|
|
|
|
{ "hr-seek", "hr-seek" },
|
2013-12-18 16:12:07 +00:00
|
|
|
{ "speed", "Speed" },
|
|
|
|
{ "clock", "Clock" },
|
2009-09-19 01:17:30 +00:00
|
|
|
// audio
|
2013-12-18 16:12:07 +00:00
|
|
|
{ "volume", "Volume",
|
2014-10-11 19:34:15 +00:00
|
|
|
.msg = "Volume: ${?volume:${volume}% ${?mute==yes:(Muted)}}${!volume:${volume}}",
|
2017-08-23 12:23:37 +00:00
|
|
|
.osd_progbar = OSD_VOLUME, .marker = 100 },
|
2016-07-10 10:50:58 +00:00
|
|
|
{ "ao-volume", "AO Volume",
|
|
|
|
.msg = "AO Volume: ${?ao-volume:${ao-volume}% ${?ao-mute==yes:(Muted)}}${!ao-volume:${ao-volume}}",
|
2017-08-23 12:23:37 +00:00
|
|
|
.osd_progbar = OSD_VOLUME, .marker = 100 },
|
2013-12-18 16:12:07 +00:00
|
|
|
{ "mute", "Mute" },
|
2016-07-10 10:50:58 +00:00
|
|
|
{ "ao-mute", "AO Mute" },
|
2013-12-18 16:12:07 +00:00
|
|
|
{ "audio-delay", "A-V delay" },
|
|
|
|
{ "audio", "Audio" },
|
|
|
|
{ "balance", "Balance", .osd_progbar = OSD_BALANCE },
|
2009-09-19 01:17:30 +00:00
|
|
|
// video
|
2013-12-18 16:12:07 +00:00
|
|
|
{ "panscan", "Panscan", .osd_progbar = OSD_PANSCAN },
|
2016-05-05 05:56:21 +00:00
|
|
|
{ "taskbar-progress", "Progress in taskbar" },
|
2016-12-09 18:22:33 +00:00
|
|
|
{ "snap-window", "Snap to screen edges" },
|
2013-12-18 16:12:07 +00:00
|
|
|
{ "ontop", "Stay on top" },
|
|
|
|
{ "border", "Border" },
|
|
|
|
{ "framedrop", "Framedrop" },
|
|
|
|
{ "deinterlace", "Deinterlace" },
|
2014-02-03 21:00:34 +00:00
|
|
|
{ "colormatrix",
|
|
|
|
.msg = "YUV colormatrix:\n${colormatrix}" },
|
|
|
|
{ "colormatrix-input-range",
|
|
|
|
.msg = "YUV input range:\n${colormatrix-input-range}" },
|
|
|
|
{ "colormatrix-output-range",
|
|
|
|
.msg = "RGB output range:\n${colormatrix-output-range}" },
|
2014-03-26 13:03:24 +00:00
|
|
|
{ "colormatrix-primaries",
|
|
|
|
.msg = "Colorspace primaries:\n${colormatrix-primaries}", },
|
2015-03-31 02:50:49 +00:00
|
|
|
{ "colormatrix-gamma",
|
|
|
|
.msg = "Colorspace gamma:\n${colormatrix-gamma}", },
|
2013-12-18 16:12:07 +00:00
|
|
|
{ "gamma", "Gamma", .osd_progbar = OSD_BRIGHTNESS },
|
|
|
|
{ "brightness", "Brightness", .osd_progbar = OSD_BRIGHTNESS },
|
|
|
|
{ "contrast", "Contrast", .osd_progbar = OSD_CONTRAST },
|
|
|
|
{ "saturation", "Saturation", .osd_progbar = OSD_SATURATION },
|
|
|
|
{ "hue", "Hue", .osd_progbar = OSD_HUE },
|
|
|
|
{ "angle", "Angle" },
|
2009-09-19 01:17:30 +00:00
|
|
|
// subs
|
2013-12-18 16:12:07 +00:00
|
|
|
{ "sub", "Subtitles" },
|
2013-12-24 16:46:14 +00:00
|
|
|
{ "secondary-sid", "Secondary subtitles" },
|
2013-12-18 16:12:07 +00:00
|
|
|
{ "sub-pos", "Sub position" },
|
2014-01-17 21:34:47 +00:00
|
|
|
{ "sub-delay", "Sub delay" },
|
2016-09-13 01:17:40 +00:00
|
|
|
{ "sub-speed", "Sub speed" },
|
2015-01-29 19:28:39 +00:00
|
|
|
{ "sub-visibility", .msg = "Subtitles ${!sub-visibility==yes:hidden}"
|
|
|
|
"${?sub-visibility==yes:visible${?sub==no: (but no subtitles selected)}}" },
|
2013-12-18 16:12:07 +00:00
|
|
|
{ "sub-forced-only", "Forced sub only" },
|
|
|
|
{ "sub-scale", "Sub Scale"},
|
2016-10-03 15:16:02 +00:00
|
|
|
{ "sub-ass-vsfilter-aspect-compat", "Subtitle VSFilter aspect compat"},
|
2017-06-07 18:18:25 +00:00
|
|
|
{ "sub-ass-override", "ASS subtitle style override"},
|
2014-02-21 12:18:50 +00:00
|
|
|
{ "vf", "Video filters", .msg = "Video filters:\n${vf}"},
|
|
|
|
{ "af", "Audio filters", .msg = "Audio filters:\n${af}"},
|
2013-12-18 16:12:07 +00:00
|
|
|
{ "tv-brightness", "Brightness", .osd_progbar = OSD_BRIGHTNESS },
|
|
|
|
{ "tv-hue", "Hue", .osd_progbar = OSD_HUE},
|
|
|
|
{ "tv-saturation", "Saturation", .osd_progbar = OSD_SATURATION },
|
|
|
|
{ "tv-contrast", "Contrast", .osd_progbar = OSD_CONTRAST },
|
2015-08-09 21:55:10 +00:00
|
|
|
{ "ab-loop-a", "A-B loop start"},
|
|
|
|
{ "ab-loop-b", .msg = "A-B loop: ${ab-loop-a} - ${ab-loop-b}"},
|
2015-02-16 20:35:13 +00:00
|
|
|
{ "audio-device", "Audio device"},
|
2014-09-21 21:54:29 +00:00
|
|
|
// By default, don't display the following properties on OSD
|
|
|
|
{ "pause", NULL },
|
|
|
|
{ "fullscreen", NULL },
|
2012-09-25 01:24:38 +00:00
|
|
|
{0}
|
2009-09-19 01:17:30 +00:00
|
|
|
};
|
|
|
|
|
2014-09-21 21:40:45 +00:00
|
|
|
static void show_property_osd(MPContext *mpctx, const char *name, int osd_mode)
|
2009-09-19 01:17:30 +00:00
|
|
|
{
|
2013-07-27 19:24:54 +00:00
|
|
|
struct MPOpts *opts = mpctx->opts;
|
2014-09-21 21:54:29 +00:00
|
|
|
struct property_osd_display disp = { .name = name, .osd_name = name };
|
2009-09-19 01:17:30 +00:00
|
|
|
|
2014-09-21 21:40:45 +00:00
|
|
|
if (!osd_mode)
|
|
|
|
return;
|
2012-09-25 01:24:38 +00:00
|
|
|
|
2009-09-19 01:17:30 +00:00
|
|
|
// look for the command
|
2014-09-21 21:40:45 +00:00
|
|
|
for (const struct property_osd_display *p = property_osd_display; p->name; p++)
|
|
|
|
{
|
2014-02-21 12:18:50 +00:00
|
|
|
if (!strcmp(p->name, name)) {
|
2014-09-21 21:40:45 +00:00
|
|
|
disp = *p;
|
2009-09-19 01:17:30 +00:00
|
|
|
break;
|
2012-09-25 01:24:38 +00:00
|
|
|
}
|
|
|
|
}
|
2013-09-20 21:33:38 +00:00
|
|
|
|
2014-09-21 21:40:45 +00:00
|
|
|
if (osd_mode == MP_ON_OSD_AUTO) {
|
|
|
|
osd_mode =
|
|
|
|
((disp.msg || disp.osd_name || disp.seek_msg) ? MP_ON_OSD_MSG : 0) |
|
|
|
|
((disp.osd_progbar || disp.seek_bar) ? MP_ON_OSD_BAR : 0);
|
2012-09-25 01:24:38 +00:00
|
|
|
}
|
2009-09-19 01:17:30 +00:00
|
|
|
|
2014-09-21 21:40:45 +00:00
|
|
|
if (!disp.osd_progbar)
|
|
|
|
disp.osd_progbar = ' ';
|
|
|
|
|
|
|
|
if (!disp.osd_name)
|
|
|
|
disp.osd_name = name;
|
|
|
|
|
|
|
|
if (disp.seek_msg || disp.seek_bar) {
|
2012-09-25 01:24:38 +00:00
|
|
|
mpctx->add_osd_seek_info |=
|
2014-09-21 21:40:45 +00:00
|
|
|
(osd_mode & MP_ON_OSD_MSG ? disp.seek_msg : 0) |
|
|
|
|
(osd_mode & MP_ON_OSD_BAR ? disp.seek_bar : 0);
|
2012-09-25 01:24:38 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2014-08-08 21:53:11 +00:00
|
|
|
struct m_option prop = {0};
|
player: more option/property consistency fixes
Some properties had a different type from their equivalent options (such
as mute, volume, deinterlace, edition). This wasn't really sane, as raw
option values should be always within their bounds. On the other hand,
these properties use a different type to reflect runtime limits (such as
range of available editions), or simply to improve the "UI" (you don't
want to cycle throuhg the completely useless "auto" value when cycling
the "mute" property).
Handle this by making them always return the option type, but also
allowing them to provide a "constricted" type, which is used for UI
purposes. All M_PROPERTY_GET_CONSTRICTED_TYPE changes are related to
this.
One consequence is that you can set the volume property to arbitrary
high values just like with the --volume option, but using the "add"
command it still restricts it to the --volume-max range.
Also deprecate --chapter, as it is grossly incompatible to the chapter
property. We pondered renaming it to --chapters, or introducing a more
powerful --range option, but concluded that --start --end is actually
enough.
These changes appear to take care of the last gross property/option
incompatibilities, although there might still be a few lurking.
2016-09-18 14:06:12 +00:00
|
|
|
mp_property_do(name, M_PROPERTY_GET_CONSTRICTED_TYPE, &prop, mpctx);
|
2014-09-21 21:40:45 +00:00
|
|
|
if ((osd_mode & MP_ON_OSD_BAR) && (prop.flags & CONF_RANGE) == CONF_RANGE) {
|
2012-09-21 12:05:52 +00:00
|
|
|
if (prop.type == CONF_TYPE_INT) {
|
2014-06-08 21:52:58 +00:00
|
|
|
int n = prop.min;
|
2017-08-23 12:23:37 +00:00
|
|
|
if (disp.osd_progbar)
|
|
|
|
n = disp.marker;
|
2012-09-21 12:05:52 +00:00
|
|
|
int i;
|
2014-09-21 21:40:45 +00:00
|
|
|
if (mp_property_do(name, M_PROPERTY_GET, &i, mpctx) > 0)
|
|
|
|
set_osd_bar(mpctx, disp.osd_progbar, prop.min, prop.max, n, i);
|
2012-09-21 12:05:52 +00:00
|
|
|
} else if (prop.type == CONF_TYPE_FLOAT) {
|
2014-06-08 21:52:58 +00:00
|
|
|
float n = prop.min;
|
2017-08-23 12:23:37 +00:00
|
|
|
if (disp.osd_progbar)
|
|
|
|
n = disp.marker;
|
2009-09-19 01:17:30 +00:00
|
|
|
float f;
|
2014-09-21 21:40:45 +00:00
|
|
|
if (mp_property_do(name, M_PROPERTY_GET, &f, mpctx) > 0)
|
|
|
|
set_osd_bar(mpctx, disp.osd_progbar, prop.min, prop.max, n, f);
|
2009-09-19 01:17:30 +00:00
|
|
|
}
|
2013-09-20 21:33:38 +00:00
|
|
|
}
|
|
|
|
|
2014-09-21 21:40:45 +00:00
|
|
|
if (osd_mode & MP_ON_OSD_MSG) {
|
|
|
|
void *tmp = talloc_new(NULL);
|
2013-09-20 21:33:38 +00:00
|
|
|
|
2014-09-21 21:40:45 +00:00
|
|
|
const char *msg = disp.msg;
|
|
|
|
if (!msg)
|
|
|
|
msg = talloc_asprintf(tmp, "%s: ${%s}", disp.osd_name, name);
|
2013-09-20 21:33:38 +00:00
|
|
|
|
2014-09-21 21:40:45 +00:00
|
|
|
char *osd_msg = talloc_steal(tmp, mp_property_expand_string(mpctx, msg));
|
|
|
|
|
|
|
|
if (osd_msg && osd_msg[0])
|
|
|
|
set_osd_msg(mpctx, 1, opts->osd_duration, "%s", osd_msg);
|
|
|
|
|
|
|
|
talloc_free(tmp);
|
|
|
|
}
|
2009-09-19 01:17:30 +00:00
|
|
|
}
|
2007-02-21 00:49:24 +00:00
|
|
|
|
2013-07-22 12:43:58 +00:00
|
|
|
static bool reinit_filters(MPContext *mpctx, enum stream_type mediatype)
|
|
|
|
{
|
|
|
|
switch (mediatype) {
|
|
|
|
case STREAM_VIDEO:
|
|
|
|
return reinit_video_filters(mpctx) >= 0;
|
|
|
|
case STREAM_AUDIO:
|
|
|
|
return reinit_audio_filters(mpctx) >= 0;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2014-06-10 21:56:05 +00:00
|
|
|
static const char *const filter_opt[STREAM_TYPE_COUNT] = {
|
2013-08-03 11:38:40 +00:00
|
|
|
[STREAM_VIDEO] = "vf",
|
|
|
|
[STREAM_AUDIO] = "af",
|
|
|
|
};
|
|
|
|
|
|
|
|
static int set_filters(struct MPContext *mpctx, enum stream_type mediatype,
|
|
|
|
struct m_obj_settings *new_chain)
|
2013-05-18 09:44:17 +00:00
|
|
|
{
|
2013-08-03 11:38:40 +00:00
|
|
|
bstr option = bstr0(filter_opt[mediatype]);
|
|
|
|
struct m_config_option *co = m_config_get_co(mpctx->mconfig, option);
|
|
|
|
if (!co)
|
|
|
|
return -1;
|
2013-07-22 12:43:58 +00:00
|
|
|
|
2013-08-03 11:38:40 +00:00
|
|
|
struct m_obj_settings **list = co->data;
|
|
|
|
struct m_obj_settings *old_settings = *list;
|
|
|
|
*list = NULL;
|
|
|
|
m_option_copy(co->opt, list, &new_chain);
|
|
|
|
|
|
|
|
bool success = reinit_filters(mpctx, mediatype);
|
|
|
|
|
|
|
|
if (success) {
|
|
|
|
m_option_free(co->opt, &old_settings);
|
2014-06-01 01:41:43 +00:00
|
|
|
mp_notify_property(mpctx, filter_opt[mediatype]);
|
2013-08-03 11:38:40 +00:00
|
|
|
} else {
|
|
|
|
m_option_free(co->opt, list);
|
|
|
|
*list = old_settings;
|
|
|
|
reinit_filters(mpctx, mediatype);
|
2013-07-22 12:43:58 +00:00
|
|
|
}
|
2013-05-18 09:44:17 +00:00
|
|
|
|
2013-08-03 11:38:40 +00:00
|
|
|
return success ? 0 : -1;
|
|
|
|
}
|
|
|
|
|
2015-07-21 19:54:15 +00:00
|
|
|
static int edit_filters(struct MPContext *mpctx, struct mp_log *log,
|
|
|
|
enum stream_type mediatype,
|
2013-08-03 11:38:40 +00:00
|
|
|
const char *cmd, const char *arg)
|
|
|
|
{
|
|
|
|
bstr option = bstr0(filter_opt[mediatype]);
|
|
|
|
struct m_config_option *co = m_config_get_co(mpctx->mconfig, option);
|
|
|
|
if (!co)
|
|
|
|
return -1;
|
|
|
|
|
2013-05-18 09:44:17 +00:00
|
|
|
// The option parser is used to modify the filter list itself.
|
|
|
|
char optname[20];
|
2013-08-03 11:38:40 +00:00
|
|
|
snprintf(optname, sizeof(optname), "%.*s-%s", BSTR_P(option), cmd);
|
2013-05-18 09:44:17 +00:00
|
|
|
|
2013-08-03 11:38:40 +00:00
|
|
|
struct m_obj_settings *new_chain = NULL;
|
|
|
|
m_option_copy(co->opt, &new_chain, co->data);
|
2013-05-18 09:44:17 +00:00
|
|
|
|
2015-07-21 19:54:15 +00:00
|
|
|
int r = m_option_parse(log, co->opt, bstr0(optname), bstr0(arg), &new_chain);
|
2013-08-03 11:38:40 +00:00
|
|
|
if (r >= 0)
|
|
|
|
r = set_filters(mpctx, mediatype, new_chain);
|
2013-05-18 09:44:17 +00:00
|
|
|
|
2013-08-03 11:38:40 +00:00
|
|
|
m_option_free(co->opt, &new_chain);
|
2013-05-18 09:44:17 +00:00
|
|
|
|
2013-08-03 11:38:40 +00:00
|
|
|
return r >= 0 ? 0 : -1;
|
2013-05-18 09:44:17 +00:00
|
|
|
}
|
|
|
|
|
2013-08-03 11:54:02 +00:00
|
|
|
static int edit_filters_osd(struct MPContext *mpctx, enum stream_type mediatype,
|
|
|
|
const char *cmd, const char *arg, bool on_osd)
|
|
|
|
{
|
2015-07-21 19:54:15 +00:00
|
|
|
int r = edit_filters(mpctx, mpctx->log, mediatype, cmd, arg);
|
2013-08-03 11:54:02 +00:00
|
|
|
if (on_osd) {
|
|
|
|
if (r >= 0) {
|
|
|
|
const char *prop = filter_opt[mediatype];
|
|
|
|
show_property_osd(mpctx, prop, MP_ON_OSD_MSG);
|
|
|
|
} else {
|
2014-01-17 21:34:47 +00:00
|
|
|
set_osd_msg(mpctx, 1, mpctx->opts->osd_duration,
|
2013-08-03 11:54:02 +00:00
|
|
|
"Changing filters failed!");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2014-07-25 12:22:40 +00:00
|
|
|
static void recreate_overlays(struct MPContext *mpctx)
|
2013-09-30 20:27:37 +00:00
|
|
|
{
|
|
|
|
struct command_ctx *cmd = mpctx->command_ctx;
|
2016-07-01 17:39:04 +00:00
|
|
|
int overlay_next = !cmd->overlay_osd_current;
|
|
|
|
struct sub_bitmaps *new = &cmd->overlay_osd[overlay_next];
|
2014-07-25 12:22:40 +00:00
|
|
|
new->format = SUBBITMAP_RGBA;
|
2015-03-18 11:33:14 +00:00
|
|
|
new->change_id = 1;
|
2016-07-01 17:39:04 +00:00
|
|
|
|
|
|
|
bool valid = false;
|
|
|
|
|
2014-07-25 12:22:40 +00:00
|
|
|
new->num_parts = 0;
|
|
|
|
for (int n = 0; n < cmd->num_overlays; n++) {
|
2014-10-02 23:22:07 +00:00
|
|
|
struct overlay *o = &cmd->overlays[n];
|
2016-07-01 17:39:04 +00:00
|
|
|
if (o->source) {
|
|
|
|
struct mp_image *s = o->source;
|
|
|
|
struct sub_bitmap b = {
|
|
|
|
.bitmap = s->planes[0],
|
|
|
|
.stride = s->stride[0],
|
|
|
|
.w = s->w, .dw = s->w,
|
|
|
|
.h = s->h, .dh = s->h,
|
|
|
|
.x = o->x,
|
|
|
|
.y = o->y,
|
|
|
|
};
|
|
|
|
MP_TARRAY_APPEND(cmd, new->parts, new->num_parts, b);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!cmd->overlay_packer)
|
|
|
|
cmd->overlay_packer = talloc_zero(cmd, struct bitmap_packer);
|
|
|
|
|
|
|
|
cmd->overlay_packer->padding = 1; // assume bilinear scaling
|
|
|
|
packer_set_size(cmd->overlay_packer, new->num_parts);
|
|
|
|
|
|
|
|
for (int n = 0; n < new->num_parts; n++)
|
|
|
|
cmd->overlay_packer->in[n] = (struct pos){new->parts[n].w, new->parts[n].h};
|
|
|
|
|
|
|
|
if (packer_pack(cmd->overlay_packer) < 0 || new->num_parts == 0)
|
|
|
|
goto done;
|
|
|
|
|
|
|
|
struct pos bb[2];
|
|
|
|
packer_get_bb(cmd->overlay_packer, bb);
|
|
|
|
|
|
|
|
new->packed_w = bb[1].x;
|
|
|
|
new->packed_h = bb[1].y;
|
|
|
|
|
|
|
|
if (!new->packed || new->packed->w < new->packed_w ||
|
|
|
|
new->packed->h < new->packed_h)
|
|
|
|
{
|
|
|
|
talloc_free(new->packed);
|
|
|
|
new->packed = mp_image_alloc(IMGFMT_BGRA, cmd->overlay_packer->w,
|
|
|
|
cmd->overlay_packer->h);
|
|
|
|
if (!new->packed)
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
// clear padding
|
|
|
|
mp_image_clear(new->packed, 0, 0, new->packed->w, new->packed->h);
|
|
|
|
|
|
|
|
for (int n = 0; n < new->num_parts; n++) {
|
|
|
|
struct sub_bitmap *b = &new->parts[n];
|
|
|
|
struct pos pos = cmd->overlay_packer->result[n];
|
|
|
|
|
|
|
|
int stride = new->packed->stride[0];
|
|
|
|
void *pdata = (uint8_t *)new->packed->planes[0] + pos.y * stride + pos.x * 4;
|
|
|
|
memcpy_pic(pdata, b->bitmap, b->w * 4, b->h, stride, b->stride);
|
|
|
|
|
|
|
|
b->bitmap = pdata;
|
|
|
|
b->stride = stride;
|
|
|
|
|
|
|
|
b->src_x = pos.x;
|
|
|
|
b->src_y = pos.y;
|
|
|
|
}
|
|
|
|
|
|
|
|
valid = true;
|
|
|
|
done:
|
|
|
|
if (!valid) {
|
|
|
|
new->format = SUBBITMAP_EMPTY;
|
|
|
|
new->num_parts = 0;
|
2014-07-25 12:22:40 +00:00
|
|
|
}
|
2016-07-01 17:39:04 +00:00
|
|
|
|
|
|
|
osd_set_external2(mpctx->osd, new);
|
|
|
|
cmd->overlay_osd_current = overlay_next;
|
2013-09-30 20:27:37 +00:00
|
|
|
}
|
|
|
|
|
2014-10-02 23:22:07 +00:00
|
|
|
// Set overlay with the given ID to the contents as described by "new".
|
|
|
|
static void replace_overlay(struct MPContext *mpctx, int id, struct overlay *new)
|
|
|
|
{
|
|
|
|
struct command_ctx *cmd = mpctx->command_ctx;
|
|
|
|
assert(id >= 0);
|
|
|
|
if (id >= cmd->num_overlays) {
|
|
|
|
MP_TARRAY_GROW(cmd, cmd->overlays, id);
|
|
|
|
while (cmd->num_overlays <= id)
|
|
|
|
cmd->overlays[cmd->num_overlays++] = (struct overlay){0};
|
|
|
|
}
|
|
|
|
|
|
|
|
struct overlay *ptr = &cmd->overlays[id];
|
|
|
|
|
2016-07-01 17:39:04 +00:00
|
|
|
talloc_free(ptr->source);
|
2014-10-02 23:22:07 +00:00
|
|
|
*ptr = *new;
|
|
|
|
|
2016-07-01 17:39:04 +00:00
|
|
|
recreate_overlays(mpctx);
|
2014-10-02 23:22:07 +00:00
|
|
|
}
|
|
|
|
|
2013-09-30 20:27:37 +00:00
|
|
|
static int overlay_add(struct MPContext *mpctx, int id, int x, int y,
|
|
|
|
char *file, int offset, char *fmt, int w, int h,
|
|
|
|
int stride)
|
|
|
|
{
|
2014-01-18 00:19:20 +00:00
|
|
|
int r = -1;
|
2013-09-30 20:27:37 +00:00
|
|
|
if (strcmp(fmt, "bgra") != 0) {
|
2016-07-14 18:04:59 +00:00
|
|
|
MP_ERR(mpctx, "overlay-add: unsupported OSD format '%s'\n", fmt);
|
2014-01-18 00:19:20 +00:00
|
|
|
goto error;
|
2013-09-30 20:27:37 +00:00
|
|
|
}
|
2014-07-25 12:22:40 +00:00
|
|
|
if (id < 0 || id >= 64) { // arbitrary upper limit
|
2016-07-14 18:04:59 +00:00
|
|
|
MP_ERR(mpctx, "overlay-add: invalid id %d\n", id);
|
2014-01-18 00:19:20 +00:00
|
|
|
goto error;
|
2013-09-30 20:27:37 +00:00
|
|
|
}
|
2016-07-01 17:39:04 +00:00
|
|
|
if (w <= 0 || h <= 0 || stride < w * 4 || (stride % 4)) {
|
2016-07-14 18:04:59 +00:00
|
|
|
MP_ERR(mpctx, "overlay-add: inconsistent parameters\n");
|
2014-10-02 23:22:07 +00:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
struct overlay overlay = {
|
2016-07-01 17:39:04 +00:00
|
|
|
.source = mp_image_alloc(IMGFMT_BGRA, w, h),
|
|
|
|
.x = x,
|
|
|
|
.y = y,
|
2014-10-02 23:22:07 +00:00
|
|
|
};
|
2016-07-01 17:39:04 +00:00
|
|
|
if (!overlay.source)
|
|
|
|
goto error;
|
2013-09-30 20:27:37 +00:00
|
|
|
int fd = -1;
|
|
|
|
bool close_fd = true;
|
2014-12-26 16:43:59 +00:00
|
|
|
void *p = NULL;
|
2013-09-30 20:27:37 +00:00
|
|
|
if (file[0] == '@') {
|
|
|
|
char *end;
|
|
|
|
fd = strtol(&file[1], &end, 10);
|
|
|
|
if (!file[1] || end[0])
|
|
|
|
fd = -1;
|
|
|
|
close_fd = false;
|
2014-10-02 23:24:48 +00:00
|
|
|
} else if (file[0] == '&') {
|
|
|
|
char *end;
|
|
|
|
unsigned long long addr = strtoull(&file[1], &end, 0);
|
|
|
|
if (!file[1] || end[0])
|
|
|
|
addr = 0;
|
|
|
|
p = (void *)(uintptr_t)addr;
|
2013-09-30 20:27:37 +00:00
|
|
|
} else {
|
2013-11-30 21:40:51 +00:00
|
|
|
fd = open(file, O_RDONLY | O_BINARY | O_CLOEXEC);
|
2013-09-30 20:27:37 +00:00
|
|
|
}
|
2016-07-01 17:39:04 +00:00
|
|
|
int map_size = 0;
|
2014-10-02 23:22:07 +00:00
|
|
|
if (fd >= 0) {
|
2016-07-01 17:39:04 +00:00
|
|
|
map_size = offset + h * stride;
|
|
|
|
void *m = mmap(NULL, map_size, PROT_READ, MAP_SHARED, fd, 0);
|
2014-10-02 23:22:07 +00:00
|
|
|
if (close_fd)
|
|
|
|
close(fd);
|
2016-07-01 17:39:04 +00:00
|
|
|
if (m && m != MAP_FAILED)
|
2014-12-26 16:43:59 +00:00
|
|
|
p = m;
|
2014-10-02 23:22:07 +00:00
|
|
|
}
|
2014-12-26 16:43:59 +00:00
|
|
|
if (!p) {
|
2016-07-14 18:04:59 +00:00
|
|
|
MP_ERR(mpctx, "overlay-add: could not open or map '%s'\n", file);
|
2016-07-01 17:39:04 +00:00
|
|
|
talloc_free(overlay.source);
|
2014-01-18 00:19:20 +00:00
|
|
|
goto error;
|
2013-09-30 20:27:37 +00:00
|
|
|
}
|
2016-07-01 17:39:04 +00:00
|
|
|
memcpy_pic(overlay.source->planes[0], (char *)p + offset, w * 4, h,
|
|
|
|
overlay.source->stride[0], stride);
|
|
|
|
if (map_size)
|
|
|
|
munmap(p, map_size);
|
|
|
|
|
2014-10-02 23:22:07 +00:00
|
|
|
replace_overlay(mpctx, id, &overlay);
|
2014-01-18 00:19:20 +00:00
|
|
|
r = 0;
|
|
|
|
error:
|
|
|
|
return r;
|
2013-09-30 20:27:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void overlay_remove(struct MPContext *mpctx, int id)
|
|
|
|
{
|
|
|
|
struct command_ctx *cmd = mpctx->command_ctx;
|
2014-10-02 23:22:07 +00:00
|
|
|
if (id >= 0 && id < cmd->num_overlays)
|
|
|
|
replace_overlay(mpctx, id, &(struct overlay){0});
|
2013-09-30 20:27:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void overlay_uninit(struct MPContext *mpctx)
|
|
|
|
{
|
2014-07-25 12:22:40 +00:00
|
|
|
struct command_ctx *cmd = mpctx->command_ctx;
|
2014-01-18 16:59:34 +00:00
|
|
|
if (!mpctx->osd)
|
|
|
|
return;
|
2014-07-25 12:22:40 +00:00
|
|
|
for (int id = 0; id < cmd->num_overlays; id++)
|
2013-09-30 20:27:37 +00:00
|
|
|
overlay_remove(mpctx, id);
|
2014-01-18 00:19:20 +00:00
|
|
|
osd_set_external2(mpctx->osd, NULL);
|
2016-07-01 17:39:04 +00:00
|
|
|
for (int n = 0; n < 2; n++)
|
|
|
|
mp_image_unrefp(&cmd->overlay_osd[n].packed);
|
2013-09-30 20:27:37 +00:00
|
|
|
}
|
|
|
|
|
2013-11-29 23:18:24 +00:00
|
|
|
struct cycle_counter {
|
|
|
|
char **args;
|
|
|
|
int counter;
|
|
|
|
};
|
|
|
|
|
|
|
|
static bool stringlist_equals(char **l1, char **l2)
|
|
|
|
{
|
|
|
|
assert(l1 && l2);
|
|
|
|
for (int i = 0; ; i++) {
|
|
|
|
if (!l1[i] && !l2[i])
|
|
|
|
return true;
|
|
|
|
if (!l1[i] || !l2[i])
|
|
|
|
return false;
|
|
|
|
if (strcmp(l1[i], l2[i]) != 0)
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static char **stringlist_dup(void *talloc_ctx, char **list)
|
|
|
|
{
|
|
|
|
int num = 0;
|
|
|
|
char **res = NULL;
|
|
|
|
for (int i = 0; list && list[i]; i++)
|
|
|
|
MP_TARRAY_APPEND(talloc_ctx, res, num, talloc_strdup(talloc_ctx, list[i]));
|
|
|
|
MP_TARRAY_APPEND(talloc_ctx, res, num, NULL);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int *get_cmd_cycle_counter(struct MPContext *mpctx, char **args)
|
|
|
|
{
|
|
|
|
struct command_ctx *cmd = mpctx->command_ctx;
|
|
|
|
for (int n = 0; n < cmd->num_cycle_counters; n++) {
|
|
|
|
struct cycle_counter *ctr = &cmd->cycle_counters[n];
|
|
|
|
if (stringlist_equals(ctr->args, args))
|
|
|
|
return &ctr->counter;
|
|
|
|
}
|
2014-10-21 21:55:32 +00:00
|
|
|
struct cycle_counter ctr = {stringlist_dup(cmd, args), -1};
|
2013-11-29 23:18:24 +00:00
|
|
|
MP_TARRAY_APPEND(cmd, cmd->cycle_counters, cmd->num_cycle_counters, ctr);
|
|
|
|
return &cmd->cycle_counters[cmd->num_cycle_counters - 1].counter;
|
|
|
|
}
|
|
|
|
|
2013-10-31 22:23:38 +00:00
|
|
|
static int mp_property_multiply(char *property, double f, struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
union m_option_value val = {0};
|
|
|
|
struct m_option opt = {0};
|
|
|
|
int r;
|
|
|
|
|
player: more option/property consistency fixes
Some properties had a different type from their equivalent options (such
as mute, volume, deinterlace, edition). This wasn't really sane, as raw
option values should be always within their bounds. On the other hand,
these properties use a different type to reflect runtime limits (such as
range of available editions), or simply to improve the "UI" (you don't
want to cycle throuhg the completely useless "auto" value when cycling
the "mute" property).
Handle this by making them always return the option type, but also
allowing them to provide a "constricted" type, which is used for UI
purposes. All M_PROPERTY_GET_CONSTRICTED_TYPE changes are related to
this.
One consequence is that you can set the volume property to arbitrary
high values just like with the --volume option, but using the "add"
command it still restricts it to the --volume-max range.
Also deprecate --chapter, as it is grossly incompatible to the chapter
property. We pondered renaming it to --chapters, or introducing a more
powerful --range option, but concluded that --start --end is actually
enough.
These changes appear to take care of the last gross property/option
incompatibilities, although there might still be a few lurking.
2016-09-18 14:06:12 +00:00
|
|
|
r = mp_property_do(property, M_PROPERTY_GET_CONSTRICTED_TYPE, &opt, mpctx);
|
2013-10-31 22:23:38 +00:00
|
|
|
if (r != M_PROPERTY_OK)
|
|
|
|
return r;
|
|
|
|
assert(opt.type);
|
|
|
|
|
|
|
|
if (!opt.type->multiply)
|
|
|
|
return M_PROPERTY_NOT_IMPLEMENTED;
|
|
|
|
|
|
|
|
r = mp_property_do(property, M_PROPERTY_GET, &val, mpctx);
|
|
|
|
if (r != M_PROPERTY_OK)
|
|
|
|
return r;
|
|
|
|
opt.type->multiply(&opt, &val, f);
|
|
|
|
r = mp_property_do(property, M_PROPERTY_SET, &val, mpctx);
|
|
|
|
m_option_free(&opt, &val);
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2014-10-23 11:11:41 +00:00
|
|
|
static struct track *find_track_with_url(struct MPContext *mpctx, int type,
|
|
|
|
const char *url)
|
|
|
|
{
|
|
|
|
for (int n = 0; n < mpctx->num_tracks; n++) {
|
|
|
|
struct track *track = mpctx->tracks[n];
|
|
|
|
if (track && track->type == type && track->is_external &&
|
|
|
|
strcmp(track->external_filename, url) == 0)
|
|
|
|
return track;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2013-10-27 23:33:52 +00:00
|
|
|
// Whether this property should react to key events generated by auto-repeat.
|
|
|
|
static bool check_property_autorepeat(char *property, struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
struct m_option prop = {0};
|
|
|
|
if (mp_property_do(property, M_PROPERTY_GET_TYPE, &prop, mpctx) <= 0)
|
|
|
|
return true;
|
|
|
|
|
|
|
|
// This is a heuristic at best.
|
|
|
|
if (prop.type == &m_option_type_flag || prop.type == &m_option_type_choice)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2017-04-25 08:03:06 +00:00
|
|
|
// Whether changes to this property (add/cycle cmds) benefit from cmd->scale
|
|
|
|
static bool check_property_scalable(char *property, struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
struct m_option prop = {0};
|
|
|
|
if (mp_property_do(property, M_PROPERTY_GET_TYPE, &prop, mpctx) <= 0)
|
|
|
|
return true;
|
|
|
|
|
|
|
|
// These properties are backed by a floating-point number
|
|
|
|
return prop.type == &m_option_type_float ||
|
|
|
|
prop.type == &m_option_type_double ||
|
|
|
|
prop.type == &m_option_type_time ||
|
|
|
|
prop.type == &m_option_type_aspect;
|
|
|
|
}
|
|
|
|
|
2015-04-20 21:11:03 +00:00
|
|
|
static struct mpv_node *add_map_entry(struct mpv_node *dst, const char *key)
|
|
|
|
{
|
|
|
|
struct mpv_node_list *list = dst->u.list;
|
|
|
|
assert(dst->format == MPV_FORMAT_NODE_MAP && dst->u.list);
|
|
|
|
MP_TARRAY_GROW(list, list->values, list->num);
|
|
|
|
MP_TARRAY_GROW(list, list->keys, list->num);
|
|
|
|
list->keys[list->num] = talloc_strdup(list, key);
|
|
|
|
return &list->values[list->num++];
|
|
|
|
}
|
|
|
|
|
|
|
|
#define ADD_MAP_INT(dst, name, i) (*add_map_entry(dst, name) = \
|
|
|
|
(struct mpv_node){ .format = MPV_FORMAT_INT64, .u.int64 = (i) });
|
|
|
|
|
|
|
|
#define ADD_MAP_CSTR(dst, name, s) (*add_map_entry(dst, name) = \
|
|
|
|
(struct mpv_node){ .format = MPV_FORMAT_STRING, .u.string = (s) });
|
|
|
|
|
2015-04-20 21:00:12 +00:00
|
|
|
int run_command(struct MPContext *mpctx, struct mp_cmd *cmd, struct mpv_node *res)
|
2007-02-21 00:49:24 +00:00
|
|
|
{
|
2013-12-01 01:07:32 +00:00
|
|
|
struct command_ctx *cmdctx = mpctx->command_ctx;
|
2013-07-27 19:24:54 +00:00
|
|
|
struct MPOpts *opts = mpctx->opts;
|
2009-03-29 23:06:58 +00:00
|
|
|
int osd_duration = opts->osd_duration;
|
2013-12-15 22:35:36 +00:00
|
|
|
int on_osd = cmd->flags & MP_ON_OSD_FLAGS;
|
|
|
|
bool auto_osd = on_osd == MP_ON_OSD_AUTO;
|
|
|
|
bool msg_osd = auto_osd || (on_osd & MP_ON_OSD_MSG);
|
|
|
|
bool bar_osd = auto_osd || (on_osd & MP_ON_OSD_BAR);
|
2013-10-02 19:05:04 +00:00
|
|
|
bool msg_or_nobar_osd = msg_osd && !(auto_osd && opts->osd_bar_visible);
|
2012-09-25 01:24:38 +00:00
|
|
|
int osdl = msg_osd ? 1 : OSD_LEVEL_INVISIBLE;
|
player: make screenshot commands honor the async flag
And also change input.conf to make all screenshots async. (Except the
every-frame mode, which always uses synchronous mode and ignores the
flag.) By default, the "screenshot" command is still asynchronous,
because scripts etc. might depend on this behavior.
This is only partially async. The code for determining the filename is
still always run synchronously. Only encoding the screenshot and writing
it to disk is asynchronous. We explicitly document the exact behavior as
undefined, so it can be changed any time.
Some of this is a bit messy, because I wanted to avoid duplicating the
message display code between sync and async mode. In async mode, this is
called from a worker thread, which is not safe because showing a message
accesses the thread-unsafe OSD code. So the core has to be locked during
this, which implies accessing the core and all that. So the code has
weird locking calls, and we need to do core destruction in a more
"controlled" manner (thus the outstanding_async field).
(What I'd really want would be the OSD simply showing log messages
instead.)
This is pretty untested, so expect bugs.
Fixes #4250.
2017-04-01 18:45:20 +00:00
|
|
|
bool async = cmd->flags & MP_ASYNC_CMD;
|
2013-05-18 10:56:22 +00:00
|
|
|
|
2016-09-11 17:45:11 +00:00
|
|
|
mp_cmd_dump(mpctx->log, cmd->id == MP_CMD_IGNORE ? MSGL_DEBUG : MSGL_V,
|
|
|
|
"Run command:", cmd);
|
2014-10-23 12:40:38 +00:00
|
|
|
|
2013-12-15 22:35:36 +00:00
|
|
|
if (cmd->flags & MP_EXPAND_PROPERTIES) {
|
2013-05-18 10:56:22 +00:00
|
|
|
for (int n = 0; n < cmd->nargs; n++) {
|
2013-11-28 18:04:16 +00:00
|
|
|
if (cmd->args[n].type->type == CONF_TYPE_STRING) {
|
2014-02-23 16:43:38 +00:00
|
|
|
char *s = mp_property_expand_string(mpctx, cmd->args[n].v.s);
|
|
|
|
if (!s)
|
2014-06-01 01:41:46 +00:00
|
|
|
return -1;
|
2014-02-23 16:43:38 +00:00
|
|
|
talloc_free(cmd->args[n].v.s);
|
|
|
|
cmd->args[n].v.s = s;
|
2013-05-18 10:56:22 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-08-07 01:45:40 +00:00
|
|
|
switch (cmd->id) {
|
|
|
|
case MP_CMD_SEEK: {
|
2013-07-25 16:08:57 +00:00
|
|
|
double v = cmd->args[0].v.d * cmd->scale;
|
2015-03-04 16:21:02 +00:00
|
|
|
int abs = cmd->args[1].v.i & 3;
|
2015-03-04 16:21:05 +00:00
|
|
|
enum seek_precision precision = MPSEEK_DEFAULT;
|
|
|
|
switch (((cmd->args[2].v.i | cmd->args[1].v.i) >> 3) & 3) {
|
|
|
|
case 1: precision = MPSEEK_KEYFRAME; break;
|
|
|
|
case 2: precision = MPSEEK_EXACT; break;
|
2015-03-04 16:21:02 +00:00
|
|
|
}
|
2015-05-26 19:42:34 +00:00
|
|
|
if (!mpctx->playback_initialized)
|
2014-09-01 19:44:54 +00:00
|
|
|
return -1;
|
2013-12-01 01:07:32 +00:00
|
|
|
mark_seek(mpctx);
|
2015-05-20 11:26:36 +00:00
|
|
|
switch (abs) {
|
|
|
|
case 0: { // Relative seek
|
2016-08-15 19:07:32 +00:00
|
|
|
queue_seek(mpctx, MPSEEK_RELATIVE, v, precision, MPSEEK_FLAG_DELAY);
|
2015-05-20 11:26:36 +00:00
|
|
|
set_osd_function(mpctx, (v > 0) ? OSD_FFW : OSD_REW);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case 1: { // Absolute seek by percentage
|
|
|
|
double ratio = v / 100.0;
|
|
|
|
double cur_pos = get_current_pos_ratio(mpctx, false);
|
2016-08-15 19:07:32 +00:00
|
|
|
queue_seek(mpctx, MPSEEK_FACTOR, ratio, precision, MPSEEK_FLAG_DELAY);
|
2015-05-20 11:26:36 +00:00
|
|
|
set_osd_function(mpctx, cur_pos < ratio ? OSD_FFW : OSD_REW);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case 2: { // Absolute seek to a timestamp in seconds
|
2016-10-01 18:51:17 +00:00
|
|
|
if (v < 0) {
|
|
|
|
// Seek from end
|
|
|
|
double len = get_time_length(mpctx);
|
|
|
|
if (len < 0)
|
|
|
|
return -1;
|
|
|
|
v = MPMAX(0, len + v);
|
|
|
|
}
|
2016-08-15 19:07:32 +00:00
|
|
|
queue_seek(mpctx, MPSEEK_ABSOLUTE, v, precision, MPSEEK_FLAG_DELAY);
|
2012-11-20 16:20:45 +00:00
|
|
|
set_osd_function(mpctx,
|
|
|
|
v > get_current_time(mpctx) ? OSD_FFW : OSD_REW);
|
2015-05-20 11:26:36 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
case 3: { // Relative seek by percentage
|
2015-05-18 20:56:56 +00:00
|
|
|
queue_seek(mpctx, MPSEEK_FACTOR,
|
|
|
|
get_current_pos_ratio(mpctx, false) + v / 100.0,
|
2016-08-15 19:07:32 +00:00
|
|
|
precision, MPSEEK_FLAG_DELAY);
|
2015-05-18 20:56:56 +00:00
|
|
|
set_osd_function(mpctx, v > 0 ? OSD_FFW : OSD_REW);
|
2015-05-20 11:26:36 +00:00
|
|
|
break;
|
|
|
|
}}
|
2012-09-25 01:24:38 +00:00
|
|
|
if (bar_osd)
|
|
|
|
mpctx->add_osd_seek_info |= OSD_SEEK_INFO_BAR;
|
2013-10-02 19:05:04 +00:00
|
|
|
if (msg_or_nobar_osd)
|
2012-09-25 01:24:38 +00:00
|
|
|
mpctx->add_osd_seek_info |= OSD_SEEK_INFO_TEXT;
|
2011-08-07 01:45:40 +00:00
|
|
|
break;
|
|
|
|
}
|
2007-02-21 00:49:24 +00:00
|
|
|
|
2013-12-01 01:07:32 +00:00
|
|
|
case MP_CMD_REVERT_SEEK: {
|
2015-05-26 19:42:34 +00:00
|
|
|
if (!mpctx->playback_initialized)
|
2014-09-01 19:44:54 +00:00
|
|
|
return -1;
|
2013-12-01 01:07:32 +00:00
|
|
|
double oldpts = cmdctx->last_seek_pts;
|
2014-12-17 21:56:45 +00:00
|
|
|
if (cmdctx->marked_pts != MP_NOPTS_VALUE)
|
|
|
|
oldpts = cmdctx->marked_pts;
|
|
|
|
if (cmd->args[0].v.i == 1) {
|
|
|
|
cmdctx->marked_pts = get_current_time(mpctx);
|
|
|
|
} else if (oldpts != MP_NOPTS_VALUE) {
|
2013-12-01 01:07:32 +00:00
|
|
|
cmdctx->last_seek_pts = get_current_time(mpctx);
|
2014-12-17 21:56:45 +00:00
|
|
|
cmdctx->marked_pts = MP_NOPTS_VALUE;
|
2016-08-15 19:07:32 +00:00
|
|
|
queue_seek(mpctx, MPSEEK_ABSOLUTE, oldpts, MPSEEK_EXACT,
|
|
|
|
MPSEEK_FLAG_DELAY);
|
2013-12-01 01:07:32 +00:00
|
|
|
set_osd_function(mpctx, OSD_REW);
|
|
|
|
if (bar_osd)
|
|
|
|
mpctx->add_osd_seek_info |= OSD_SEEK_INFO_BAR;
|
|
|
|
if (msg_or_nobar_osd)
|
|
|
|
mpctx->add_osd_seek_info |= OSD_SEEK_INFO_TEXT;
|
2014-06-01 01:41:46 +00:00
|
|
|
} else {
|
|
|
|
return -1;
|
2013-12-01 01:07:32 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2012-09-09 00:08:08 +00:00
|
|
|
case MP_CMD_SET: {
|
2012-09-22 06:04:08 +00:00
|
|
|
int r = mp_property_do(cmd->args[0].v.s, M_PROPERTY_SET_STRING,
|
2011-08-07 01:45:40 +00:00
|
|
|
cmd->args[1].v.s, mpctx);
|
2013-02-16 20:37:00 +00:00
|
|
|
if (r == M_PROPERTY_OK || r == M_PROPERTY_UNAVAILABLE) {
|
2013-12-15 22:35:36 +00:00
|
|
|
show_property_osd(mpctx, cmd->args[0].v.s, on_osd);
|
2013-02-16 20:37:00 +00:00
|
|
|
} else if (r == M_PROPERTY_UNKNOWN) {
|
2014-01-17 21:34:47 +00:00
|
|
|
set_osd_msg(mpctx, osdl, osd_duration,
|
2013-10-12 16:42:42 +00:00
|
|
|
"Unknown property: '%s'", cmd->args[0].v.s);
|
2014-06-01 01:41:46 +00:00
|
|
|
return -1;
|
2013-02-16 20:37:00 +00:00
|
|
|
} else if (r <= 0) {
|
2014-01-17 21:34:47 +00:00
|
|
|
set_osd_msg(mpctx, osdl, osd_duration,
|
2013-10-12 16:42:42 +00:00
|
|
|
"Failed to set property '%s' to '%s'",
|
|
|
|
cmd->args[0].v.s, cmd->args[1].v.s);
|
2014-06-01 01:41:46 +00:00
|
|
|
return -1;
|
2013-02-16 20:37:00 +00:00
|
|
|
}
|
2011-08-07 01:45:40 +00:00
|
|
|
break;
|
|
|
|
}
|
2007-02-21 00:49:24 +00:00
|
|
|
|
input: change license to LGPL
cehoyos adds the step_property command in 7a71da01d, and it could be
argued that copyright of this still applies to the later add/cycle
commands (a668ae0ff90c4). While I'm not sure if this is really the case,
stay conservative for now and mark these commands as GPL-only. Mark the
command.c code too, although that is not being relicensed yet.
I'm leaving the MP_CMD_* enum items, as they are obviously different.
In commit 116ca0c7682, "veal" (essentially an anonymous author) adds an
"osd_show_property_text" command (well, the commit message says "based
on" that person's code, so it's not clear how much is from him or from
albeu, who agreed to LGPL). This was later merged again with the
"osd_show_text" command, and then all original code was removed in
commit 58cc0f637f, so I claim that no copyright applies anymore. (Though
technically the input.conf addition still might be copyrighted, so I'm
just dropping it to get rid of the thought.)
"kiriuja" added 2f376d1b39 (sub_load etc.) and be54f4813 (switch_audio).
The latter is gone. I would argue that the former is fully rewritten
with commits b7052b431c9 and 0f155921b0. But like in the step_property
case, I will be overly conservative for now, and mark them as GPL-only,
as this is potentially shaky and should be thought through first. (Not
bothering with the command define/enum in the header, as it will be
unused in LGPL mode anyway.)
keycodes.c/h can be GPL, except for commit 2b1f95dcc2f8, which is a
patch by someone who wasn't asked yet. Before doing something radical, I
will wait for a reply.
2017-06-19 11:02:35 +00:00
|
|
|
#if HAVE_GPL
|
2017-06-23 13:21:06 +00:00
|
|
|
// Possibly GPL due to 7a71da01d64374ce22b430590f3df32c881288bd.
|
2012-09-22 04:15:36 +00:00
|
|
|
case MP_CMD_ADD:
|
|
|
|
case MP_CMD_CYCLE:
|
|
|
|
{
|
2015-09-10 12:15:12 +00:00
|
|
|
char *property = cmd->args[0].v.s;
|
2013-10-27 23:33:52 +00:00
|
|
|
if (cmd->repeated && !check_property_autorepeat(property, mpctx)) {
|
2013-12-19 20:28:55 +00:00
|
|
|
MP_VERBOSE(mpctx, "Dropping command '%.*s' from auto-repeated key.\n",
|
|
|
|
BSTR_P(cmd->original));
|
2013-10-27 23:33:52 +00:00
|
|
|
break;
|
|
|
|
}
|
2017-04-25 08:03:06 +00:00
|
|
|
double scale = 1;
|
|
|
|
int scale_units = cmd->scale_units;
|
|
|
|
if (check_property_scalable(property, mpctx)) {
|
|
|
|
scale = cmd->scale;
|
|
|
|
scale_units = 1;
|
|
|
|
}
|
|
|
|
for (int i = 0; i < scale_units; i++) {
|
|
|
|
struct m_property_switch_arg s = {
|
|
|
|
.inc = cmd->args[1].v.d * scale,
|
|
|
|
.wrap = cmd->id == MP_CMD_CYCLE,
|
|
|
|
};
|
|
|
|
int r = mp_property_do(property, M_PROPERTY_SWITCH, &s, mpctx);
|
|
|
|
if (r == M_PROPERTY_OK || r == M_PROPERTY_UNAVAILABLE) {
|
|
|
|
show_property_osd(mpctx, property, on_osd);
|
|
|
|
} else if (r == M_PROPERTY_UNKNOWN) {
|
|
|
|
set_osd_msg(mpctx, osdl, osd_duration,
|
|
|
|
"Unknown property: '%s'", property);
|
|
|
|
return -1;
|
|
|
|
} else if (r <= 0) {
|
|
|
|
set_osd_msg(mpctx, osdl, osd_duration,
|
|
|
|
"Failed to increment property '%s' by %g",
|
|
|
|
property, s.inc);
|
|
|
|
return -1;
|
|
|
|
}
|
2013-02-16 20:37:00 +00:00
|
|
|
}
|
2011-08-07 01:45:40 +00:00
|
|
|
break;
|
|
|
|
}
|
input: change license to LGPL
cehoyos adds the step_property command in 7a71da01d, and it could be
argued that copyright of this still applies to the later add/cycle
commands (a668ae0ff90c4). While I'm not sure if this is really the case,
stay conservative for now and mark these commands as GPL-only. Mark the
command.c code too, although that is not being relicensed yet.
I'm leaving the MP_CMD_* enum items, as they are obviously different.
In commit 116ca0c7682, "veal" (essentially an anonymous author) adds an
"osd_show_property_text" command (well, the commit message says "based
on" that person's code, so it's not clear how much is from him or from
albeu, who agreed to LGPL). This was later merged again with the
"osd_show_text" command, and then all original code was removed in
commit 58cc0f637f, so I claim that no copyright applies anymore. (Though
technically the input.conf addition still might be copyrighted, so I'm
just dropping it to get rid of the thought.)
"kiriuja" added 2f376d1b39 (sub_load etc.) and be54f4813 (switch_audio).
The latter is gone. I would argue that the former is fully rewritten
with commits b7052b431c9 and 0f155921b0. But like in the step_property
case, I will be overly conservative for now, and mark them as GPL-only,
as this is potentially shaky and should be thought through first. (Not
bothering with the command define/enum in the header, as it will be
unused in LGPL mode anyway.)
keycodes.c/h can be GPL, except for commit 2b1f95dcc2f8, which is a
patch by someone who wasn't asked yet. Before doing something radical, I
will wait for a reply.
2017-06-19 11:02:35 +00:00
|
|
|
#endif
|
2010-05-03 23:34:38 +00:00
|
|
|
|
2013-10-31 22:23:38 +00:00
|
|
|
case MP_CMD_MULTIPLY: {
|
|
|
|
char *property = cmd->args[0].v.s;
|
|
|
|
double f = cmd->args[1].v.d;
|
|
|
|
int r = mp_property_multiply(property, f, mpctx);
|
|
|
|
|
|
|
|
if (r == M_PROPERTY_OK || r == M_PROPERTY_UNAVAILABLE) {
|
2013-12-15 22:35:36 +00:00
|
|
|
show_property_osd(mpctx, property, on_osd);
|
2013-10-31 22:23:38 +00:00
|
|
|
} else if (r == M_PROPERTY_UNKNOWN) {
|
2014-01-17 21:34:47 +00:00
|
|
|
set_osd_msg(mpctx, osdl, osd_duration,
|
2013-10-31 22:23:38 +00:00
|
|
|
"Unknown property: '%s'", property);
|
2014-06-01 01:41:46 +00:00
|
|
|
return -1;
|
2013-10-31 22:23:38 +00:00
|
|
|
} else if (r <= 0) {
|
2014-01-17 21:34:47 +00:00
|
|
|
set_osd_msg(mpctx, osdl, osd_duration,
|
2013-10-31 22:23:38 +00:00
|
|
|
"Failed to multiply property '%s' by %g", property, f);
|
2014-06-01 01:41:46 +00:00
|
|
|
return -1;
|
2013-10-31 22:23:38 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2013-11-29 23:18:24 +00:00
|
|
|
case MP_CMD_CYCLE_VALUES: {
|
|
|
|
char *args[MP_CMD_MAX_ARGS + 1] = {0};
|
|
|
|
for (int n = 0; n < cmd->nargs; n++)
|
|
|
|
args[n] = cmd->args[n].v.s;
|
|
|
|
int first = 1, dir = 1;
|
|
|
|
if (strcmp(args[0], "!reverse") == 0) {
|
|
|
|
first += 1;
|
|
|
|
dir = -1;
|
|
|
|
}
|
|
|
|
int *ptr = get_cmd_cycle_counter(mpctx, &args[first - 1]);
|
|
|
|
int count = cmd->nargs - first;
|
|
|
|
if (ptr && count > 0) {
|
2014-10-21 21:55:32 +00:00
|
|
|
*ptr = *ptr < 0 ? (dir > 0 ? 0 : -1) : *ptr + dir;
|
2013-11-29 23:18:24 +00:00
|
|
|
if (*ptr >= count)
|
|
|
|
*ptr = 0;
|
|
|
|
if (*ptr < 0)
|
|
|
|
*ptr = count - 1;
|
|
|
|
char *property = args[first - 1];
|
2014-10-21 21:55:32 +00:00
|
|
|
char *value = args[first + *ptr];
|
2013-11-29 23:18:24 +00:00
|
|
|
int r = mp_property_do(property, M_PROPERTY_SET_STRING, value, mpctx);
|
|
|
|
if (r == M_PROPERTY_OK || r == M_PROPERTY_UNAVAILABLE) {
|
2013-12-15 22:35:36 +00:00
|
|
|
show_property_osd(mpctx, property, on_osd);
|
2013-11-29 23:18:24 +00:00
|
|
|
} else if (r == M_PROPERTY_UNKNOWN) {
|
2014-01-17 21:34:47 +00:00
|
|
|
set_osd_msg(mpctx, osdl, osd_duration,
|
2013-11-29 23:18:24 +00:00
|
|
|
"Unknown property: '%s'", property);
|
2014-06-01 01:41:46 +00:00
|
|
|
return -1;
|
2013-11-29 23:18:24 +00:00
|
|
|
} else if (r <= 0) {
|
2014-01-17 21:34:47 +00:00
|
|
|
set_osd_msg(mpctx, osdl, osd_duration,
|
2013-11-29 23:18:24 +00:00
|
|
|
"Failed to set property '%s' to '%s'",
|
|
|
|
property, value);
|
2014-06-01 01:41:46 +00:00
|
|
|
return -1;
|
2013-11-29 23:18:24 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2011-08-07 01:45:40 +00:00
|
|
|
case MP_CMD_FRAME_STEP:
|
2015-05-26 19:42:34 +00:00
|
|
|
if (!mpctx->playback_initialized)
|
2014-09-01 19:44:54 +00:00
|
|
|
return -1;
|
2014-11-23 14:30:36 +00:00
|
|
|
if (cmd->is_up_down) {
|
|
|
|
if (cmd->is_up) {
|
|
|
|
if (mpctx->step_frames < 1)
|
2017-04-14 16:22:45 +00:00
|
|
|
set_pause_state(mpctx, true);
|
2014-11-23 14:30:36 +00:00
|
|
|
} else {
|
|
|
|
if (cmd->repeated) {
|
2017-04-14 16:22:45 +00:00
|
|
|
set_pause_state(mpctx, false);
|
2014-11-23 14:30:36 +00:00
|
|
|
} else {
|
|
|
|
add_step_frame(mpctx, 1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
add_step_frame(mpctx, 1);
|
|
|
|
}
|
core: add backstep support
Allows stepping back one frame via the frame_back_step inout command,
bound to "," by default.
This uses the precise seeking facility, and a perfect frame index built
on the fly. The index is built during playback and precise seeking, and
contains (as of this commit) the last 100 displayed or skipped frames.
This index is used to find the PTS of the previous frame, which is then
used as target for a precise seek. If no PTS is found, the core attempts
to do a seek before the current frame, and skip decoded frames until the
current frame is reached; this will create a sufficient index and the
normal backstep algorithm can be applied.
This can be rather slow. The worst case for backstepping is about the
same as the worst case for precise seeking if the previous frame can be
deduced from the index. If not, the worst case will be twice as slow.
There's also some minor danger that the index is incorrect in case
framedropping is involved. For framedropping due to --framedrop, this
problem is ignored (use of --framedrop is discouraged anyway). For
framedropping during precise seeking (done to make it faster), we try
to not add frames to the index that are produced when this can happen.
I'm not sure how well that works (or if the logic is sane), and it's
sure to break with some video filters. In the worst case, backstepping
might silently skip frames if you backstep after a user-initiated
precise seek. (Precise seeks to do indexing are not affected.)
Likewise, video filters that somehow change timing of frames and do not
do this in a deterministic way (i.e. if you seek to a position, frames
with different timings are produced than when the position is reached
during normal playback) will make backstepping silently jump to the
wrong frame. Enabling/disabling filters during playback (like for
example deinterlacing) will have similar bad effects.
2013-04-24 17:31:48 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case MP_CMD_FRAME_BACK_STEP:
|
2015-05-26 19:42:34 +00:00
|
|
|
if (!mpctx->playback_initialized)
|
2014-09-01 19:44:54 +00:00
|
|
|
return -1;
|
core: add backstep support
Allows stepping back one frame via the frame_back_step inout command,
bound to "," by default.
This uses the precise seeking facility, and a perfect frame index built
on the fly. The index is built during playback and precise seeking, and
contains (as of this commit) the last 100 displayed or skipped frames.
This index is used to find the PTS of the previous frame, which is then
used as target for a precise seek. If no PTS is found, the core attempts
to do a seek before the current frame, and skip decoded frames until the
current frame is reached; this will create a sufficient index and the
normal backstep algorithm can be applied.
This can be rather slow. The worst case for backstepping is about the
same as the worst case for precise seeking if the previous frame can be
deduced from the index. If not, the worst case will be twice as slow.
There's also some minor danger that the index is incorrect in case
framedropping is involved. For framedropping due to --framedrop, this
problem is ignored (use of --framedrop is discouraged anyway). For
framedropping during precise seeking (done to make it faster), we try
to not add frames to the index that are produced when this can happen.
I'm not sure how well that works (or if the logic is sane), and it's
sure to break with some video filters. In the worst case, backstepping
might silently skip frames if you backstep after a user-initiated
precise seek. (Precise seeks to do indexing are not affected.)
Likewise, video filters that somehow change timing of frames and do not
do this in a deterministic way (i.e. if you seek to a position, frames
with different timings are produced than when the position is reached
during normal playback) will make backstepping silently jump to the
wrong frame. Enabling/disabling filters during playback (like for
example deinterlacing) will have similar bad effects.
2013-04-24 17:31:48 +00:00
|
|
|
add_step_frame(mpctx, -1);
|
2011-08-07 01:45:40 +00:00
|
|
|
break;
|
2010-05-03 23:34:38 +00:00
|
|
|
|
2011-08-07 01:45:40 +00:00
|
|
|
case MP_CMD_QUIT:
|
2014-05-22 19:28:20 +00:00
|
|
|
case MP_CMD_QUIT_WATCH_LATER:
|
2014-10-10 12:44:22 +00:00
|
|
|
if (cmd->id == MP_CMD_QUIT_WATCH_LATER || opts->position_save_on_quit)
|
2014-05-22 19:28:20 +00:00
|
|
|
mp_write_watch_later_conf(mpctx);
|
2012-08-04 01:46:11 +00:00
|
|
|
mpctx->stop_play = PT_QUIT;
|
2013-08-02 08:32:38 +00:00
|
|
|
mpctx->quit_custom_rc = cmd->args[0].v.i;
|
|
|
|
mpctx->has_quit_custom_rc = true;
|
2016-09-16 12:24:15 +00:00
|
|
|
mp_wakeup_core(mpctx);
|
2012-08-04 01:46:11 +00:00
|
|
|
break;
|
2010-05-03 23:34:38 +00:00
|
|
|
|
mplayer: turn playtree into a list, and change per-file option handling
Summary:
- There is no playtree anymore. It's reduced to a simple list.
- Options are now always global. You can still have per-file options,
but these are optional and require special syntax.
- The slave command pt_step has been removed, and playlist_next
and playlist_prev added. (See etc/input.conf changes.)
This is a user visible incompatible change, and will break slave-mode
applications.
- The pt_clear slave command is renamed to playlist_clear.
- Playtree entries could have multiple files. This is not the case
anymore, and playlist entries have always exactly one entry. Whenever
something adds more than one file (like ASX playlists or dvd:// or
dvdnav:// on the command line), all files are added as separate
playlist entries.
Note that some of the changes are quite deep and violent. Expect
regressions.
The playlist parsing code in particular is of low quality. I didn't try
to improve it, and merely spent to least effort necessary to keep it
somehow working. (Especially ASX playlist handling.)
The playtree code was complicated and bloated. It was also barely used.
Most users don't even know that mplayer manages the playlist as tree,
or how to use it. The most obscure features was probably specifying a
tree on command line (with '{' and '}' to create/close tree nodes). It
filled the player code with complexity and confused users with weird
slave commands like pt_up.
Replace the playtree with a simple flat playlist. Playlist parsers that
actually return trees are changed to append all files to the playlist
pre-order.
It used to be the responsibility of the playtree code to change per-file
config options. Now this is done by the player core, and the playlist
code is free of such details.
Options are not per-file by default anymore. This was a very obscure and
complicated feature that confused even experienced users. Consider the
following command line:
mplayer file1.mkv file2.mkv --no-audio file3.mkv
This will disable the audio for file2.mkv only, because options are
per-file by default. To make the option affect all files, you're
supposed to put it before the first file.
This is bad, because normally you don't need per-file options. They are
very rarely needed, and the only reasonable use cases I can imagine are
use of the encode backend (mplayer encode branch), or for debugging. The
normal use case is made harder, and the feature is perceived as bug.
Even worse, correct usage is hard to explain for users.
Make all options global by default. The position of an option isn't
significant anymore (except for options that compensate each other,
consider --shuffle --no-shuffle).
One other important change is that no options are reset anymore if a
new file is started. If you change settings with slave mode commands,
they will not be changed by playing a new file. (Exceptions include
settings that are too file specific, like audio/subtitle stream
selection.)
There is still some need for per-file options. Debugging and encoding
are use cases that profit from per-file options. Per-file profiles (as
well as per-protocol and per-VO/AO options) need the implementation
related mechanisms to backup and restore options when the playback file
changes.
Simplify the save-slot stuff, which is possible because there is no
hierarchical play tree anymore. Now there's a simple backup field.
Add a way to specify per-file options on command line. Example:
mplayer f1.mkv -o0 --{ -o1 f2.mkv -o2 f3.mkv --} f4.mkv -o3
will have the following options per file set:
f1.mkv, f4.mkv: -o0 -o3
f2.mkv, f3.mkv: -o0 -o3 -o1 -o2
The options --{ and --} start and end per-file options. All files inside
the { } will be affected by the options equally (similar to how global
options and multiple files are handled). When playback of a file starts,
the per-file options are set according to the command line. When
playback ends, the per-file options are restored to the values when
playback started.
2012-07-31 19:33:26 +00:00
|
|
|
case MP_CMD_PLAYLIST_NEXT:
|
|
|
|
case MP_CMD_PLAYLIST_PREV:
|
|
|
|
{
|
|
|
|
int dir = cmd->id == MP_CMD_PLAYLIST_PREV ? -1 : +1;
|
|
|
|
int force = cmd->args[0].v.i;
|
2011-08-07 01:45:40 +00:00
|
|
|
|
2017-01-18 18:02:50 +00:00
|
|
|
struct playlist_entry *e = mp_next_file(mpctx, dir, force, true);
|
mplayer: turn playtree into a list, and change per-file option handling
Summary:
- There is no playtree anymore. It's reduced to a simple list.
- Options are now always global. You can still have per-file options,
but these are optional and require special syntax.
- The slave command pt_step has been removed, and playlist_next
and playlist_prev added. (See etc/input.conf changes.)
This is a user visible incompatible change, and will break slave-mode
applications.
- The pt_clear slave command is renamed to playlist_clear.
- Playtree entries could have multiple files. This is not the case
anymore, and playlist entries have always exactly one entry. Whenever
something adds more than one file (like ASX playlists or dvd:// or
dvdnav:// on the command line), all files are added as separate
playlist entries.
Note that some of the changes are quite deep and violent. Expect
regressions.
The playlist parsing code in particular is of low quality. I didn't try
to improve it, and merely spent to least effort necessary to keep it
somehow working. (Especially ASX playlist handling.)
The playtree code was complicated and bloated. It was also barely used.
Most users don't even know that mplayer manages the playlist as tree,
or how to use it. The most obscure features was probably specifying a
tree on command line (with '{' and '}' to create/close tree nodes). It
filled the player code with complexity and confused users with weird
slave commands like pt_up.
Replace the playtree with a simple flat playlist. Playlist parsers that
actually return trees are changed to append all files to the playlist
pre-order.
It used to be the responsibility of the playtree code to change per-file
config options. Now this is done by the player core, and the playlist
code is free of such details.
Options are not per-file by default anymore. This was a very obscure and
complicated feature that confused even experienced users. Consider the
following command line:
mplayer file1.mkv file2.mkv --no-audio file3.mkv
This will disable the audio for file2.mkv only, because options are
per-file by default. To make the option affect all files, you're
supposed to put it before the first file.
This is bad, because normally you don't need per-file options. They are
very rarely needed, and the only reasonable use cases I can imagine are
use of the encode backend (mplayer encode branch), or for debugging. The
normal use case is made harder, and the feature is perceived as bug.
Even worse, correct usage is hard to explain for users.
Make all options global by default. The position of an option isn't
significant anymore (except for options that compensate each other,
consider --shuffle --no-shuffle).
One other important change is that no options are reset anymore if a
new file is started. If you change settings with slave mode commands,
they will not be changed by playing a new file. (Exceptions include
settings that are too file specific, like audio/subtitle stream
selection.)
There is still some need for per-file options. Debugging and encoding
are use cases that profit from per-file options. Per-file profiles (as
well as per-protocol and per-VO/AO options) need the implementation
related mechanisms to backup and restore options when the playback file
changes.
Simplify the save-slot stuff, which is possible because there is no
hierarchical play tree anymore. Now there's a simple backup field.
Add a way to specify per-file options on command line. Example:
mplayer f1.mkv -o0 --{ -o1 f2.mkv -o2 f3.mkv --} f4.mkv -o3
will have the following options per file set:
f1.mkv, f4.mkv: -o0 -o3
f2.mkv, f3.mkv: -o0 -o3 -o1 -o2
The options --{ and --} start and end per-file options. All files inside
the { } will be affected by the options equally (similar to how global
options and multiple files are handled). When playback of a file starts,
the per-file options are set according to the command line. When
playback ends, the per-file options are restored to the values when
playback started.
2012-07-31 19:33:26 +00:00
|
|
|
if (!e && !force)
|
2014-06-01 01:41:46 +00:00
|
|
|
return -1;
|
2013-11-03 05:06:45 +00:00
|
|
|
mp_set_playlist_entry(mpctx, e);
|
2014-11-11 21:07:16 +00:00
|
|
|
if (on_osd & MP_ON_OSD_MSG)
|
|
|
|
mpctx->add_osd_seek_info |= OSD_SEEK_INFO_CURRENT_FILE;
|
2011-08-07 01:45:40 +00:00
|
|
|
break;
|
|
|
|
}
|
2010-05-03 23:34:38 +00:00
|
|
|
|
2011-08-07 01:45:40 +00:00
|
|
|
case MP_CMD_SUB_STEP:
|
2013-12-24 16:46:14 +00:00
|
|
|
case MP_CMD_SUB_SEEK: {
|
2015-05-26 19:42:34 +00:00
|
|
|
if (!mpctx->playback_initialized)
|
2014-09-01 19:44:54 +00:00
|
|
|
return -1;
|
2016-01-17 15:56:32 +00:00
|
|
|
struct track *track = mpctx->current_track[0][STREAM_SUB];
|
|
|
|
struct dec_sub *sub = track ? track->d_sub : NULL;
|
2014-11-05 17:47:12 +00:00
|
|
|
double refpts = get_current_time(mpctx);
|
2015-11-17 00:54:02 +00:00
|
|
|
if (sub && refpts != MP_NOPTS_VALUE) {
|
2013-06-28 23:34:11 +00:00
|
|
|
double a[2];
|
2015-11-16 22:15:59 +00:00
|
|
|
a[0] = refpts - opts->sub_delay;
|
2013-06-28 23:34:11 +00:00
|
|
|
a[1] = cmd->args[0].v.i;
|
2015-11-17 00:54:02 +00:00
|
|
|
if (sub_control(sub, SD_CTRL_SUB_STEP, a) > 0) {
|
2013-10-02 19:05:04 +00:00
|
|
|
if (cmd->id == MP_CMD_SUB_STEP) {
|
2014-01-06 16:38:10 +00:00
|
|
|
opts->sub_delay -= a[0];
|
2016-09-15 12:22:48 +00:00
|
|
|
osd_changed(mpctx->osd);
|
2014-09-21 22:08:19 +00:00
|
|
|
show_property_osd(mpctx, "sub-delay", on_osd);
|
2013-10-02 19:05:04 +00:00
|
|
|
} else {
|
2013-10-07 15:16:03 +00:00
|
|
|
// We can easily get stuck by failing to seek to the video
|
|
|
|
// frame which actually shows the sub first (because video
|
|
|
|
// frame PTS and sub PTS rarely match exactly). Add some
|
|
|
|
// rounding for the mess of it.
|
2016-02-04 21:44:18 +00:00
|
|
|
a[0] += 0.01 * (a[1] >= 0 ? 1 : -1);
|
2013-12-01 01:07:32 +00:00
|
|
|
mark_seek(mpctx);
|
2016-08-15 19:07:32 +00:00
|
|
|
queue_seek(mpctx, MPSEEK_RELATIVE, a[0], MPSEEK_EXACT,
|
|
|
|
MPSEEK_FLAG_DELAY);
|
2013-10-02 19:05:04 +00:00
|
|
|
set_osd_function(mpctx, (a[0] > 0) ? OSD_FFW : OSD_REW);
|
|
|
|
if (bar_osd)
|
|
|
|
mpctx->add_osd_seek_info |= OSD_SEEK_INFO_BAR;
|
|
|
|
if (msg_or_nobar_osd)
|
|
|
|
mpctx->add_osd_seek_info |= OSD_SEEK_INFO_TEXT;
|
|
|
|
}
|
2012-09-01 17:49:04 +00:00
|
|
|
}
|
2011-08-07 01:45:40 +00:00
|
|
|
}
|
|
|
|
break;
|
2013-12-24 16:46:14 +00:00
|
|
|
}
|
2007-02-21 00:49:24 +00:00
|
|
|
|
2012-10-11 00:24:13 +00:00
|
|
|
case MP_CMD_PRINT_TEXT: {
|
2013-12-19 20:28:55 +00:00
|
|
|
MP_INFO(mpctx, "%s\n", cmd->args[0].v.s);
|
2012-10-11 00:24:13 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2012-09-15 00:04:57 +00:00
|
|
|
case MP_CMD_SHOW_TEXT: {
|
2013-05-18 10:56:22 +00:00
|
|
|
// if no argument supplied use default osd_duration, else <arg> ms.
|
2014-01-17 21:34:47 +00:00
|
|
|
set_osd_msg(mpctx, cmd->args[2].v.i,
|
2013-05-18 10:56:22 +00:00
|
|
|
(cmd->args[1].v.i < 0 ? osd_duration : cmd->args[1].v.i),
|
|
|
|
"%s", cmd->args[0].v.s);
|
2011-08-07 01:45:40 +00:00
|
|
|
break;
|
|
|
|
}
|
2010-05-03 23:34:38 +00:00
|
|
|
|
2017-03-26 17:29:10 +00:00
|
|
|
case MP_CMD_EXPAND_TEXT: {
|
|
|
|
if (!res)
|
|
|
|
return -1;
|
|
|
|
*res = (mpv_node){
|
|
|
|
.format = MPV_FORMAT_STRING,
|
|
|
|
.u.string = mp_property_expand_string(mpctx, cmd->args[0].v.s)
|
|
|
|
};
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2011-08-07 01:45:40 +00:00
|
|
|
case MP_CMD_LOADFILE: {
|
mplayer: turn playtree into a list, and change per-file option handling
Summary:
- There is no playtree anymore. It's reduced to a simple list.
- Options are now always global. You can still have per-file options,
but these are optional and require special syntax.
- The slave command pt_step has been removed, and playlist_next
and playlist_prev added. (See etc/input.conf changes.)
This is a user visible incompatible change, and will break slave-mode
applications.
- The pt_clear slave command is renamed to playlist_clear.
- Playtree entries could have multiple files. This is not the case
anymore, and playlist entries have always exactly one entry. Whenever
something adds more than one file (like ASX playlists or dvd:// or
dvdnav:// on the command line), all files are added as separate
playlist entries.
Note that some of the changes are quite deep and violent. Expect
regressions.
The playlist parsing code in particular is of low quality. I didn't try
to improve it, and merely spent to least effort necessary to keep it
somehow working. (Especially ASX playlist handling.)
The playtree code was complicated and bloated. It was also barely used.
Most users don't even know that mplayer manages the playlist as tree,
or how to use it. The most obscure features was probably specifying a
tree on command line (with '{' and '}' to create/close tree nodes). It
filled the player code with complexity and confused users with weird
slave commands like pt_up.
Replace the playtree with a simple flat playlist. Playlist parsers that
actually return trees are changed to append all files to the playlist
pre-order.
It used to be the responsibility of the playtree code to change per-file
config options. Now this is done by the player core, and the playlist
code is free of such details.
Options are not per-file by default anymore. This was a very obscure and
complicated feature that confused even experienced users. Consider the
following command line:
mplayer file1.mkv file2.mkv --no-audio file3.mkv
This will disable the audio for file2.mkv only, because options are
per-file by default. To make the option affect all files, you're
supposed to put it before the first file.
This is bad, because normally you don't need per-file options. They are
very rarely needed, and the only reasonable use cases I can imagine are
use of the encode backend (mplayer encode branch), or for debugging. The
normal use case is made harder, and the feature is perceived as bug.
Even worse, correct usage is hard to explain for users.
Make all options global by default. The position of an option isn't
significant anymore (except for options that compensate each other,
consider --shuffle --no-shuffle).
One other important change is that no options are reset anymore if a
new file is started. If you change settings with slave mode commands,
they will not be changed by playing a new file. (Exceptions include
settings that are too file specific, like audio/subtitle stream
selection.)
There is still some need for per-file options. Debugging and encoding
are use cases that profit from per-file options. Per-file profiles (as
well as per-protocol and per-VO/AO options) need the implementation
related mechanisms to backup and restore options when the playback file
changes.
Simplify the save-slot stuff, which is possible because there is no
hierarchical play tree anymore. Now there's a simple backup field.
Add a way to specify per-file options on command line. Example:
mplayer f1.mkv -o0 --{ -o1 f2.mkv -o2 f3.mkv --} f4.mkv -o3
will have the following options per file set:
f1.mkv, f4.mkv: -o0 -o3
f2.mkv, f3.mkv: -o0 -o3 -o1 -o2
The options --{ and --} start and end per-file options. All files inside
the { } will be affected by the options equally (similar to how global
options and multiple files are handled). When playback of a file starts,
the per-file options are set according to the command line. When
playback ends, the per-file options are restored to the values when
playback started.
2012-07-31 19:33:26 +00:00
|
|
|
char *filename = cmd->args[0].v.s;
|
2014-07-22 22:20:53 +00:00
|
|
|
int append = cmd->args[1].v.i;
|
2010-05-03 23:34:38 +00:00
|
|
|
|
mplayer: turn playtree into a list, and change per-file option handling
Summary:
- There is no playtree anymore. It's reduced to a simple list.
- Options are now always global. You can still have per-file options,
but these are optional and require special syntax.
- The slave command pt_step has been removed, and playlist_next
and playlist_prev added. (See etc/input.conf changes.)
This is a user visible incompatible change, and will break slave-mode
applications.
- The pt_clear slave command is renamed to playlist_clear.
- Playtree entries could have multiple files. This is not the case
anymore, and playlist entries have always exactly one entry. Whenever
something adds more than one file (like ASX playlists or dvd:// or
dvdnav:// on the command line), all files are added as separate
playlist entries.
Note that some of the changes are quite deep and violent. Expect
regressions.
The playlist parsing code in particular is of low quality. I didn't try
to improve it, and merely spent to least effort necessary to keep it
somehow working. (Especially ASX playlist handling.)
The playtree code was complicated and bloated. It was also barely used.
Most users don't even know that mplayer manages the playlist as tree,
or how to use it. The most obscure features was probably specifying a
tree on command line (with '{' and '}' to create/close tree nodes). It
filled the player code with complexity and confused users with weird
slave commands like pt_up.
Replace the playtree with a simple flat playlist. Playlist parsers that
actually return trees are changed to append all files to the playlist
pre-order.
It used to be the responsibility of the playtree code to change per-file
config options. Now this is done by the player core, and the playlist
code is free of such details.
Options are not per-file by default anymore. This was a very obscure and
complicated feature that confused even experienced users. Consider the
following command line:
mplayer file1.mkv file2.mkv --no-audio file3.mkv
This will disable the audio for file2.mkv only, because options are
per-file by default. To make the option affect all files, you're
supposed to put it before the first file.
This is bad, because normally you don't need per-file options. They are
very rarely needed, and the only reasonable use cases I can imagine are
use of the encode backend (mplayer encode branch), or for debugging. The
normal use case is made harder, and the feature is perceived as bug.
Even worse, correct usage is hard to explain for users.
Make all options global by default. The position of an option isn't
significant anymore (except for options that compensate each other,
consider --shuffle --no-shuffle).
One other important change is that no options are reset anymore if a
new file is started. If you change settings with slave mode commands,
they will not be changed by playing a new file. (Exceptions include
settings that are too file specific, like audio/subtitle stream
selection.)
There is still some need for per-file options. Debugging and encoding
are use cases that profit from per-file options. Per-file profiles (as
well as per-protocol and per-VO/AO options) need the implementation
related mechanisms to backup and restore options when the playback file
changes.
Simplify the save-slot stuff, which is possible because there is no
hierarchical play tree anymore. Now there's a simple backup field.
Add a way to specify per-file options on command line. Example:
mplayer f1.mkv -o0 --{ -o1 f2.mkv -o2 f3.mkv --} f4.mkv -o3
will have the following options per file set:
f1.mkv, f4.mkv: -o0 -o3
f2.mkv, f3.mkv: -o0 -o3 -o1 -o2
The options --{ and --} start and end per-file options. All files inside
the { } will be affected by the options equally (similar to how global
options and multiple files are handled). When playback of a file starts,
the per-file options are set according to the command line. When
playback ends, the per-file options are restored to the values when
playback started.
2012-07-31 19:33:26 +00:00
|
|
|
if (!append)
|
|
|
|
playlist_clear(mpctx->playlist);
|
|
|
|
|
2014-02-22 06:28:05 +00:00
|
|
|
struct playlist_entry *entry = playlist_entry_new(filename);
|
|
|
|
if (cmd->args[2].v.str_list) {
|
|
|
|
char **pairs = cmd->args[2].v.str_list;
|
|
|
|
for (int i = 0; pairs[i] && pairs[i + 1]; i += 2) {
|
|
|
|
playlist_entry_add_param(entry, bstr0(pairs[i]),
|
|
|
|
bstr0(pairs[i + 1]));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
playlist_add(mpctx->playlist, entry);
|
mplayer: turn playtree into a list, and change per-file option handling
Summary:
- There is no playtree anymore. It's reduced to a simple list.
- Options are now always global. You can still have per-file options,
but these are optional and require special syntax.
- The slave command pt_step has been removed, and playlist_next
and playlist_prev added. (See etc/input.conf changes.)
This is a user visible incompatible change, and will break slave-mode
applications.
- The pt_clear slave command is renamed to playlist_clear.
- Playtree entries could have multiple files. This is not the case
anymore, and playlist entries have always exactly one entry. Whenever
something adds more than one file (like ASX playlists or dvd:// or
dvdnav:// on the command line), all files are added as separate
playlist entries.
Note that some of the changes are quite deep and violent. Expect
regressions.
The playlist parsing code in particular is of low quality. I didn't try
to improve it, and merely spent to least effort necessary to keep it
somehow working. (Especially ASX playlist handling.)
The playtree code was complicated and bloated. It was also barely used.
Most users don't even know that mplayer manages the playlist as tree,
or how to use it. The most obscure features was probably specifying a
tree on command line (with '{' and '}' to create/close tree nodes). It
filled the player code with complexity and confused users with weird
slave commands like pt_up.
Replace the playtree with a simple flat playlist. Playlist parsers that
actually return trees are changed to append all files to the playlist
pre-order.
It used to be the responsibility of the playtree code to change per-file
config options. Now this is done by the player core, and the playlist
code is free of such details.
Options are not per-file by default anymore. This was a very obscure and
complicated feature that confused even experienced users. Consider the
following command line:
mplayer file1.mkv file2.mkv --no-audio file3.mkv
This will disable the audio for file2.mkv only, because options are
per-file by default. To make the option affect all files, you're
supposed to put it before the first file.
This is bad, because normally you don't need per-file options. They are
very rarely needed, and the only reasonable use cases I can imagine are
use of the encode backend (mplayer encode branch), or for debugging. The
normal use case is made harder, and the feature is perceived as bug.
Even worse, correct usage is hard to explain for users.
Make all options global by default. The position of an option isn't
significant anymore (except for options that compensate each other,
consider --shuffle --no-shuffle).
One other important change is that no options are reset anymore if a
new file is started. If you change settings with slave mode commands,
they will not be changed by playing a new file. (Exceptions include
settings that are too file specific, like audio/subtitle stream
selection.)
There is still some need for per-file options. Debugging and encoding
are use cases that profit from per-file options. Per-file profiles (as
well as per-protocol and per-VO/AO options) need the implementation
related mechanisms to backup and restore options when the playback file
changes.
Simplify the save-slot stuff, which is possible because there is no
hierarchical play tree anymore. Now there's a simple backup field.
Add a way to specify per-file options on command line. Example:
mplayer f1.mkv -o0 --{ -o1 f2.mkv -o2 f3.mkv --} f4.mkv -o3
will have the following options per file set:
f1.mkv, f4.mkv: -o0 -o3
f2.mkv, f3.mkv: -o0 -o3 -o1 -o2
The options --{ and --} start and end per-file options. All files inside
the { } will be affected by the options equally (similar to how global
options and multiple files are handled). When playback of a file starts,
the per-file options are set according to the command line. When
playback ends, the per-file options are restored to the values when
playback started.
2012-07-31 19:33:26 +00:00
|
|
|
|
2014-10-10 12:44:22 +00:00
|
|
|
if (!append || (append == 2 && !mpctx->playlist->current)) {
|
|
|
|
if (opts->position_save_on_quit) // requested in issue #1148
|
|
|
|
mp_write_watch_later_conf(mpctx);
|
2014-10-27 20:50:40 +00:00
|
|
|
mp_set_playlist_entry(mpctx, entry);
|
2014-10-10 12:44:22 +00:00
|
|
|
}
|
2016-06-20 19:35:59 +00:00
|
|
|
mp_notify(mpctx, MP_EVENT_CHANGE_PLAYLIST, NULL);
|
2016-09-16 12:24:15 +00:00
|
|
|
mp_wakeup_core(mpctx);
|
2011-08-07 01:45:40 +00:00
|
|
|
break;
|
|
|
|
}
|
2010-05-03 23:34:38 +00:00
|
|
|
|
2011-08-07 01:45:40 +00:00
|
|
|
case MP_CMD_LOADLIST: {
|
mplayer: turn playtree into a list, and change per-file option handling
Summary:
- There is no playtree anymore. It's reduced to a simple list.
- Options are now always global. You can still have per-file options,
but these are optional and require special syntax.
- The slave command pt_step has been removed, and playlist_next
and playlist_prev added. (See etc/input.conf changes.)
This is a user visible incompatible change, and will break slave-mode
applications.
- The pt_clear slave command is renamed to playlist_clear.
- Playtree entries could have multiple files. This is not the case
anymore, and playlist entries have always exactly one entry. Whenever
something adds more than one file (like ASX playlists or dvd:// or
dvdnav:// on the command line), all files are added as separate
playlist entries.
Note that some of the changes are quite deep and violent. Expect
regressions.
The playlist parsing code in particular is of low quality. I didn't try
to improve it, and merely spent to least effort necessary to keep it
somehow working. (Especially ASX playlist handling.)
The playtree code was complicated and bloated. It was also barely used.
Most users don't even know that mplayer manages the playlist as tree,
or how to use it. The most obscure features was probably specifying a
tree on command line (with '{' and '}' to create/close tree nodes). It
filled the player code with complexity and confused users with weird
slave commands like pt_up.
Replace the playtree with a simple flat playlist. Playlist parsers that
actually return trees are changed to append all files to the playlist
pre-order.
It used to be the responsibility of the playtree code to change per-file
config options. Now this is done by the player core, and the playlist
code is free of such details.
Options are not per-file by default anymore. This was a very obscure and
complicated feature that confused even experienced users. Consider the
following command line:
mplayer file1.mkv file2.mkv --no-audio file3.mkv
This will disable the audio for file2.mkv only, because options are
per-file by default. To make the option affect all files, you're
supposed to put it before the first file.
This is bad, because normally you don't need per-file options. They are
very rarely needed, and the only reasonable use cases I can imagine are
use of the encode backend (mplayer encode branch), or for debugging. The
normal use case is made harder, and the feature is perceived as bug.
Even worse, correct usage is hard to explain for users.
Make all options global by default. The position of an option isn't
significant anymore (except for options that compensate each other,
consider --shuffle --no-shuffle).
One other important change is that no options are reset anymore if a
new file is started. If you change settings with slave mode commands,
they will not be changed by playing a new file. (Exceptions include
settings that are too file specific, like audio/subtitle stream
selection.)
There is still some need for per-file options. Debugging and encoding
are use cases that profit from per-file options. Per-file profiles (as
well as per-protocol and per-VO/AO options) need the implementation
related mechanisms to backup and restore options when the playback file
changes.
Simplify the save-slot stuff, which is possible because there is no
hierarchical play tree anymore. Now there's a simple backup field.
Add a way to specify per-file options on command line. Example:
mplayer f1.mkv -o0 --{ -o1 f2.mkv -o2 f3.mkv --} f4.mkv -o3
will have the following options per file set:
f1.mkv, f4.mkv: -o0 -o3
f2.mkv, f3.mkv: -o0 -o3 -o1 -o2
The options --{ and --} start and end per-file options. All files inside
the { } will be affected by the options equally (similar to how global
options and multiple files are handled). When playback of a file starts,
the per-file options are set according to the command line. When
playback ends, the per-file options are restored to the values when
playback started.
2012-07-31 19:33:26 +00:00
|
|
|
char *filename = cmd->args[0].v.s;
|
|
|
|
bool append = cmd->args[1].v.i;
|
2013-12-21 19:15:47 +00:00
|
|
|
struct playlist *pl = playlist_parse_file(filename, mpctx->global);
|
2013-04-10 15:16:49 +00:00
|
|
|
if (pl) {
|
2014-12-29 21:08:22 +00:00
|
|
|
prepare_playlist(mpctx, pl);
|
|
|
|
struct playlist_entry *new = pl->current;
|
mplayer: turn playtree into a list, and change per-file option handling
Summary:
- There is no playtree anymore. It's reduced to a simple list.
- Options are now always global. You can still have per-file options,
but these are optional and require special syntax.
- The slave command pt_step has been removed, and playlist_next
and playlist_prev added. (See etc/input.conf changes.)
This is a user visible incompatible change, and will break slave-mode
applications.
- The pt_clear slave command is renamed to playlist_clear.
- Playtree entries could have multiple files. This is not the case
anymore, and playlist entries have always exactly one entry. Whenever
something adds more than one file (like ASX playlists or dvd:// or
dvdnav:// on the command line), all files are added as separate
playlist entries.
Note that some of the changes are quite deep and violent. Expect
regressions.
The playlist parsing code in particular is of low quality. I didn't try
to improve it, and merely spent to least effort necessary to keep it
somehow working. (Especially ASX playlist handling.)
The playtree code was complicated and bloated. It was also barely used.
Most users don't even know that mplayer manages the playlist as tree,
or how to use it. The most obscure features was probably specifying a
tree on command line (with '{' and '}' to create/close tree nodes). It
filled the player code with complexity and confused users with weird
slave commands like pt_up.
Replace the playtree with a simple flat playlist. Playlist parsers that
actually return trees are changed to append all files to the playlist
pre-order.
It used to be the responsibility of the playtree code to change per-file
config options. Now this is done by the player core, and the playlist
code is free of such details.
Options are not per-file by default anymore. This was a very obscure and
complicated feature that confused even experienced users. Consider the
following command line:
mplayer file1.mkv file2.mkv --no-audio file3.mkv
This will disable the audio for file2.mkv only, because options are
per-file by default. To make the option affect all files, you're
supposed to put it before the first file.
This is bad, because normally you don't need per-file options. They are
very rarely needed, and the only reasonable use cases I can imagine are
use of the encode backend (mplayer encode branch), or for debugging. The
normal use case is made harder, and the feature is perceived as bug.
Even worse, correct usage is hard to explain for users.
Make all options global by default. The position of an option isn't
significant anymore (except for options that compensate each other,
consider --shuffle --no-shuffle).
One other important change is that no options are reset anymore if a
new file is started. If you change settings with slave mode commands,
they will not be changed by playing a new file. (Exceptions include
settings that are too file specific, like audio/subtitle stream
selection.)
There is still some need for per-file options. Debugging and encoding
are use cases that profit from per-file options. Per-file profiles (as
well as per-protocol and per-VO/AO options) need the implementation
related mechanisms to backup and restore options when the playback file
changes.
Simplify the save-slot stuff, which is possible because there is no
hierarchical play tree anymore. Now there's a simple backup field.
Add a way to specify per-file options on command line. Example:
mplayer f1.mkv -o0 --{ -o1 f2.mkv -o2 f3.mkv --} f4.mkv -o3
will have the following options per file set:
f1.mkv, f4.mkv: -o0 -o3
f2.mkv, f3.mkv: -o0 -o3 -o1 -o2
The options --{ and --} start and end per-file options. All files inside
the { } will be affected by the options equally (similar to how global
options and multiple files are handled). When playback of a file starts,
the per-file options are set according to the command line. When
playback ends, the per-file options are restored to the values when
playback started.
2012-07-31 19:33:26 +00:00
|
|
|
if (!append)
|
|
|
|
playlist_clear(mpctx->playlist);
|
2014-07-24 17:30:24 +00:00
|
|
|
playlist_append_entries(mpctx->playlist, pl);
|
mplayer: turn playtree into a list, and change per-file option handling
Summary:
- There is no playtree anymore. It's reduced to a simple list.
- Options are now always global. You can still have per-file options,
but these are optional and require special syntax.
- The slave command pt_step has been removed, and playlist_next
and playlist_prev added. (See etc/input.conf changes.)
This is a user visible incompatible change, and will break slave-mode
applications.
- The pt_clear slave command is renamed to playlist_clear.
- Playtree entries could have multiple files. This is not the case
anymore, and playlist entries have always exactly one entry. Whenever
something adds more than one file (like ASX playlists or dvd:// or
dvdnav:// on the command line), all files are added as separate
playlist entries.
Note that some of the changes are quite deep and violent. Expect
regressions.
The playlist parsing code in particular is of low quality. I didn't try
to improve it, and merely spent to least effort necessary to keep it
somehow working. (Especially ASX playlist handling.)
The playtree code was complicated and bloated. It was also barely used.
Most users don't even know that mplayer manages the playlist as tree,
or how to use it. The most obscure features was probably specifying a
tree on command line (with '{' and '}' to create/close tree nodes). It
filled the player code with complexity and confused users with weird
slave commands like pt_up.
Replace the playtree with a simple flat playlist. Playlist parsers that
actually return trees are changed to append all files to the playlist
pre-order.
It used to be the responsibility of the playtree code to change per-file
config options. Now this is done by the player core, and the playlist
code is free of such details.
Options are not per-file by default anymore. This was a very obscure and
complicated feature that confused even experienced users. Consider the
following command line:
mplayer file1.mkv file2.mkv --no-audio file3.mkv
This will disable the audio for file2.mkv only, because options are
per-file by default. To make the option affect all files, you're
supposed to put it before the first file.
This is bad, because normally you don't need per-file options. They are
very rarely needed, and the only reasonable use cases I can imagine are
use of the encode backend (mplayer encode branch), or for debugging. The
normal use case is made harder, and the feature is perceived as bug.
Even worse, correct usage is hard to explain for users.
Make all options global by default. The position of an option isn't
significant anymore (except for options that compensate each other,
consider --shuffle --no-shuffle).
One other important change is that no options are reset anymore if a
new file is started. If you change settings with slave mode commands,
they will not be changed by playing a new file. (Exceptions include
settings that are too file specific, like audio/subtitle stream
selection.)
There is still some need for per-file options. Debugging and encoding
are use cases that profit from per-file options. Per-file profiles (as
well as per-protocol and per-VO/AO options) need the implementation
related mechanisms to backup and restore options when the playback file
changes.
Simplify the save-slot stuff, which is possible because there is no
hierarchical play tree anymore. Now there's a simple backup field.
Add a way to specify per-file options on command line. Example:
mplayer f1.mkv -o0 --{ -o1 f2.mkv -o2 f3.mkv --} f4.mkv -o3
will have the following options per file set:
f1.mkv, f4.mkv: -o0 -o3
f2.mkv, f3.mkv: -o0 -o3 -o1 -o2
The options --{ and --} start and end per-file options. All files inside
the { } will be affected by the options equally (similar to how global
options and multiple files are handled). When playback of a file starts,
the per-file options are set according to the command line. When
playback ends, the per-file options are restored to the values when
playback started.
2012-07-31 19:33:26 +00:00
|
|
|
talloc_free(pl);
|
|
|
|
|
2014-12-29 21:08:22 +00:00
|
|
|
if (!append && mpctx->playlist->first)
|
|
|
|
mp_set_playlist_entry(mpctx, new ? new : mpctx->playlist->first);
|
|
|
|
|
2016-06-20 19:35:59 +00:00
|
|
|
mp_notify(mpctx, MP_EVENT_CHANGE_PLAYLIST, NULL);
|
2016-09-16 12:24:15 +00:00
|
|
|
mp_wakeup_core(mpctx);
|
mplayer: turn playtree into a list, and change per-file option handling
Summary:
- There is no playtree anymore. It's reduced to a simple list.
- Options are now always global. You can still have per-file options,
but these are optional and require special syntax.
- The slave command pt_step has been removed, and playlist_next
and playlist_prev added. (See etc/input.conf changes.)
This is a user visible incompatible change, and will break slave-mode
applications.
- The pt_clear slave command is renamed to playlist_clear.
- Playtree entries could have multiple files. This is not the case
anymore, and playlist entries have always exactly one entry. Whenever
something adds more than one file (like ASX playlists or dvd:// or
dvdnav:// on the command line), all files are added as separate
playlist entries.
Note that some of the changes are quite deep and violent. Expect
regressions.
The playlist parsing code in particular is of low quality. I didn't try
to improve it, and merely spent to least effort necessary to keep it
somehow working. (Especially ASX playlist handling.)
The playtree code was complicated and bloated. It was also barely used.
Most users don't even know that mplayer manages the playlist as tree,
or how to use it. The most obscure features was probably specifying a
tree on command line (with '{' and '}' to create/close tree nodes). It
filled the player code with complexity and confused users with weird
slave commands like pt_up.
Replace the playtree with a simple flat playlist. Playlist parsers that
actually return trees are changed to append all files to the playlist
pre-order.
It used to be the responsibility of the playtree code to change per-file
config options. Now this is done by the player core, and the playlist
code is free of such details.
Options are not per-file by default anymore. This was a very obscure and
complicated feature that confused even experienced users. Consider the
following command line:
mplayer file1.mkv file2.mkv --no-audio file3.mkv
This will disable the audio for file2.mkv only, because options are
per-file by default. To make the option affect all files, you're
supposed to put it before the first file.
This is bad, because normally you don't need per-file options. They are
very rarely needed, and the only reasonable use cases I can imagine are
use of the encode backend (mplayer encode branch), or for debugging. The
normal use case is made harder, and the feature is perceived as bug.
Even worse, correct usage is hard to explain for users.
Make all options global by default. The position of an option isn't
significant anymore (except for options that compensate each other,
consider --shuffle --no-shuffle).
One other important change is that no options are reset anymore if a
new file is started. If you change settings with slave mode commands,
they will not be changed by playing a new file. (Exceptions include
settings that are too file specific, like audio/subtitle stream
selection.)
There is still some need for per-file options. Debugging and encoding
are use cases that profit from per-file options. Per-file profiles (as
well as per-protocol and per-VO/AO options) need the implementation
related mechanisms to backup and restore options when the playback file
changes.
Simplify the save-slot stuff, which is possible because there is no
hierarchical play tree anymore. Now there's a simple backup field.
Add a way to specify per-file options on command line. Example:
mplayer f1.mkv -o0 --{ -o1 f2.mkv -o2 f3.mkv --} f4.mkv -o3
will have the following options per file set:
f1.mkv, f4.mkv: -o0 -o3
f2.mkv, f3.mkv: -o0 -o3 -o1 -o2
The options --{ and --} start and end per-file options. All files inside
the { } will be affected by the options equally (similar to how global
options and multiple files are handled). When playback of a file starts,
the per-file options are set according to the command line. When
playback ends, the per-file options are restored to the values when
playback started.
2012-07-31 19:33:26 +00:00
|
|
|
} else {
|
2013-12-19 20:28:55 +00:00
|
|
|
MP_ERR(mpctx, "Unable to load playlist %s.\n", filename);
|
2014-06-01 01:41:46 +00:00
|
|
|
return -1;
|
2011-08-07 01:45:40 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
2010-05-03 23:34:38 +00:00
|
|
|
|
mplayer: turn playtree into a list, and change per-file option handling
Summary:
- There is no playtree anymore. It's reduced to a simple list.
- Options are now always global. You can still have per-file options,
but these are optional and require special syntax.
- The slave command pt_step has been removed, and playlist_next
and playlist_prev added. (See etc/input.conf changes.)
This is a user visible incompatible change, and will break slave-mode
applications.
- The pt_clear slave command is renamed to playlist_clear.
- Playtree entries could have multiple files. This is not the case
anymore, and playlist entries have always exactly one entry. Whenever
something adds more than one file (like ASX playlists or dvd:// or
dvdnav:// on the command line), all files are added as separate
playlist entries.
Note that some of the changes are quite deep and violent. Expect
regressions.
The playlist parsing code in particular is of low quality. I didn't try
to improve it, and merely spent to least effort necessary to keep it
somehow working. (Especially ASX playlist handling.)
The playtree code was complicated and bloated. It was also barely used.
Most users don't even know that mplayer manages the playlist as tree,
or how to use it. The most obscure features was probably specifying a
tree on command line (with '{' and '}' to create/close tree nodes). It
filled the player code with complexity and confused users with weird
slave commands like pt_up.
Replace the playtree with a simple flat playlist. Playlist parsers that
actually return trees are changed to append all files to the playlist
pre-order.
It used to be the responsibility of the playtree code to change per-file
config options. Now this is done by the player core, and the playlist
code is free of such details.
Options are not per-file by default anymore. This was a very obscure and
complicated feature that confused even experienced users. Consider the
following command line:
mplayer file1.mkv file2.mkv --no-audio file3.mkv
This will disable the audio for file2.mkv only, because options are
per-file by default. To make the option affect all files, you're
supposed to put it before the first file.
This is bad, because normally you don't need per-file options. They are
very rarely needed, and the only reasonable use cases I can imagine are
use of the encode backend (mplayer encode branch), or for debugging. The
normal use case is made harder, and the feature is perceived as bug.
Even worse, correct usage is hard to explain for users.
Make all options global by default. The position of an option isn't
significant anymore (except for options that compensate each other,
consider --shuffle --no-shuffle).
One other important change is that no options are reset anymore if a
new file is started. If you change settings with slave mode commands,
they will not be changed by playing a new file. (Exceptions include
settings that are too file specific, like audio/subtitle stream
selection.)
There is still some need for per-file options. Debugging and encoding
are use cases that profit from per-file options. Per-file profiles (as
well as per-protocol and per-VO/AO options) need the implementation
related mechanisms to backup and restore options when the playback file
changes.
Simplify the save-slot stuff, which is possible because there is no
hierarchical play tree anymore. Now there's a simple backup field.
Add a way to specify per-file options on command line. Example:
mplayer f1.mkv -o0 --{ -o1 f2.mkv -o2 f3.mkv --} f4.mkv -o3
will have the following options per file set:
f1.mkv, f4.mkv: -o0 -o3
f2.mkv, f3.mkv: -o0 -o3 -o1 -o2
The options --{ and --} start and end per-file options. All files inside
the { } will be affected by the options equally (similar to how global
options and multiple files are handled). When playback of a file starts,
the per-file options are set according to the command line. When
playback ends, the per-file options are restored to the values when
playback started.
2012-07-31 19:33:26 +00:00
|
|
|
case MP_CMD_PLAYLIST_CLEAR: {
|
|
|
|
// Supposed to clear the playlist, except the currently played item.
|
|
|
|
if (mpctx->playlist->current_was_replaced)
|
|
|
|
mpctx->playlist->current = NULL;
|
|
|
|
while (mpctx->playlist->first) {
|
|
|
|
struct playlist_entry *e = mpctx->playlist->first;
|
|
|
|
if (e == mpctx->playlist->current) {
|
|
|
|
e = e->next;
|
|
|
|
if (!e)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
playlist_remove(mpctx->playlist, e);
|
|
|
|
}
|
2016-06-20 19:35:59 +00:00
|
|
|
mp_notify(mpctx, MP_EVENT_CHANGE_PLAYLIST, NULL);
|
2016-09-16 12:24:15 +00:00
|
|
|
mp_wakeup_core(mpctx);
|
2012-02-10 18:03:24 +00:00
|
|
|
break;
|
mplayer: turn playtree into a list, and change per-file option handling
Summary:
- There is no playtree anymore. It's reduced to a simple list.
- Options are now always global. You can still have per-file options,
but these are optional and require special syntax.
- The slave command pt_step has been removed, and playlist_next
and playlist_prev added. (See etc/input.conf changes.)
This is a user visible incompatible change, and will break slave-mode
applications.
- The pt_clear slave command is renamed to playlist_clear.
- Playtree entries could have multiple files. This is not the case
anymore, and playlist entries have always exactly one entry. Whenever
something adds more than one file (like ASX playlists or dvd:// or
dvdnav:// on the command line), all files are added as separate
playlist entries.
Note that some of the changes are quite deep and violent. Expect
regressions.
The playlist parsing code in particular is of low quality. I didn't try
to improve it, and merely spent to least effort necessary to keep it
somehow working. (Especially ASX playlist handling.)
The playtree code was complicated and bloated. It was also barely used.
Most users don't even know that mplayer manages the playlist as tree,
or how to use it. The most obscure features was probably specifying a
tree on command line (with '{' and '}' to create/close tree nodes). It
filled the player code with complexity and confused users with weird
slave commands like pt_up.
Replace the playtree with a simple flat playlist. Playlist parsers that
actually return trees are changed to append all files to the playlist
pre-order.
It used to be the responsibility of the playtree code to change per-file
config options. Now this is done by the player core, and the playlist
code is free of such details.
Options are not per-file by default anymore. This was a very obscure and
complicated feature that confused even experienced users. Consider the
following command line:
mplayer file1.mkv file2.mkv --no-audio file3.mkv
This will disable the audio for file2.mkv only, because options are
per-file by default. To make the option affect all files, you're
supposed to put it before the first file.
This is bad, because normally you don't need per-file options. They are
very rarely needed, and the only reasonable use cases I can imagine are
use of the encode backend (mplayer encode branch), or for debugging. The
normal use case is made harder, and the feature is perceived as bug.
Even worse, correct usage is hard to explain for users.
Make all options global by default. The position of an option isn't
significant anymore (except for options that compensate each other,
consider --shuffle --no-shuffle).
One other important change is that no options are reset anymore if a
new file is started. If you change settings with slave mode commands,
they will not be changed by playing a new file. (Exceptions include
settings that are too file specific, like audio/subtitle stream
selection.)
There is still some need for per-file options. Debugging and encoding
are use cases that profit from per-file options. Per-file profiles (as
well as per-protocol and per-VO/AO options) need the implementation
related mechanisms to backup and restore options when the playback file
changes.
Simplify the save-slot stuff, which is possible because there is no
hierarchical play tree anymore. Now there's a simple backup field.
Add a way to specify per-file options on command line. Example:
mplayer f1.mkv -o0 --{ -o1 f2.mkv -o2 f3.mkv --} f4.mkv -o3
will have the following options per file set:
f1.mkv, f4.mkv: -o0 -o3
f2.mkv, f3.mkv: -o0 -o3 -o1 -o2
The options --{ and --} start and end per-file options. All files inside
the { } will be affected by the options equally (similar to how global
options and multiple files are handled). When playback of a file starts,
the per-file options are set according to the command line. When
playback ends, the per-file options are restored to the values when
playback started.
2012-07-31 19:33:26 +00:00
|
|
|
}
|
2012-02-10 18:03:24 +00:00
|
|
|
|
2013-07-02 11:17:50 +00:00
|
|
|
case MP_CMD_PLAYLIST_REMOVE: {
|
|
|
|
struct playlist_entry *e = playlist_entry_from_index(mpctx->playlist,
|
|
|
|
cmd->args[0].v.i);
|
2013-11-28 18:13:48 +00:00
|
|
|
if (cmd->args[0].v.i < 0)
|
|
|
|
e = mpctx->playlist->current;
|
2014-06-01 01:41:46 +00:00
|
|
|
if (!e)
|
|
|
|
return -1;
|
|
|
|
// Can't play a removed entry
|
2015-07-08 19:31:31 +00:00
|
|
|
if (mpctx->playlist->current == e && !mpctx->stop_play)
|
2016-11-18 12:46:34 +00:00
|
|
|
mpctx->stop_play = PT_NEXT_ENTRY;
|
2014-06-01 01:41:46 +00:00
|
|
|
playlist_remove(mpctx->playlist, e);
|
2016-06-20 19:35:59 +00:00
|
|
|
mp_notify(mpctx, MP_EVENT_CHANGE_PLAYLIST, NULL);
|
2016-09-16 12:24:15 +00:00
|
|
|
mp_wakeup_core(mpctx);
|
2013-07-02 11:17:50 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case MP_CMD_PLAYLIST_MOVE: {
|
|
|
|
struct playlist_entry *e1 = playlist_entry_from_index(mpctx->playlist,
|
|
|
|
cmd->args[0].v.i);
|
|
|
|
struct playlist_entry *e2 = playlist_entry_from_index(mpctx->playlist,
|
|
|
|
cmd->args[1].v.i);
|
2014-06-01 01:41:46 +00:00
|
|
|
if (!e1)
|
|
|
|
return -1;
|
|
|
|
playlist_move(mpctx->playlist, e1, e2);
|
2016-06-20 19:35:59 +00:00
|
|
|
mp_notify(mpctx, MP_EVENT_CHANGE_PLAYLIST, NULL);
|
2013-07-02 11:17:50 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2015-05-17 19:16:10 +00:00
|
|
|
case MP_CMD_PLAYLIST_SHUFFLE: {
|
|
|
|
playlist_shuffle(mpctx->playlist);
|
2017-07-04 11:11:52 +00:00
|
|
|
mp_notify(mpctx, MP_EVENT_CHANGE_PLAYLIST, NULL);
|
2015-05-17 19:16:10 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2011-08-07 01:45:40 +00:00
|
|
|
case MP_CMD_STOP:
|
2014-10-10 13:13:04 +00:00
|
|
|
playlist_clear(mpctx->playlist);
|
2015-10-06 16:18:13 +00:00
|
|
|
if (mpctx->stop_play != PT_QUIT)
|
2015-07-08 19:31:31 +00:00
|
|
|
mpctx->stop_play = PT_STOP;
|
2016-09-16 12:24:15 +00:00
|
|
|
mp_wakeup_core(mpctx);
|
2011-08-07 01:45:40 +00:00
|
|
|
break;
|
2010-05-03 23:34:38 +00:00
|
|
|
|
2012-09-15 00:04:57 +00:00
|
|
|
case MP_CMD_SHOW_PROGRESS:
|
2012-09-25 01:24:38 +00:00
|
|
|
mpctx->add_osd_seek_info |=
|
|
|
|
(msg_osd ? OSD_SEEK_INFO_TEXT : 0) |
|
|
|
|
(bar_osd ? OSD_SEEK_INFO_BAR : 0);
|
2016-07-08 11:46:15 +00:00
|
|
|
mpctx->osd_force_update = true;
|
2016-09-16 12:24:15 +00:00
|
|
|
mp_wakeup_core(mpctx);
|
2011-08-07 01:45:40 +00:00
|
|
|
break;
|
2010-04-09 19:20:52 +00:00
|
|
|
|
command: redo ancient TV/DVB/PVR commands
Convert all these commands to properties. (Except tv_last_channel, not
sure what to do with this.) Also, internally, don't access stream
details directly, but dispatch commands with stream ctrls.
Many of the new properties are a bit strange, because they're write-
only. Also remove some OSD output these commands produced, because I
couldn't be bothered to port these.
In general, this makes everything much cleaner, and will also make it
easier to e.g. move the demuxer to its own thread.
Don't bother updating input.conf, but changes.rst documents how old
commands map to the new ones.
Mostly untested, due to lack of hardware.
2014-06-09 21:38:28 +00:00
|
|
|
case MP_CMD_TV_LAST_CHANNEL: {
|
2014-09-01 19:44:54 +00:00
|
|
|
if (!mpctx->demuxer)
|
|
|
|
return -1;
|
|
|
|
demux_stream_control(mpctx->demuxer, STREAM_CTRL_TV_LAST_CHAN, NULL);
|
2011-08-07 01:45:40 +00:00
|
|
|
break;
|
command: redo ancient TV/DVB/PVR commands
Convert all these commands to properties. (Except tv_last_channel, not
sure what to do with this.) Also, internally, don't access stream
details directly, but dispatch commands with stream ctrls.
Many of the new properties are a bit strange, because they're write-
only. Also remove some OSD output these commands produced, because I
couldn't be bothered to port these.
In general, this makes everything much cleaner, and will also make it
easier to e.g. move the demuxer to its own thread.
Don't bother updating input.conf, but changes.rst documents how old
commands map to the new ones.
Mostly untested, due to lack of hardware.
2014-06-09 21:38:28 +00:00
|
|
|
}
|
2010-05-03 23:34:38 +00:00
|
|
|
|
input: change license to LGPL
cehoyos adds the step_property command in 7a71da01d, and it could be
argued that copyright of this still applies to the later add/cycle
commands (a668ae0ff90c4). While I'm not sure if this is really the case,
stay conservative for now and mark these commands as GPL-only. Mark the
command.c code too, although that is not being relicensed yet.
I'm leaving the MP_CMD_* enum items, as they are obviously different.
In commit 116ca0c7682, "veal" (essentially an anonymous author) adds an
"osd_show_property_text" command (well, the commit message says "based
on" that person's code, so it's not clear how much is from him or from
albeu, who agreed to LGPL). This was later merged again with the
"osd_show_text" command, and then all original code was removed in
commit 58cc0f637f, so I claim that no copyright applies anymore. (Though
technically the input.conf addition still might be copyrighted, so I'm
just dropping it to get rid of the thought.)
"kiriuja" added 2f376d1b39 (sub_load etc.) and be54f4813 (switch_audio).
The latter is gone. I would argue that the former is fully rewritten
with commits b7052b431c9 and 0f155921b0. But like in the step_property
case, I will be overly conservative for now, and mark them as GPL-only,
as this is potentially shaky and should be thought through first. (Not
bothering with the command define/enum in the header, as it will be
unused in LGPL mode anyway.)
keycodes.c/h can be GPL, except for commit 2b1f95dcc2f8, which is a
patch by someone who wasn't asked yet. Before doing something radical, I
will wait for a reply.
2017-06-19 11:02:35 +00:00
|
|
|
#if HAVE_GPL
|
2017-06-23 13:21:06 +00:00
|
|
|
// Possibly GPL due to 2f376d1b39913e8ff4c4499e7cf7148ec331d4db.
|
2015-02-03 08:15:14 +00:00
|
|
|
case MP_CMD_SUB_ADD:
|
|
|
|
case MP_CMD_AUDIO_ADD: {
|
2014-10-20 21:33:46 +00:00
|
|
|
if (!mpctx->playing)
|
2014-09-01 19:44:54 +00:00
|
|
|
return -1;
|
2015-02-03 08:15:14 +00:00
|
|
|
int type = cmd->id == MP_CMD_SUB_ADD ? STREAM_SUB : STREAM_AUDIO;
|
2014-10-23 11:11:41 +00:00
|
|
|
if (cmd->args[1].v.i == 2) {
|
2015-06-03 19:34:46 +00:00
|
|
|
struct track *t = find_track_with_url(mpctx, type, cmd->args[0].v.s);
|
2015-02-03 08:15:14 +00:00
|
|
|
if (t) {
|
2016-09-10 11:51:17 +00:00
|
|
|
if (mpctx->playback_initialized) {
|
|
|
|
mp_switch_track(mpctx, t->type, t, FLAG_MARK_SELECTION);
|
2016-03-14 15:34:09 +00:00
|
|
|
print_track_list(mpctx, "Track switched:");
|
2016-09-10 11:51:17 +00:00
|
|
|
} else {
|
|
|
|
opts->stream_id[0][t->type] = t->user_tid;
|
|
|
|
}
|
2014-10-23 11:11:41 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
2015-02-03 08:15:14 +00:00
|
|
|
struct track *t = mp_add_external_file(mpctx, cmd->args[0].v.s, type);
|
|
|
|
if (!t)
|
2014-06-01 01:41:46 +00:00
|
|
|
return -1;
|
2014-11-27 17:57:18 +00:00
|
|
|
if (cmd->args[1].v.i == 1) {
|
2015-02-03 08:15:14 +00:00
|
|
|
t->no_default = true;
|
2014-11-27 17:57:18 +00:00
|
|
|
} else {
|
2016-09-10 11:51:17 +00:00
|
|
|
if (mpctx->playback_initialized) {
|
|
|
|
mp_switch_track(mpctx, t->type, t, FLAG_MARK_SELECTION);
|
|
|
|
} else {
|
|
|
|
opts->stream_id[0][t->type] = t->user_tid;
|
|
|
|
}
|
2014-10-20 21:55:29 +00:00
|
|
|
}
|
|
|
|
char *title = cmd->args[2].v.s;
|
|
|
|
if (title && title[0])
|
2015-02-03 08:15:14 +00:00
|
|
|
t->title = talloc_strdup(t, title);
|
2014-10-20 21:55:29 +00:00
|
|
|
char *lang = cmd->args[3].v.s;
|
|
|
|
if (lang && lang[0])
|
2015-02-03 08:15:14 +00:00
|
|
|
t->lang = talloc_strdup(t, lang);
|
2015-06-03 19:34:46 +00:00
|
|
|
if (mpctx->playback_initialized)
|
2015-06-03 19:50:37 +00:00
|
|
|
print_track_list(mpctx, "Track added:");
|
2011-08-07 01:45:40 +00:00
|
|
|
break;
|
2014-02-13 12:30:07 +00:00
|
|
|
}
|
2010-05-03 23:34:38 +00:00
|
|
|
|
2015-02-03 08:15:14 +00:00
|
|
|
case MP_CMD_SUB_REMOVE:
|
|
|
|
case MP_CMD_AUDIO_REMOVE: {
|
|
|
|
int type = cmd->id == MP_CMD_SUB_REMOVE ? STREAM_SUB : STREAM_AUDIO;
|
|
|
|
struct track *t = mp_track_by_tid(mpctx, type, cmd->args[0].v.i);
|
|
|
|
if (!t)
|
2014-06-01 01:41:46 +00:00
|
|
|
return -1;
|
2015-02-03 08:15:14 +00:00
|
|
|
mp_remove_track(mpctx, t);
|
2015-06-03 19:34:46 +00:00
|
|
|
if (mpctx->playback_initialized)
|
2015-06-03 19:50:37 +00:00
|
|
|
print_track_list(mpctx, "Track removed:");
|
2012-11-15 19:26:52 +00:00
|
|
|
break;
|
|
|
|
}
|
input: change license to LGPL
cehoyos adds the step_property command in 7a71da01d, and it could be
argued that copyright of this still applies to the later add/cycle
commands (a668ae0ff90c4). While I'm not sure if this is really the case,
stay conservative for now and mark these commands as GPL-only. Mark the
command.c code too, although that is not being relicensed yet.
I'm leaving the MP_CMD_* enum items, as they are obviously different.
In commit 116ca0c7682, "veal" (essentially an anonymous author) adds an
"osd_show_property_text" command (well, the commit message says "based
on" that person's code, so it's not clear how much is from him or from
albeu, who agreed to LGPL). This was later merged again with the
"osd_show_text" command, and then all original code was removed in
commit 58cc0f637f, so I claim that no copyright applies anymore. (Though
technically the input.conf addition still might be copyrighted, so I'm
just dropping it to get rid of the thought.)
"kiriuja" added 2f376d1b39 (sub_load etc.) and be54f4813 (switch_audio).
The latter is gone. I would argue that the former is fully rewritten
with commits b7052b431c9 and 0f155921b0. But like in the step_property
case, I will be overly conservative for now, and mark them as GPL-only,
as this is potentially shaky and should be thought through first. (Not
bothering with the command define/enum in the header, as it will be
unused in LGPL mode anyway.)
keycodes.c/h can be GPL, except for commit 2b1f95dcc2f8, which is a
patch by someone who wasn't asked yet. Before doing something radical, I
will wait for a reply.
2017-06-19 11:02:35 +00:00
|
|
|
#endif
|
2012-11-15 19:26:52 +00:00
|
|
|
|
2015-02-03 08:15:14 +00:00
|
|
|
case MP_CMD_SUB_RELOAD:
|
|
|
|
case MP_CMD_AUDIO_RELOAD: {
|
2016-09-26 18:12:59 +00:00
|
|
|
if (!mpctx->playback_initialized) {
|
2016-09-10 11:51:17 +00:00
|
|
|
MP_ERR(mpctx, "Cannot reload while not initialized.\n");
|
|
|
|
return -1;
|
|
|
|
}
|
2015-02-03 08:15:14 +00:00
|
|
|
int type = cmd->id == MP_CMD_SUB_RELOAD ? STREAM_SUB : STREAM_AUDIO;
|
|
|
|
struct track *t = mp_track_by_tid(mpctx, type, cmd->args[0].v.i);
|
2015-04-28 20:06:22 +00:00
|
|
|
struct track *nt = NULL;
|
2015-02-03 08:15:14 +00:00
|
|
|
if (t && t->is_external && t->external_filename) {
|
2015-04-28 20:06:22 +00:00
|
|
|
char *filename = talloc_strdup(NULL, t->external_filename);
|
|
|
|
mp_remove_track(mpctx, t);
|
|
|
|
nt = mp_add_external_file(mpctx, filename, type);
|
|
|
|
talloc_free(filename);
|
|
|
|
}
|
|
|
|
if (nt) {
|
2015-05-26 12:01:23 +00:00
|
|
|
mp_switch_track(mpctx, nt->type, nt, 0);
|
2015-06-03 19:50:37 +00:00
|
|
|
print_track_list(mpctx, "Reloaded:");
|
2015-04-28 20:06:22 +00:00
|
|
|
return 0;
|
2012-11-15 19:26:52 +00:00
|
|
|
}
|
2014-06-01 01:41:46 +00:00
|
|
|
return -1;
|
2012-11-15 19:26:52 +00:00
|
|
|
}
|
|
|
|
|
2015-02-16 21:06:41 +00:00
|
|
|
case MP_CMD_RESCAN_EXTERNAL_FILES: {
|
|
|
|
if (!mpctx->playing)
|
|
|
|
return -1;
|
|
|
|
autoload_external_files(mpctx);
|
2016-09-10 11:51:17 +00:00
|
|
|
if (cmd->args[0].v.i && mpctx->playback_initialized) {
|
2015-02-16 21:06:41 +00:00
|
|
|
// somewhat fuzzy and not ideal
|
2015-05-22 19:00:24 +00:00
|
|
|
struct track *a = select_default_track(mpctx, 0, STREAM_AUDIO);
|
2015-02-16 21:06:41 +00:00
|
|
|
if (a && a->is_external)
|
2015-05-26 12:01:23 +00:00
|
|
|
mp_switch_track(mpctx, STREAM_AUDIO, a, 0);
|
2015-05-22 19:00:24 +00:00
|
|
|
struct track *s = select_default_track(mpctx, 0, STREAM_SUB);
|
2015-02-16 21:06:41 +00:00
|
|
|
if (s && s->is_external)
|
2015-05-26 12:01:23 +00:00
|
|
|
mp_switch_track(mpctx, STREAM_SUB, s, 0);
|
2015-04-28 20:04:37 +00:00
|
|
|
|
2016-09-10 11:51:17 +00:00
|
|
|
print_track_list(mpctx, "Track list:\n");
|
2015-02-16 21:06:41 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2015-03-04 16:21:02 +00:00
|
|
|
case MP_CMD_SCREENSHOT: {
|
|
|
|
int mode = cmd->args[0].v.i & 3;
|
|
|
|
int freq = (cmd->args[0].v.i | cmd->args[1].v.i) >> 3;
|
player: make screenshot commands honor the async flag
And also change input.conf to make all screenshots async. (Except the
every-frame mode, which always uses synchronous mode and ignores the
flag.) By default, the "screenshot" command is still asynchronous,
because scripts etc. might depend on this behavior.
This is only partially async. The code for determining the filename is
still always run synchronously. Only encoding the screenshot and writing
it to disk is asynchronous. We explicitly document the exact behavior as
undefined, so it can be changed any time.
Some of this is a bit messy, because I wanted to avoid duplicating the
message display code between sync and async mode. In async mode, this is
called from a worker thread, which is not safe because showing a message
accesses the thread-unsafe OSD code. So the core has to be locked during
this, which implies accessing the core and all that. So the code has
weird locking calls, and we need to do core destruction in a more
"controlled" manner (thus the outstanding_async field).
(What I'd really want would be the OSD simply showing log messages
instead.)
This is pretty untested, so expect bugs.
Fixes #4250.
2017-04-01 18:45:20 +00:00
|
|
|
screenshot_request(mpctx, mode, freq, msg_osd, async);
|
2011-08-07 01:45:40 +00:00
|
|
|
break;
|
2015-03-04 16:21:02 +00:00
|
|
|
}
|
2010-05-03 23:34:38 +00:00
|
|
|
|
2013-07-08 18:34:26 +00:00
|
|
|
case MP_CMD_SCREENSHOT_TO_FILE:
|
player: make screenshot commands honor the async flag
And also change input.conf to make all screenshots async. (Except the
every-frame mode, which always uses synchronous mode and ignores the
flag.) By default, the "screenshot" command is still asynchronous,
because scripts etc. might depend on this behavior.
This is only partially async. The code for determining the filename is
still always run synchronously. Only encoding the screenshot and writing
it to disk is asynchronous. We explicitly document the exact behavior as
undefined, so it can be changed any time.
Some of this is a bit messy, because I wanted to avoid duplicating the
message display code between sync and async mode. In async mode, this is
called from a worker thread, which is not safe because showing a message
accesses the thread-unsafe OSD code. So the core has to be locked during
this, which implies accessing the core and all that. So the code has
weird locking calls, and we need to do core destruction in a more
"controlled" manner (thus the outstanding_async field).
(What I'd really want would be the OSD simply showing log messages
instead.)
This is pretty untested, so expect bugs.
Fixes #4250.
2017-04-01 18:45:20 +00:00
|
|
|
screenshot_to_file(mpctx, cmd->args[0].v.s, cmd->args[1].v.i, msg_osd,
|
|
|
|
async);
|
2013-07-08 18:34:26 +00:00
|
|
|
break;
|
|
|
|
|
2015-04-20 21:11:03 +00:00
|
|
|
case MP_CMD_SCREENSHOT_RAW: {
|
|
|
|
if (!res)
|
|
|
|
return -1;
|
|
|
|
struct mp_image *img = screenshot_get_rgb(mpctx, cmd->args[0].v.i);
|
|
|
|
if (!img)
|
|
|
|
return -1;
|
|
|
|
struct mpv_node_list *info = talloc_zero(NULL, struct mpv_node_list);
|
|
|
|
talloc_steal(info, img);
|
|
|
|
*res = (mpv_node){ .format = MPV_FORMAT_NODE_MAP, .u.list = info };
|
|
|
|
ADD_MAP_INT(res, "w", img->w);
|
|
|
|
ADD_MAP_INT(res, "h", img->h);
|
|
|
|
ADD_MAP_INT(res, "stride", img->stride[0]);
|
|
|
|
ADD_MAP_CSTR(res, "format", "bgr0");
|
|
|
|
struct mpv_byte_array *ba = talloc_ptrtype(info, ba);
|
|
|
|
*ba = (struct mpv_byte_array){
|
|
|
|
.data = img->planes[0],
|
|
|
|
.size = img->stride[0] * img->h,
|
|
|
|
};
|
|
|
|
*add_map_entry(res, "data") =
|
|
|
|
(struct mpv_node){.format = MPV_FORMAT_BYTE_ARRAY, .u.ba = ba,};
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2013-11-29 22:36:44 +00:00
|
|
|
case MP_CMD_RUN: {
|
|
|
|
char *args[MP_CMD_MAX_ARGS + 1] = {0};
|
|
|
|
for (int n = 0; n < cmd->nargs; n++)
|
|
|
|
args[n] = cmd->args[n].v.s;
|
2015-04-15 20:43:02 +00:00
|
|
|
mp_subprocess_detached(mpctx->log, args);
|
2011-08-07 01:45:40 +00:00
|
|
|
break;
|
2013-11-29 22:36:44 +00:00
|
|
|
}
|
2010-05-03 23:34:38 +00:00
|
|
|
|
2013-06-22 23:28:28 +00:00
|
|
|
case MP_CMD_ENABLE_INPUT_SECTION:
|
2015-08-05 22:31:47 +00:00
|
|
|
mp_input_enable_section(mpctx->input, cmd->args[0].v.s, cmd->args[1].v.i);
|
2013-06-22 23:28:28 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case MP_CMD_DISABLE_INPUT_SECTION:
|
|
|
|
mp_input_disable_section(mpctx->input, cmd->args[0].v.s);
|
|
|
|
break;
|
|
|
|
|
2015-08-05 21:55:16 +00:00
|
|
|
case MP_CMD_DEFINE_INPUT_SECTION:
|
|
|
|
mp_input_define_section(mpctx->input, cmd->args[0].v.s, "<api>",
|
2016-09-20 13:31:25 +00:00
|
|
|
cmd->args[1].v.s, !!cmd->args[2].v.i,
|
|
|
|
cmd->sender);
|
2015-08-05 21:55:16 +00:00
|
|
|
break;
|
|
|
|
|
2014-11-18 20:33:15 +00:00
|
|
|
case MP_CMD_AB_LOOP: {
|
|
|
|
double now = get_current_time(mpctx);
|
|
|
|
if (opts->ab_loop[0] == MP_NOPTS_VALUE) {
|
2017-01-09 12:39:38 +00:00
|
|
|
mp_property_do("ab-loop-a", M_PROPERTY_SET, &now, mpctx);
|
2014-11-18 20:33:15 +00:00
|
|
|
show_property_osd(mpctx, "ab-loop-a", on_osd);
|
|
|
|
} else if (opts->ab_loop[1] == MP_NOPTS_VALUE) {
|
2017-01-09 12:39:38 +00:00
|
|
|
mp_property_do("ab-loop-b", M_PROPERTY_SET, &now, mpctx);
|
2014-11-18 20:33:15 +00:00
|
|
|
show_property_osd(mpctx, "ab-loop-b", on_osd);
|
|
|
|
} else {
|
|
|
|
now = MP_NOPTS_VALUE;
|
2017-01-09 12:39:38 +00:00
|
|
|
mp_property_do("ab-loop-a", M_PROPERTY_SET, &now, mpctx);
|
|
|
|
mp_property_do("ab-loop-b", M_PROPERTY_SET, &now, mpctx);
|
2014-11-18 20:33:15 +00:00
|
|
|
set_osd_msg(mpctx, osdl, osd_duration, "Clear A-B loop");
|
|
|
|
}
|
2017-01-09 12:39:38 +00:00
|
|
|
break;
|
2014-11-18 20:33:15 +00:00
|
|
|
}
|
|
|
|
|
2014-11-20 21:41:50 +00:00
|
|
|
case MP_CMD_DROP_BUFFERS: {
|
|
|
|
reset_audio_state(mpctx);
|
|
|
|
reset_video_state(mpctx);
|
|
|
|
|
|
|
|
if (mpctx->demuxer)
|
|
|
|
demux_flush(mpctx->demuxer);
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2014-10-27 10:52:42 +00:00
|
|
|
case MP_CMD_AO_RELOAD:
|
|
|
|
reload_audio_output(mpctx);
|
|
|
|
break;
|
|
|
|
|
2013-07-22 12:43:58 +00:00
|
|
|
case MP_CMD_AF:
|
2014-06-01 01:41:46 +00:00
|
|
|
return edit_filters_osd(mpctx, STREAM_AUDIO, cmd->args[0].v.s,
|
|
|
|
cmd->args[1].v.s, msg_osd);
|
2013-07-22 12:43:58 +00:00
|
|
|
|
2013-05-18 09:44:17 +00:00
|
|
|
case MP_CMD_VF:
|
2014-06-01 01:41:46 +00:00
|
|
|
return edit_filters_osd(mpctx, STREAM_VIDEO, cmd->args[0].v.s,
|
|
|
|
cmd->args[1].v.s, msg_osd);
|
2010-10-17 15:54:55 +00:00
|
|
|
|
2016-01-22 15:18:28 +00:00
|
|
|
case MP_CMD_VF_COMMAND:
|
|
|
|
if (!mpctx->vo_chain)
|
|
|
|
return -1;
|
|
|
|
return vf_send_command(mpctx->vo_chain->vf, cmd->args[0].v.s,
|
|
|
|
cmd->args[1].v.s, cmd->args[2].v.s);
|
|
|
|
|
2017-09-21 10:48:30 +00:00
|
|
|
#if HAVE_LIBAF
|
2016-01-22 19:36:54 +00:00
|
|
|
case MP_CMD_AF_COMMAND:
|
|
|
|
if (!mpctx->ao_chain)
|
|
|
|
return -1;
|
|
|
|
return af_send_command(mpctx->ao_chain->af, cmd->args[0].v.s,
|
|
|
|
cmd->args[1].v.s, cmd->args[2].v.s);
|
2017-09-21 10:48:30 +00:00
|
|
|
#endif
|
2016-01-22 19:36:54 +00:00
|
|
|
|
2014-11-23 14:08:49 +00:00
|
|
|
case MP_CMD_SCRIPT_BINDING: {
|
|
|
|
mpv_event_client_message event = {0};
|
|
|
|
char *name = cmd->args[0].v.s;
|
|
|
|
if (!name || !name[0])
|
|
|
|
return -1;
|
|
|
|
char *sep = strchr(name, '/');
|
|
|
|
char *target = NULL;
|
|
|
|
char space[MAX_CLIENT_NAME];
|
2014-12-10 17:28:09 +00:00
|
|
|
if (sep) {
|
2014-11-23 14:08:49 +00:00
|
|
|
snprintf(space, sizeof(space), "%.*s", (int)(sep - name), name);
|
|
|
|
target = space;
|
|
|
|
name = sep + 1;
|
|
|
|
}
|
|
|
|
char state[3] = {'p', cmd->is_mouse_button ? 'm' : '-'};
|
|
|
|
if (cmd->is_up_down)
|
|
|
|
state[0] = cmd->repeated ? 'r' : (cmd->is_up ? 'u' : 'd');
|
2015-12-23 18:10:38 +00:00
|
|
|
event.num_args = 4;
|
2017-01-24 11:39:39 +00:00
|
|
|
event.args = (const char*[4]){"key-binding", name, state,
|
|
|
|
cmd->key_name ? cmd->key_name : ""};
|
2014-11-23 14:08:49 +00:00
|
|
|
if (mp_client_send_event_dup(mpctx, target,
|
|
|
|
MPV_EVENT_CLIENT_MESSAGE, &event) < 0)
|
2014-02-10 20:03:59 +00:00
|
|
|
{
|
|
|
|
MP_VERBOSE(mpctx, "Can't find script '%s' when handling input.\n",
|
2014-11-23 14:08:49 +00:00
|
|
|
target ? target : "-");
|
2014-06-01 01:41:46 +00:00
|
|
|
return -1;
|
Add initial Lua scripting support
This is preliminary. There are still tons of issues, and any aspect
of scripting may change in the future. I decided to merge this
(preliminary) work now because it makes it easier to develop it, not
because it's done. lua.rst is clear enough about it (plus some
sarcasm).
This requires linking to Lua. Lua has no official pkg-config file, but
there are distribution specific .pc files, all with different names.
Adding a non-pkg-config based configure test was considered, but we'd
rather not.
One major complication is that libquvi links against Lua too, and if
the Lua version is different from mpv's, you will get a crash as soon
as libquvi uses Lua. (libquvi by design always runs when a file is
opened.) I would consider this the problem of distros and whoever
builds mpv, but to make things easier for users, we add a terrible
runtime test to the configure script, which probes whether libquvi
will crash. This is disabled when cross-compiling, but in that case
we hope the user knows what he is doing.
2013-09-25 22:41:14 +00:00
|
|
|
}
|
|
|
|
break;
|
2014-02-10 20:03:59 +00:00
|
|
|
}
|
Add initial Lua scripting support
This is preliminary. There are still tons of issues, and any aspect
of scripting may change in the future. I decided to merge this
(preliminary) work now because it makes it easier to develop it, not
because it's done. lua.rst is clear enough about it (plus some
sarcasm).
This requires linking to Lua. Lua has no official pkg-config file, but
there are distribution specific .pc files, all with different names.
Adding a non-pkg-config based configure test was considered, but we'd
rather not.
One major complication is that libquvi links against Lua too, and if
the Lua version is different from mpv's, you will get a crash as soon
as libquvi uses Lua. (libquvi by design always runs when a file is
opened.) I would consider this the problem of distros and whoever
builds mpv, but to make things easier for users, we add a terrible
runtime test to the configure script, which probes whether libquvi
will crash. This is disabled when cross-compiling, but in that case
we hope the user knows what he is doing.
2013-09-25 22:41:14 +00:00
|
|
|
|
2014-03-17 17:26:56 +00:00
|
|
|
case MP_CMD_SCRIPT_MESSAGE_TO: {
|
2014-02-17 01:33:47 +00:00
|
|
|
mpv_event_client_message *event = talloc_ptrtype(NULL, event);
|
|
|
|
*event = (mpv_event_client_message){0};
|
|
|
|
for (int n = 1; n < cmd->nargs; n++) {
|
|
|
|
MP_TARRAY_APPEND(event, event->args, event->num_args,
|
2014-08-11 11:00:57 +00:00
|
|
|
talloc_strdup(event, cmd->args[n].v.s));
|
2014-02-17 01:33:47 +00:00
|
|
|
}
|
|
|
|
if (mp_client_send_event(mpctx, cmd->args[0].v.s,
|
|
|
|
MPV_EVENT_CLIENT_MESSAGE, event) < 0)
|
|
|
|
{
|
|
|
|
MP_VERBOSE(mpctx, "Can't find script '%s' for %s.\n",
|
|
|
|
cmd->args[0].v.s, cmd->name);
|
2014-06-01 01:41:46 +00:00
|
|
|
return -1;
|
2014-02-17 01:33:47 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
2014-03-17 17:26:56 +00:00
|
|
|
case MP_CMD_SCRIPT_MESSAGE: {
|
|
|
|
const char *args[MP_CMD_MAX_ARGS];
|
|
|
|
mpv_event_client_message event = {.args = args};
|
|
|
|
for (int n = 0; n < cmd->nargs; n++)
|
|
|
|
event.args[event.num_args++] = cmd->args[n].v.s;
|
|
|
|
mp_client_broadcast_event(mpctx, MPV_EVENT_CLIENT_MESSAGE, &event);
|
|
|
|
break;
|
|
|
|
}
|
2014-02-17 01:33:47 +00:00
|
|
|
|
2013-09-30 20:27:37 +00:00
|
|
|
case MP_CMD_OVERLAY_ADD:
|
|
|
|
overlay_add(mpctx,
|
|
|
|
cmd->args[0].v.i, cmd->args[1].v.i, cmd->args[2].v.i,
|
|
|
|
cmd->args[3].v.s, cmd->args[4].v.i, cmd->args[5].v.s,
|
|
|
|
cmd->args[6].v.i, cmd->args[7].v.i, cmd->args[8].v.i);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case MP_CMD_OVERLAY_REMOVE:
|
|
|
|
overlay_remove(mpctx, cmd->args[0].v.i);
|
|
|
|
break;
|
|
|
|
|
2013-07-08 17:27:45 +00:00
|
|
|
case MP_CMD_COMMAND_LIST: {
|
|
|
|
for (struct mp_cmd *sub = cmd->args[0].v.p; sub; sub = sub->queue_next)
|
2015-04-20 21:00:12 +00:00
|
|
|
run_command(mpctx, sub, NULL);
|
2013-07-08 17:27:45 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2013-08-30 00:30:17 +00:00
|
|
|
case MP_CMD_IGNORE:
|
|
|
|
break;
|
|
|
|
|
2014-05-26 16:11:02 +00:00
|
|
|
case MP_CMD_WRITE_WATCH_LATER_CONFIG: {
|
|
|
|
mp_write_watch_later_conf(mpctx);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
command: add a mechanism to allow scripts to intercept file loads
A vague idea to get something similar what libquvi did.
Undocumented because it might change a lot, or even be removed. To give
an idea what it does, a Lua script could do the following:
-- type ID priority
mp.commandv("hook_add", "on_load", 0, 0)
mp.register_script_message("hook_run", function(param, param2)
-- param is "0", the user-chosen ID from the hook_add command
-- param2 is the magic value that has to be passed to finish
-- the hook
mp.resume_all()
-- do something, maybe set options that are reset on end:
mp.set_property("file-local-options/name", "value")
-- or change the URL that's being opened:
local url = mp.get_property("stream-open-filename")
mp.set_property("stream-open-filename", url .. ".png")
-- let the player (or the next script) continue
mp.commandv("hook_ack", param2)
end)
2014-10-15 21:09:53 +00:00
|
|
|
case MP_CMD_HOOK_ADD:
|
|
|
|
if (!cmd->sender) {
|
|
|
|
MP_ERR(mpctx, "Can be used from client API only.\n");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
mp_hook_add(mpctx, cmd->sender, cmd->args[0].v.s, cmd->args[1].v.i,
|
|
|
|
cmd->args[2].v.i);
|
|
|
|
break;
|
|
|
|
case MP_CMD_HOOK_ACK:
|
|
|
|
if (!cmd->sender) {
|
|
|
|
MP_ERR(mpctx, "Can be used from client API only.\n");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
mp_hook_run(mpctx, cmd->sender, cmd->args[0].v.s);
|
|
|
|
break;
|
|
|
|
|
2015-01-23 20:45:13 +00:00
|
|
|
case MP_CMD_MOUSE: {
|
|
|
|
const int x = cmd->args[0].v.i, y = cmd->args[1].v.i;
|
|
|
|
int button = cmd->args[2].v.i;
|
|
|
|
if (button == -1) {// no button
|
2016-02-04 22:01:15 +00:00
|
|
|
mp_input_set_mouse_pos_artificial(mpctx->input, x, y);
|
2015-01-23 20:45:13 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (button < 0 || button >= 20) {// invalid button
|
|
|
|
MP_ERR(mpctx, "%d is not a valid mouse button number.\n", button);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
const bool dbc = cmd->args[3].v.i;
|
2017-09-02 14:00:52 +00:00
|
|
|
if (dbc && button > (MP_MBTN_RIGHT - MP_MBTN_BASE)) {
|
input: use mnemonic names for mouse buttons
mpv's mouse button numbering is based on X11 button numbering, which
allows for an arbitrary number of buttons and includes mouse wheel input
as buttons 3-6. This button numbering was used throughout the codebase
and exposed in input.conf, and it was difficult to remember which
physical button each number actually referred to and which referred to
the scroll wheel.
In practice, PC mice only have between two and five buttons and one or
two scroll wheel axes, which are more or less in the same location and
have more or less the same function. This allows us to use names to
refer to the buttons instead of numbers, which makes input.conf syntax a
lot easier to remember. It also makes the syntax robust to changes in
mpv's underlying numbering. The old MOUSE_BTNx names are still
understood as deprecated aliases of the named buttons.
This changes both the input.conf syntax and the MP_MOUSE_BTNx symbols in
the codebase, since I think both would benefit from using names over
numbers, especially since some platforms don't use X11 button numbering
and handle different mouse buttons in different windowing system events.
This also makes the names shorter, since otherwise they would be pretty
long, and it removes the high-numbered MOUSE_BTNx_DBL names, since they
weren't used.
Names are the same as used in Qt:
https://doc.qt.io/qt-5/qt.html#MouseButton-enum
2017-08-08 11:34:38 +00:00
|
|
|
MP_ERR(mpctx, "%d is not a valid mouse button for double-clicks.\n",
|
|
|
|
button);
|
|
|
|
return -1;
|
|
|
|
}
|
2017-09-02 14:00:52 +00:00
|
|
|
button += dbc ? MP_MBTN_DBL_BASE : MP_MBTN_BASE;
|
2016-02-04 22:01:15 +00:00
|
|
|
mp_input_set_mouse_pos_artificial(mpctx->input, x, y);
|
|
|
|
mp_input_put_key_artificial(mpctx->input, button);
|
2015-01-23 20:45:13 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2015-06-10 23:56:56 +00:00
|
|
|
case MP_CMD_KEYPRESS:
|
|
|
|
case MP_CMD_KEYDOWN: {
|
|
|
|
const char *key_name = cmd->args[0].v.s;
|
|
|
|
int code = mp_input_get_key_from_name(key_name);
|
|
|
|
if (code < 0) {
|
|
|
|
MP_ERR(mpctx, "%s is not a valid input name.\n", key_name);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (cmd->id == MP_CMD_KEYDOWN)
|
|
|
|
code |= MP_KEY_STATE_DOWN;
|
|
|
|
|
2016-02-04 22:01:15 +00:00
|
|
|
mp_input_put_key_artificial(mpctx->input, code);
|
2015-06-10 23:56:56 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case MP_CMD_KEYUP: {
|
|
|
|
const char *key_name = cmd->args[0].v.s;
|
|
|
|
if (key_name[0] == '\0') {
|
2016-02-04 22:01:15 +00:00
|
|
|
mp_input_put_key_artificial(mpctx->input, MP_INPUT_RELEASE_ALL);
|
2015-06-10 23:56:56 +00:00
|
|
|
} else {
|
|
|
|
int code = mp_input_get_key_from_name(key_name);
|
|
|
|
if (code < 0) {
|
|
|
|
MP_ERR(mpctx, "%s is not a valid input name.\n", key_name);
|
|
|
|
return -1;
|
|
|
|
}
|
2016-02-04 22:01:15 +00:00
|
|
|
mp_input_put_key_artificial(mpctx->input, code | MP_KEY_STATE_UP);
|
2015-06-10 23:56:56 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2016-09-17 19:01:59 +00:00
|
|
|
case MP_CMD_APPLY_PROFILE: {
|
|
|
|
char *profile = cmd->args[0].v.s;
|
2016-09-22 18:35:38 +00:00
|
|
|
if (m_config_set_profile(mpctx->mconfig, profile, M_SETOPT_RUNTIME) < 0)
|
2016-09-17 19:01:59 +00:00
|
|
|
return -1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2016-09-22 18:43:33 +00:00
|
|
|
case MP_CMD_LOAD_SCRIPT: {
|
|
|
|
char *script = cmd->args[0].v.s;
|
2017-06-30 13:53:33 +00:00
|
|
|
if (mp_load_user_script(mpctx, script) < 0)
|
2016-09-22 18:43:33 +00:00
|
|
|
return -1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2011-08-07 01:45:40 +00:00
|
|
|
default:
|
2013-12-19 20:28:55 +00:00
|
|
|
MP_VERBOSE(mpctx, "Received unknown cmd %s\n", cmd->name);
|
2014-06-01 01:41:46 +00:00
|
|
|
return -1;
|
2011-08-07 01:45:40 +00:00
|
|
|
}
|
2014-06-01 01:41:46 +00:00
|
|
|
return 0;
|
2007-02-21 00:49:24 +00:00
|
|
|
}
|
Add initial Lua scripting support
This is preliminary. There are still tons of issues, and any aspect
of scripting may change in the future. I decided to merge this
(preliminary) work now because it makes it easier to develop it, not
because it's done. lua.rst is clear enough about it (plus some
sarcasm).
This requires linking to Lua. Lua has no official pkg-config file, but
there are distribution specific .pc files, all with different names.
Adding a non-pkg-config based configure test was considered, but we'd
rather not.
One major complication is that libquvi links against Lua too, and if
the Lua version is different from mpv's, you will get a crash as soon
as libquvi uses Lua. (libquvi by design always runs when a file is
opened.) I would consider this the problem of distros and whoever
builds mpv, but to make things easier for users, we add a terrible
runtime test to the configure script, which probes whether libquvi
will crash. This is disabled when cross-compiling, but in that case
we hope the user knows what he is doing.
2013-09-25 22:41:14 +00:00
|
|
|
|
2013-09-30 20:27:37 +00:00
|
|
|
void command_uninit(struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
overlay_uninit(mpctx);
|
2015-02-12 15:53:56 +00:00
|
|
|
ao_hotplug_destroy(mpctx->command_ctx->hotplug);
|
2013-09-30 20:27:37 +00:00
|
|
|
talloc_free(mpctx->command_ctx);
|
|
|
|
mpctx->command_ctx = NULL;
|
|
|
|
}
|
Add initial Lua scripting support
This is preliminary. There are still tons of issues, and any aspect
of scripting may change in the future. I decided to merge this
(preliminary) work now because it makes it easier to develop it, not
because it's done. lua.rst is clear enough about it (plus some
sarcasm).
This requires linking to Lua. Lua has no official pkg-config file, but
there are distribution specific .pc files, all with different names.
Adding a non-pkg-config based configure test was considered, but we'd
rather not.
One major complication is that libquvi links against Lua too, and if
the Lua version is different from mpv's, you will get a crash as soon
as libquvi uses Lua. (libquvi by design always runs when a file is
opened.) I would consider this the problem of distros and whoever
builds mpv, but to make things easier for users, we add a terrible
runtime test to the configure script, which probes whether libquvi
will crash. This is disabled when cross-compiling, but in that case
we hope the user knows what he is doing.
2013-09-25 22:41:14 +00:00
|
|
|
|
|
|
|
void command_init(struct MPContext *mpctx)
|
|
|
|
{
|
2016-09-01 18:00:43 +00:00
|
|
|
struct command_ctx *ctx = talloc(NULL, struct command_ctx);
|
|
|
|
*ctx = (struct command_ctx){
|
2013-12-01 01:07:32 +00:00
|
|
|
.last_seek_pts = MP_NOPTS_VALUE,
|
|
|
|
};
|
2016-09-01 18:00:43 +00:00
|
|
|
mpctx->command_ctx = ctx;
|
|
|
|
|
|
|
|
int num_base = MP_ARRAY_SIZE(mp_properties_base);
|
|
|
|
int num_opts = m_config_get_co_count(mpctx->mconfig);
|
|
|
|
ctx->properties =
|
|
|
|
talloc_zero_array(ctx, struct m_property, num_base + num_opts + 1);
|
|
|
|
memcpy(ctx->properties, mp_properties_base, sizeof(mp_properties_base));
|
|
|
|
|
|
|
|
int count = num_base;
|
|
|
|
for (int n = 0; n < num_opts; n++) {
|
|
|
|
struct m_config_option *co = m_config_get_co_index(mpctx->mconfig, n);
|
|
|
|
assert(co->name[0]);
|
2017-07-02 14:26:41 +00:00
|
|
|
if ((co->opt->flags & M_OPT_NOPROP) &&
|
|
|
|
co->opt->type != &m_option_type_cli_alias)
|
2016-09-01 18:00:43 +00:00
|
|
|
continue;
|
|
|
|
|
2016-10-04 11:19:21 +00:00
|
|
|
struct m_property prop = {0};
|
|
|
|
|
2017-06-15 13:22:06 +00:00
|
|
|
if (co->opt->type == &m_option_type_alias) {
|
|
|
|
const char *alias = (const char *)co->opt->priv;
|
|
|
|
|
|
|
|
prop = (struct m_property){
|
|
|
|
.name = co->name,
|
|
|
|
.call = co->opt->deprecation_message ?
|
|
|
|
mp_property_deprecated_alias : mp_property_alias,
|
|
|
|
.priv = (void *)alias,
|
2017-06-16 19:31:13 +00:00
|
|
|
.is_option = true,
|
2017-06-15 13:22:06 +00:00
|
|
|
};
|
2017-07-02 14:26:41 +00:00
|
|
|
} else if (co->opt->type == &m_option_type_cli_alias) {
|
|
|
|
bstr rname = bstr0(co->opt->priv);
|
|
|
|
for (int i = rname.len - 1; i >= 0; i--) {
|
|
|
|
if (rname.start[i] == '-') {
|
|
|
|
rname.len = i;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
prop = (struct m_property){
|
|
|
|
.name = co->name,
|
|
|
|
.call = mp_property_shitfuck,
|
|
|
|
.priv = bstrto0(ctx, rname),
|
|
|
|
.is_option = true,
|
|
|
|
};
|
2017-06-15 13:22:06 +00:00
|
|
|
} else {
|
2016-10-04 11:19:21 +00:00
|
|
|
prop = (struct m_property){
|
|
|
|
.name = co->name,
|
|
|
|
.call = mp_property_generic_option,
|
2017-06-16 19:31:13 +00:00
|
|
|
.is_option = true,
|
2016-10-04 11:19:21 +00:00
|
|
|
};
|
2016-09-01 18:00:43 +00:00
|
|
|
}
|
|
|
|
|
2016-10-04 11:19:21 +00:00
|
|
|
if (prop.name) {
|
|
|
|
// The option might be covered by a manual property already.
|
|
|
|
if (m_property_list_find(ctx->properties, prop.name))
|
|
|
|
continue;
|
2016-09-01 18:00:43 +00:00
|
|
|
|
2016-10-04 11:19:21 +00:00
|
|
|
ctx->properties[count++] = prop;
|
|
|
|
}
|
2016-09-01 18:00:43 +00:00
|
|
|
}
|
Add initial Lua scripting support
This is preliminary. There are still tons of issues, and any aspect
of scripting may change in the future. I decided to merge this
(preliminary) work now because it makes it easier to develop it, not
because it's done. lua.rst is clear enough about it (plus some
sarcasm).
This requires linking to Lua. Lua has no official pkg-config file, but
there are distribution specific .pc files, all with different names.
Adding a non-pkg-config based configure test was considered, but we'd
rather not.
One major complication is that libquvi links against Lua too, and if
the Lua version is different from mpv's, you will get a crash as soon
as libquvi uses Lua. (libquvi by design always runs when a file is
opened.) I would consider this the problem of distros and whoever
builds mpv, but to make things easier for users, we add a terrible
runtime test to the configure script, which probes whether libquvi
will crash. This is disabled when cross-compiling, but in that case
we hope the user knows what he is doing.
2013-09-25 22:41:14 +00:00
|
|
|
}
|
|
|
|
|
2014-11-17 23:09:42 +00:00
|
|
|
static void command_event(struct MPContext *mpctx, int event, void *arg)
|
Add initial Lua scripting support
This is preliminary. There are still tons of issues, and any aspect
of scripting may change in the future. I decided to merge this
(preliminary) work now because it makes it easier to develop it, not
because it's done. lua.rst is clear enough about it (plus some
sarcasm).
This requires linking to Lua. Lua has no official pkg-config file, but
there are distribution specific .pc files, all with different names.
Adding a non-pkg-config based configure test was considered, but we'd
rather not.
One major complication is that libquvi links against Lua too, and if
the Lua version is different from mpv's, you will get a crash as soon
as libquvi uses Lua. (libquvi by design always runs when a file is
opened.) I would consider this the problem of distros and whoever
builds mpv, but to make things easier for users, we add a terrible
runtime test to the configure script, which probes whether libquvi
will crash. This is disabled when cross-compiling, but in that case
we hope the user knows what he is doing.
2013-09-25 22:41:14 +00:00
|
|
|
{
|
|
|
|
struct command_ctx *ctx = mpctx->command_ctx;
|
2014-11-17 23:09:42 +00:00
|
|
|
|
2014-12-17 21:56:45 +00:00
|
|
|
if (event == MPV_EVENT_START_FILE) {
|
2014-02-10 20:01:35 +00:00
|
|
|
ctx->last_seek_pts = MP_NOPTS_VALUE;
|
2014-12-17 21:56:45 +00:00
|
|
|
ctx->marked_pts = MP_NOPTS_VALUE;
|
|
|
|
}
|
2014-02-10 20:01:35 +00:00
|
|
|
|
2014-12-10 13:42:57 +00:00
|
|
|
if (event == MPV_EVENT_IDLE)
|
|
|
|
ctx->is_idle = true;
|
|
|
|
if (event == MPV_EVENT_START_FILE)
|
|
|
|
ctx->is_idle = false;
|
2014-12-10 16:52:21 +00:00
|
|
|
if (event == MPV_EVENT_END_FILE || event == MPV_EVENT_FILE_LOADED) {
|
|
|
|
// Update chapters - does nothing if something else is visible.
|
|
|
|
set_osd_bar_chapters(mpctx, OSD_BAR_SEEK);
|
|
|
|
}
|
2015-02-14 14:13:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void handle_command_updates(struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
struct command_ctx *ctx = mpctx->command_ctx;
|
2015-02-12 15:53:56 +00:00
|
|
|
|
|
|
|
// This is a bit messy: ao_hotplug wakes up the player, and then we have
|
|
|
|
// to recheck the state. Then the client(s) will read the property.
|
2017-10-09 13:48:47 +00:00
|
|
|
if (ctx->hotplug && ao_hotplug_check_update(ctx->hotplug))
|
2015-02-12 15:53:56 +00:00
|
|
|
mp_notify_property(mpctx, "audio-device-list");
|
2014-11-17 23:09:42 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void mp_notify(struct MPContext *mpctx, int event, void *arg)
|
|
|
|
{
|
player: do not update OSD all the time when paused
Normally, OSD is updated every time the playloop is run. This has to be
done, because the OSD may implicitly reference various properties,
without knowing whether they really need to be updated or not. (There's
a property update mechanism, but it's mostly unavailable, because OSD is
special-cased and can not use the client API mechanism properly.)
Normally, these updates are no problem, because the OSD is only actually
printed when the OSD text actually changes.
But commit d23ffd24 added a rate-limiting mechanism, which tries to
limit OSD updates at most every 50ms (or the next video frame). Since it
can't know in advance whether the OSD is going to change or not, this
simply waked up the player every 50ms.
Change this so that the player is updated only as part of general
updates determined through mp_notify(). (This function also notifies the
client API of changed properties.) The desired result is that the player
will not wake up at all in normal idle mode, but still update properties
that can change when paused, such as the cache.
This is mostly a cosmetic change (in the sense of making runtime
behavior just slightly better). It has the slightly more negative
consequence that properties which update implicitly (such as "clock")
will not update periodically anymore.
2016-06-11 16:40:08 +00:00
|
|
|
// The OSD can implicitly reference some properties.
|
|
|
|
mpctx->osd_idle_update = true;
|
|
|
|
|
2014-11-17 23:09:42 +00:00
|
|
|
command_event(mpctx, event, arg);
|
|
|
|
|
2014-08-01 23:39:28 +00:00
|
|
|
mp_client_broadcast_event(mpctx, event, arg);
|
2014-04-05 21:54:21 +00:00
|
|
|
}
|
|
|
|
|
2016-09-28 11:47:30 +00:00
|
|
|
static void update_priority(struct MPContext *mpctx)
|
|
|
|
{
|
2017-08-03 07:44:36 +00:00
|
|
|
#if HAVE_WIN32_DESKTOP
|
2016-09-28 11:47:30 +00:00
|
|
|
struct MPOpts *opts = mpctx->opts;
|
|
|
|
if (opts->w32_priority > 0)
|
|
|
|
SetPriorityClass(GetCurrentProcess(), opts->w32_priority);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2016-09-19 17:51:26 +00:00
|
|
|
void mp_option_change_callback(void *ctx, struct m_config_option *co, int flags)
|
|
|
|
{
|
|
|
|
struct MPContext *mpctx = ctx;
|
2016-09-21 13:56:54 +00:00
|
|
|
struct command_ctx *cmd = mpctx->command_ctx;
|
2016-09-19 17:51:26 +00:00
|
|
|
|
|
|
|
if (flags & UPDATE_TERM)
|
2016-09-29 14:26:54 +00:00
|
|
|
mp_update_logging(mpctx, false);
|
2016-09-19 17:51:26 +00:00
|
|
|
|
2017-08-22 17:08:07 +00:00
|
|
|
if (flags & UPDATE_DEINT)
|
|
|
|
recreate_auto_filters(mpctx);
|
|
|
|
|
2016-09-19 18:16:44 +00:00
|
|
|
if (flags & UPDATE_OSD) {
|
|
|
|
osd_changed(mpctx->osd);
|
2017-04-10 19:22:26 +00:00
|
|
|
for (int n = 0; n < NUM_PTRACKS; n++) {
|
|
|
|
struct track *track = mpctx->current_track[n][STREAM_SUB];
|
|
|
|
struct dec_sub *sub = track ? track->d_sub : NULL;
|
|
|
|
if (sub)
|
|
|
|
sub_control(track->d_sub, SD_CTRL_UPDATE_SPEED, NULL);
|
|
|
|
}
|
2016-09-19 18:16:44 +00:00
|
|
|
mp_wakeup_core(mpctx);
|
|
|
|
}
|
2016-09-19 22:59:54 +00:00
|
|
|
|
|
|
|
if (flags & UPDATE_BUILTIN_SCRIPTS)
|
|
|
|
mp_load_builtin_scripts(mpctx);
|
2016-09-20 13:34:31 +00:00
|
|
|
|
|
|
|
if (flags & UPDATE_IMGPAR) {
|
|
|
|
struct track *track = mpctx->current_track[0][STREAM_VIDEO];
|
|
|
|
if (track && track->d_video) {
|
|
|
|
video_reset_params(track->d_video);
|
|
|
|
mp_force_video_refresh(mpctx);
|
|
|
|
}
|
|
|
|
}
|
2016-09-21 13:56:54 +00:00
|
|
|
|
|
|
|
if (flags & UPDATE_INPUT) {
|
|
|
|
mp_input_update_opts(mpctx->input);
|
|
|
|
|
|
|
|
// Rather coarse change-detection, but sufficient effort.
|
|
|
|
struct MPOpts *opts = mpctx->opts;
|
|
|
|
if (!bstr_equals(bstr0(cmd->cur_ipc), bstr0(opts->ipc_path)) ||
|
|
|
|
!bstr_equals(bstr0(cmd->cur_ipc_input), bstr0(opts->input_file)))
|
|
|
|
{
|
|
|
|
talloc_free(cmd->cur_ipc);
|
|
|
|
talloc_free(cmd->cur_ipc_input);
|
|
|
|
cmd->cur_ipc = talloc_strdup(cmd, opts->ipc_path);
|
|
|
|
cmd->cur_ipc_input = talloc_strdup(cmd, opts->input_file);
|
|
|
|
mp_uninit_ipc(mpctx->ipc_ctx);
|
|
|
|
mpctx->ipc_ctx = mp_init_ipc(mpctx->clients, mpctx->global);
|
|
|
|
}
|
|
|
|
}
|
2016-09-22 18:56:34 +00:00
|
|
|
|
2016-10-05 14:42:43 +00:00
|
|
|
if (flags & UPDATE_AUDIO)
|
|
|
|
reload_audio_output(mpctx);
|
2016-09-28 11:47:30 +00:00
|
|
|
|
|
|
|
if (flags & UPDATE_PRIORITY)
|
|
|
|
update_priority(mpctx);
|
2016-10-02 10:33:34 +00:00
|
|
|
|
|
|
|
if (flags & UPDATE_SCREENSAVER)
|
|
|
|
update_screensaver_state(mpctx);
|
2017-04-26 19:45:50 +00:00
|
|
|
|
|
|
|
if (flags & UPDATE_VOL)
|
|
|
|
audio_update_volume(mpctx);
|
2017-08-12 21:08:48 +00:00
|
|
|
|
|
|
|
if (flags & UPDATE_LAVFI_COMPLEX)
|
|
|
|
update_lavfi_complex(mpctx);
|
2016-09-19 17:51:26 +00:00
|
|
|
}
|
2016-09-02 13:59:40 +00:00
|
|
|
|
2014-06-01 01:41:36 +00:00
|
|
|
void mp_notify_property(struct MPContext *mpctx, const char *property)
|
2014-04-05 21:54:21 +00:00
|
|
|
{
|
2014-08-01 23:39:28 +00:00
|
|
|
mp_client_property_change(mpctx, property);
|
Add initial Lua scripting support
This is preliminary. There are still tons of issues, and any aspect
of scripting may change in the future. I decided to merge this
(preliminary) work now because it makes it easier to develop it, not
because it's done. lua.rst is clear enough about it (plus some
sarcasm).
This requires linking to Lua. Lua has no official pkg-config file, but
there are distribution specific .pc files, all with different names.
Adding a non-pkg-config based configure test was considered, but we'd
rather not.
One major complication is that libquvi links against Lua too, and if
the Lua version is different from mpv's, you will get a crash as soon
as libquvi uses Lua. (libquvi by design always runs when a file is
opened.) I would consider this the problem of distros and whoever
builds mpv, but to make things easier for users, we add a terrible
runtime test to the configure script, which probes whether libquvi
will crash. This is disabled when cross-compiling, but in that case
we hope the user knows what he is doing.
2013-09-25 22:41:14 +00:00
|
|
|
}
|