From 73ac34b220d168e0f9c3399aedfb73f78e5fa455 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 10 Jun 2014 20:12:19 +0200 Subject: stream_pvr: remove global option variables --- options/options.c | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) (limited to 'options/options.c') diff --git a/options/options.c b/options/options.c index a4d2ebe430..466049a91c 100644 --- a/options/options.c +++ b/options/options.c @@ -63,31 +63,7 @@ static void print_help(struct mp_log *log) } extern const struct m_sub_options tv_params_conf; - -extern int pvr_param_aspect_ratio; -extern int pvr_param_sample_rate; -extern int pvr_param_audio_layer; -extern int pvr_param_audio_bitrate; -extern char *pvr_param_audio_mode; -extern int pvr_param_bitrate; -extern char *pvr_param_bitrate_mode; -extern int pvr_param_bitrate_peak; -extern char *pvr_param_stream_type; - -#if HAVE_PVR -static const m_option_t pvropts_conf[]={ - {"aspect", &pvr_param_aspect_ratio, CONF_TYPE_INT, 0, 1, 4, NULL}, - {"arate", &pvr_param_sample_rate, CONF_TYPE_INT, 0, 32000, 48000, NULL}, - {"alayer", &pvr_param_audio_layer, CONF_TYPE_INT, 0, 1, 2, NULL}, - {"abitrate", &pvr_param_audio_bitrate, CONF_TYPE_INT, 0, 32, 448, NULL}, - {"amode", &pvr_param_audio_mode, CONF_TYPE_STRING, 0, 0, 0, NULL}, - {"vbitrate", &pvr_param_bitrate, CONF_TYPE_INT, 0, 0, 0, NULL}, - {"vmode", &pvr_param_bitrate_mode, CONF_TYPE_STRING, 0, 0, 0, NULL}, - {"vpeak", &pvr_param_bitrate_peak, CONF_TYPE_INT, 0, 0, 0, NULL}, - {"fmt", &pvr_param_stream_type, CONF_TYPE_STRING, 0, 0, 0, NULL}, - {NULL, NULL, 0, 0, 0, 0, NULL} -}; -#endif /* HAVE_PVR */ +extern const struct m_sub_options stream_pvr_conf; extern const m_option_t dvbin_opts_conf[]; extern const m_option_t lavfdopts_conf[]; @@ -269,7 +245,7 @@ const m_option_t mp_opts[] = { OPT_SUBSTRUCT("tv", tv_params, tv_params_conf, 0), #endif /* HAVE_TV */ #if HAVE_PVR - {"pvr", (void *) pvropts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, + OPT_SUBSTRUCT("pvr", stream_pvr_opts, stream_pvr_conf, 0), #endif /* HAVE_PVR */ #if HAVE_DVBIN {"dvbin", (void *) dvbin_opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, -- cgit v1.2.3