mirror of https://github.com/mpv-player/mpv
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.
This commit is contained in:
parent
ee2e3b3374
commit
3be39ed76c
|
@ -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));
|
||||
}
|
||||
|
|
|
@ -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},
|
||||
|
|
|
@ -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}
|
||||
},
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue