RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-30 15:29:56 +00:00
Code Issues Releases Wiki Activity

commands: make media-title property return filename in default case

Browse Source 
Instead of the full path.
This commit is contained in:
wm4 2012-10-30 19:32:57 +01:00
parent e5f96e9845
commit 6403ecdf87
1 changed files with 15 additions and 14 deletions

29
command.c
View File

@ -167,15 +167,26 @@ static int mp_property_path(m_option_t *prop, int action, void *arg,
return m_property_strdup_ro(prop, action, arg, mpctx->filename); return m_property_strdup_ro(prop, action, arg, mpctx->filename);
} }
static int mp_property_filename(m_option_t *prop, int action, void *arg,
MPContext *mpctx)
{
if (!mpctx->filename)
return M_PROPERTY_UNAVAILABLE;
char *f = (char *)mp_basename(mpctx->filename);
return m_property_strdup_ro(prop, action, arg, (*f) ? f : mpctx->filename);
}
static int mp_property_media_title(m_option_t *prop, int action, void *arg, static int mp_property_media_title(m_option_t *prop, int action, void *arg,
MPContext *mpctx) MPContext *mpctx)
{ {
char *name = mpctx->filename; char *name = NULL;
if (mpctx->resolve_result) if (mpctx->resolve_result)
name = mpctx->resolve_result->title; name = mpctx->resolve_result->title;
if (!name) if (name && name[0]) {
return M_PROPERTY_UNAVAILABLE; return m_property_strdup_ro(prop, action, arg, name);
return m_property_strdup_ro(prop, action, arg, name); } else {
return mp_property_filename(prop, action, arg, mpctx);
}
} }
static int mp_property_stream_path(m_option_t *prop, int action, void *arg, static int mp_property_stream_path(m_option_t *prop, int action, void *arg,
@ -187,16 +198,6 @@ static int mp_property_stream_path(m_option_t *prop, int action, void *arg,
return m_property_strdup_ro(prop, action, arg, stream->url); return m_property_strdup_ro(prop, action, arg, stream->url);
} }
/// filename without path (RO)
static int mp_property_filename(m_option_t *prop, int action, void *arg,
MPContext *mpctx)
{
if (!mpctx->filename)
return M_PROPERTY_UNAVAILABLE;
char *f = (char *)mp_basename(mpctx->filename);
return m_property_strdup_ro(prop, action, arg, (*f) ? f : mpctx->filename);
}
/// Demuxer name (RO) /// Demuxer name (RO)
static int mp_property_demuxer(m_option_t *prop, int action, void *arg, static int mp_property_demuxer(m_option_t *prop, int action, void *arg,
MPContext *mpctx) MPContext *mpctx)