diff options
author | wm4 <wm4@nowhere> | 2013-08-05 18:07:12 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-08-05 19:18:22 +0200 |
commit | 3be39ed76c743647873201942012c43acdcd89a8 (patch) | |
tree | 8cb3812cd8db0fd871d59f8f1d6755c16341f21e /core | |
parent | ee2e3b3374c4756dc881962bea4e4615805a8122 (diff) | |
download | mpv-3be39ed76c743647873201942012c43acdcd89a8.tar.bz2 mpv-3be39ed76c743647873201942012c43acdcd89a8.tar.xz |
stream_radio: fix some things
Using the radio set/step channel commands would have crashed (that was
broken for about a year, nobody ever noticed). The "capture" part of
a radio:// URI was incorrectly passed (this was broken quite recently).
Still couldn't test it fully. I have no radio device. I suspect nobody
uses this feature or will ever use it again.
Diffstat (limited to 'core')
-rw-r--r-- | core/command.c | 4 | ||||
-rw-r--r-- | core/options.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/command.c b/core/command.c index a2d4d2ee56..b7718e41b7 100644 --- a/core/command.c +++ b/core/command.c @@ -2401,7 +2401,7 @@ void run_command(MPContext *mpctx, mp_cmd_t *cmd) else radio_step_channel(mpctx->stream, RADIO_CHANNEL_LOWER); if (radio_get_channel_name(mpctx->stream)) { - set_osd_tmsg(OSD_MSG_RADIO_CHANNEL, osdl, osd_duration, + set_osd_tmsg(mpctx, OSD_MSG_RADIO_CHANNEL, osdl, osd_duration, "Channel: %s", radio_get_channel_name(mpctx->stream)); } @@ -2412,7 +2412,7 @@ void run_command(MPContext *mpctx, mp_cmd_t *cmd) if (mpctx->stream && mpctx->stream->type == STREAMTYPE_RADIO) { radio_set_channel(mpctx->stream, cmd->args[0].v.s); if (radio_get_channel_name(mpctx->stream)) { - set_osd_tmsg(OSD_MSG_RADIO_CHANNEL, osdl, osd_duration, + set_osd_tmsg(mpctx, OSD_MSG_RADIO_CHANNEL, osdl, osd_duration, "Channel: %s", radio_get_channel_name(mpctx->stream)); } diff --git a/core/options.c b/core/options.c index 0409288b9e..dcab2dc564 100644 --- a/core/options.c +++ b/core/options.c @@ -426,7 +426,7 @@ const m_option_t mp_opts[] = { {"mf", (void *) mfopts_conf, CONF_TYPE_SUBCONFIG, 0,0,0, NULL}, #ifdef CONFIG_RADIO - {"radio", radioopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, + {"radio", (void *) radioopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, #endif /* CONFIG_RADIO */ #ifdef CONFIG_TV {"tv", (void *) tvopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, |