summaryrefslogtreecommitdiffstats
path: root/player/command.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-08-26 12:31:09 +0200
committerwm4 <wm4@nowhere>2016-08-26 13:33:38 +0200
commit4121016689668921538317449c0ea9063fc086fc (patch)
treeb95cb98b22a89271af627464894f05f855346dc2 /player/command.c
parentb636b1905822272bdde10ebe5d997396751892bf (diff)
downloadmpv-4121016689668921538317449c0ea9063fc086fc.tar.bz2
mpv-4121016689668921538317449c0ea9063fc086fc.tar.xz
player: don't directly access demuxer->stream
Cleaner and makes it easier to change the underlying stream. mp_property_stream_capture() still directly accesses it directly via demux_run_on_thread(). This is evil, but still somewhat sane and is not getting into the way here. Not sure if I got all field accesses.
Diffstat (limited to 'player/command.c')
-rw-r--r--player/command.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/player/command.c b/player/command.c
index e9a051db8c..f4c10d48b9 100644
--- a/player/command.c
+++ b/player/command.c
@@ -429,11 +429,9 @@ static int mp_property_stream_path(void *ctx, struct m_property *prop,
int action, void *arg)
{
MPContext *mpctx = ctx;
- // demuxer->stream as well as stream->url are immutable -> ok to access
- struct stream *stream = mpctx->demuxer ? mpctx->demuxer->stream : NULL;
- if (!stream || !stream->url)
+ if (!mpctx->demuxer || !mpctx->demuxer->filename)
return M_PROPERTY_UNAVAILABLE;
- return m_property_strdup_ro(action, arg, stream->url);
+ return m_property_strdup_ro(action, arg, mpctx->demuxer->filename);
}
struct change_stream_capture_args {