summaryrefslogtreecommitdiffstats
path: root/options
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-06-10 20:12:19 +0200
committerwm4 <wm4@nowhere>2014-06-11 00:34:42 +0200
commit73ac34b220d168e0f9c3399aedfb73f78e5fa455 (patch)
tree07f547934e14595ed9688208e8eb9881d18b7708 /options
parentfcf9bb95b5d95dc8b0f45b368074d0f67bd4e7d2 (diff)
downloadmpv-73ac34b220d168e0f9c3399aedfb73f78e5fa455.tar.bz2
mpv-73ac34b220d168e0f9c3399aedfb73f78e5fa455.tar.xz
stream_pvr: remove global option variables
Diffstat (limited to 'options')
-rw-r--r--options/options.c28
-rw-r--r--options/options.h1
2 files changed, 3 insertions, 26 deletions
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},
diff --git a/options/options.h b/options/options.h
index 2451c5f82e..ec572fe1d1 100644
--- a/options/options.h
+++ b/options/options.h
@@ -239,6 +239,7 @@ typedef struct MPOpts {
char *network_tls_ca_file;
struct tv_params *tv_params;
+ struct pvr_params *stream_pvr_opts;
struct lavc_param {
int fast;