diff options
-rw-r--r-- | core/command.c | 4 | ||||
-rw-r--r-- | core/options.c | 2 | ||||
-rw-r--r-- | stream/stream_radio.c | 4 |
3 files changed, 5 insertions, 5 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}, diff --git a/stream/stream_radio.c b/stream/stream_radio.c index 56a01c7d7c..5fdf22ba9e 100644 --- a/stream/stream_radio.c +++ b/stream/stream_radio.c @@ -120,7 +120,7 @@ typedef struct radio_driver_s { #define OPT_BASE_STRUCT radio_param_t static const m_option_t stream_opts_fields[] = { OPT_FLOAT("title", freq_channel, 0), - OPT_STRING("device", capture, 0), + OPT_STRING("capture", capture, 0), {0} }; @@ -967,7 +967,7 @@ const stream_info_t stream_info_radio = { .options = stream_opts_fields, .url_options = { {"hostname", "freqchannel"}, - {"username", "capture"}, + {"filename", "capture"}, {0} }, }; |