From 132f395aacb2c658e91b8845076115f98158edce Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 13 Apr 2014 18:51:43 +0200 Subject: Remove radio:// It was disabled by default, works only for analogue radio, and I bet nobody uses it. --- options/options.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'options') diff --git a/options/options.c b/options/options.c index 77d9205082..42ca0846d9 100644 --- a/options/options.c +++ b/options/options.c @@ -32,8 +32,8 @@ #include "m_config.h" #include "m_option.h" #include "common/common.h" +#include "stream/stream.h" #include "stream/tv.h" -#include "stream/stream_radio.h" #include "video/csputils.h" #include "sub/osd.h" #include "audio/mixer.h" @@ -62,19 +62,6 @@ static void print_help(struct mp_log *log) mp_info(log, "%s", mp_help_text); } -#if HAVE_RADIO -static const m_option_t radioopts_conf[]={ - {"device", &stream_radio_defaults.device, CONF_TYPE_STRING, 0, 0 ,0, NULL}, - {"driver", &stream_radio_defaults.driver, CONF_TYPE_STRING, 0, 0 ,0, NULL}, - {"channels", &stream_radio_defaults.channels, CONF_TYPE_STRING_LIST, 0, 0 ,0, NULL}, - {"volume", &stream_radio_defaults.volume, CONF_TYPE_INT, CONF_RANGE, 0 ,100, NULL}, - {"adevice", &stream_radio_defaults.adevice, CONF_TYPE_STRING, 0, 0 ,0, NULL}, - {"arate", &stream_radio_defaults.arate, CONF_TYPE_INT, CONF_MIN, 0 ,0, NULL}, - {"achannels", &stream_radio_defaults.achannels, CONF_TYPE_INT, CONF_MIN, 0 ,0, NULL}, - {NULL, NULL, 0, 0, 0, 0, NULL} -}; -#endif /* HAVE_RADIO */ - #if HAVE_TV static const m_option_t tvopts_conf[]={ {"immediatemode", &stream_tv_defaults.immediate, CONF_TYPE_INT, CONF_RANGE, 0, 1, NULL}, @@ -338,9 +325,6 @@ const m_option_t mp_opts[] = { OPT_STRING("sub-demuxer", sub_demuxer_name, 0), {"mf", (void *) mfopts_conf, CONF_TYPE_SUBCONFIG, 0,0,0, NULL}, -#if HAVE_RADIO - {"radio", (void *) radioopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, -#endif /* HAVE_RADIO */ #if HAVE_TV {"tv", (void *) tvopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, #endif /* HAVE_TV */ -- cgit v1.2.3