command: make 'disc-title' property writable

This commit makes 'disc-title' property writable using
STREAM_CTRL_SET_CURRENT_TITLE. This commit also contains
implementation of STREAM_CTRL_SET_CURRENT_TITLE for stream_bluray.
Currently, 'disc-title' is writable only for stream_dvdnav and
stream_bluray and stream_dvd is not supported.
This commit is contained in:
xylosper authored and wm4 committed 2014-03-18 15:24:45 +01:00
1 parent 5c2b4d9356
commit d2e35b2faa
2 files changed
+16 -3

No files matched your search

+8 -2
View File
@@ -436,7 +436,7 @@ static int mp_property_playtime_remaining(m_option_t *prop, int action,
return property_time(prop, action, arg, remaining / speed);
}
/// Current BD/DVD title (RO)
/// Current BD/DVD title (RW)
static int mp_property_disc_title(m_option_t *prop, int action, void *arg,
MPContext *mpctx)
{
@@ -449,7 +449,13 @@ static int mp_property_disc_title(m_option_t *prop, int action, void *arg,
case M_PROPERTY_GET:
if (stream_control(stream, STREAM_CTRL_GET_CURRENT_TITLE, &title) <= 0)
return M_PROPERTY_UNAVAILABLE;
return m_property_int_ro(prop, action, arg, title);
*(int*)arg = title;
return M_PROPERTY_OK;
case M_PROPERTY_SET:
title = *(int*)arg;
if (stream_control(stream, STREAM_CTRL_SET_CURRENT_TITLE, &title) <= 0)
return M_PROPERTY_NOT_IMPLEMENTED;
return M_PROPERTY_OK;
default:
return M_PROPERTY_NOT_IMPLEMENTED;
}
+8 -1
View File
@@ -143,7 +143,14 @@ static int bluray_stream_control(stream_t *s, int cmd, void *arg)
}
return STREAM_ERROR;
}
case STREAM_CTRL_SET_CURRENT_TITLE: {
const uint32_t title = *((unsigned int*)arg);
if (title < b->num_titles && bd_select_title(b->bd, title)) {
b->current_title = title;
return STREAM_OK;
}
return STREAM_ERROR;
}
case STREAM_CTRL_GET_CURRENT_TITLE: {
*((unsigned int *) arg) = b->current_title;
return 1;