From 62acd315ade4c95db5f88c9bda668677e9c6f438 Mon Sep 17 00:00:00 2001 From: Oliver Freyermuth Date: Fri, 8 Jan 2016 20:19:57 +0100 Subject: player, stream_dvb: implement dvb-channel-name property. On read, it returns the name of the current DVB program, on write, it triggers a channel-switch to the program if it is found in the channel list of the currently active card. Compared to the dvb-channel property which already exists and is a pair of integers (card + channel number) this has the limitation of not switching the card, but is probably of much more common use. --- player/command.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'player/command.c') diff --git a/player/command.c b/player/command.c index 941dd34ec5..470fcc7b0f 100644 --- a/player/command.c +++ b/player/command.c @@ -2999,6 +2999,27 @@ static int mp_property_dvb_channel(void *ctx, struct m_property *prop, return M_PROPERTY_NOT_IMPLEMENTED; } +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; + 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; +} + static int mp_property_playlist_pos(void *ctx, struct m_property *prop, int action, void *arg) { @@ -3626,6 +3647,7 @@ static const struct m_property mp_properties[] = { {"tv-scan", mp_property_tv_scan}, {"tv-channel", mp_property_tv_channel}, {"dvb-channel", mp_property_dvb_channel}, + {"dvb-channel-name", mp_property_dvb_channel_name}, {"cursor-autohide", mp_property_cursor_autohide}, -- cgit v1.2.3