summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-02-15 16:53:11 +0100
committerwm4 <wm4@nowhere>2014-02-16 03:51:02 +0100
commit92133b1dcd403b0befd955c83833edcba249c1b1 (patch)
treea64518bbabea53db4c4aedbacb0337dbae25e433
parent801de5ac6d16ba87143ff42fe218558ebc37efd3 (diff)
downloadmpv-92133b1dcd403b0befd955c83833edcba249c1b1.tar.bz2
mpv-92133b1dcd403b0befd955c83833edcba249c1b1.tar.xz
command: expose track list as properties
-rw-r--r--DOCS/man/en/input.rst42
-rw-r--r--player/command.c34
2 files changed, 73 insertions, 3 deletions
diff --git a/DOCS/man/en/input.rst b/DOCS/man/en/input.rst
index a6e7bc4fda..6eaf5e34b1 100644
--- a/DOCS/man/en/input.rst
+++ b/DOCS/man/en/input.rst
@@ -870,6 +870,48 @@ an option at runtime.
List of audio/video/sub tracks, current entry marked. Currently, the raw
property value is useless.
+ This has a number of sub-properties. Replace ``N`` with the 0-based track
+ index.
+
+ ``track-list/count``
+ Total number of tracks.
+
+ ``track-list/N/id``
+ The ID as it's used for ``-sid``/``--aid``/``--vid``. This is unique
+ within tracks of the same type (sub/audio/video), but otherwise not.
+
+ ``track-list/N/type``
+ String describing the media type. One of ``audio``, ``video``, ``sub``.
+
+ ``track-list/N/src-id``
+ Track ID as used in the source file. Not always available.
+
+ ``track-list/N/title``
+ Track title as it is stored in the file. Not always available.
+
+ ``track-list/N/lang``
+ Track language as identified by the file. Not always available.
+
+ ``track-list/N/albumart``
+ ``yes`` if this is a video track that consists of a single picture,
+ ``no`` or unavailable otherwise. This is used for video tracks that are
+ really attached pictures in audio files.
+
+ ``track-list/N/default``
+ ``yes`` if the track has the default flag set in the file, ``no``
+ otherwise.
+
+ ``track-list/N/external``
+ ``yes`` if the track is an external file, ``no`` otherwise. This is
+ set for separate subtitle files.
+
+ ``track-list/N/external-filename``
+ The filename if the track is from an external file, unavailable
+ otherwise.
+
+ ``track-list/N/selected``
+ ``yes`` if the track is currently decoded, ``no`` otherwise.
+
``chapter-list``
List of chapters, current entry marked. Currently, the raw property value
is useless.
diff --git a/player/command.c b/player/command.c
index 8e58d7a0ac..826a94fd75 100644
--- a/player/command.c
+++ b/player/command.c
@@ -1063,6 +1063,33 @@ static int property_switch_track(m_option_t *prop, int action, void *arg,
return mp_property_generic_option(prop, action, arg, mpctx);
}
+static int get_track_entry(int item, int action, void *arg, void *ctx)
+{
+ struct MPContext *mpctx = ctx;
+ struct track *track = mpctx->tracks[item];
+
+ 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},
+ {"albumart", SUB_PROP_FLAG(track->attached_picture)},
+ {"default", SUB_PROP_FLAG(track->default_track)},
+ {"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},
+ {0}
+ };
+
+ return m_property_read_sub(props, action, arg);
+}
+
static const char *track_type_name(enum stream_type t)
{
switch (t) {
@@ -1076,7 +1103,7 @@ static const char *track_type_name(enum stream_type t)
static int property_list_tracks(m_option_t *prop, int action, void *arg,
MPContext *mpctx)
{
- if (action == M_PROPERTY_GET) {
+ if (action == M_PROPERTY_PRINT) {
char *res = NULL;
for (int type = 0; type < STREAM_TYPE_COUNT; type++) {
@@ -1113,7 +1140,8 @@ static int property_list_tracks(m_option_t *prop, int action, void *arg,
*(char **)arg = res;
return M_PROPERTY_OK;
}
- return M_PROPERTY_NOT_IMPLEMENTED;
+ return m_property_read_list(action, arg, mpctx->num_tracks,
+ get_track_entry, mpctx);
}
/// Selected audio id (RW)
@@ -1954,7 +1982,7 @@ static const m_option_t mp_properties[] = {
0, 0, 0, NULL },
{ "chapter-list", mp_property_list_chapters, CONF_TYPE_STRING },
- { "track-list", property_list_tracks, CONF_TYPE_STRING },
+ M_PROPERTY("track-list", property_list_tracks),
{ "playlist", mp_property_playlist, CONF_TYPE_STRING },
{ "playlist-pos", mp_property_playlist_pos, CONF_TYPE_INT },