diff options
-rw-r--r-- | cfg-mplayer.h | 10 | ||||
-rw-r--r-- | stream/tv.c | 9 |
2 files changed, 3 insertions, 16 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h index e93a7f8d40..011b0c568d 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -104,7 +104,7 @@ const m_option_t tvopts_conf[]={ {"chanlist", &stream_tv_defaults.chanlist, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"norm", &stream_tv_defaults.norm, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"automute", &stream_tv_defaults.automute, CONF_TYPE_INT, CONF_RANGE, 0, 255, NULL}, -#if defined(CONFIG_TV_V4L2) || defined(CONFIG_TV_DSHOW) +#if defined(CONFIG_TV_V4L2) {"normid", &stream_tv_defaults.normid, CONF_TYPE_INT, 0, 0, 0, NULL}, #endif {"width", &stream_tv_defaults.width, CONF_TYPE_INT, 0, 0, 4096, NULL}, @@ -118,7 +118,7 @@ const m_option_t tvopts_conf[]={ {"hue", &stream_tv_defaults.hue, CONF_TYPE_INT, CONF_RANGE, -100, 100, NULL}, {"saturation", &stream_tv_defaults.saturation, CONF_TYPE_INT, CONF_RANGE, -100, 100, NULL}, {"gain", &stream_tv_defaults.gain, CONF_TYPE_INT, CONF_RANGE, -1, 100, NULL}, -#if defined(CONFIG_TV_V4L2) || defined(CONFIG_TV_DSHOW) +#if defined(CONFIG_TV_V4L2) {"buffersize", &stream_tv_defaults.buffer_size, CONF_TYPE_INT, CONF_RANGE, 16, 1024, NULL}, {"amode", &stream_tv_defaults.amode, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL}, {"volume", &stream_tv_defaults.volume, CONF_TYPE_INT, CONF_RANGE, 0, 65535, NULL}, @@ -139,12 +139,6 @@ const m_option_t tvopts_conf[]={ #endif /* defined(CONFIG_TV_V4L2) */ {"adevice", &stream_tv_defaults.adevice, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"audioid", &stream_tv_defaults.audio_id, CONF_TYPE_INT, CONF_RANGE, 0, 9, NULL}, -#ifdef CONFIG_TV_DSHOW - {"hidden_video_renderer", &stream_tv_defaults.hidden_video_renderer, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - {"hidden_vp_renderer", &stream_tv_defaults.hidden_vp_renderer, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - {"system_clock", &stream_tv_defaults.system_clock, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - {"normalize_audio_chunks", &stream_tv_defaults.normalize_audio_chunks, CONF_TYPE_FLAG, 0, 0, 1, NULL}, -#endif {NULL, NULL, 0, 0, 0, 0, NULL} }; #endif /* CONFIG_TV */ diff --git a/stream/tv.c b/stream/tv.c index 57a94fdf82..b0abad6e6d 100644 --- a/stream/tv.c +++ b/stream/tv.c @@ -56,7 +56,6 @@ char *tv_channel_last_real; /* enumerating drivers (like in stream.c) */ extern const tvi_info_t tvi_info_dummy; -extern const tvi_info_t tvi_info_dshow; extern const tvi_info_t tvi_info_v4l2; extern const tvi_info_t tvi_info_bsdbt848; @@ -68,9 +67,6 @@ static const tvi_info_t* tvi_driver_list[]={ #ifdef CONFIG_TV_BSDBT848 &tvi_info_bsdbt848, #endif -#ifdef CONFIG_TV_DSHOW - &tvi_info_dshow, -#endif &tvi_info_dummy, NULL }; @@ -464,14 +460,11 @@ static int open_tv(tvi_handle_t *tvh) /* set some params got from cmdline */ funcs->control(tvh->priv, TVI_CONTROL_SPC_SET_INPUT, &tvh->tv_param->input); -#if defined(CONFIG_TV_V4L2) || defined(CONFIG_TV_DSHOW) +#if defined(CONFIG_TV_V4L2) if (0 #ifdef CONFIG_TV_V4L2 || (!strcmp(tvh->tv_param->driver, "v4l2") && tvh->tv_param->normid >= 0) #endif -#ifdef CONFIG_TV_DSHOW - || (!strcmp(tvh->tv_param->driver, "dshow") && tvh->tv_param->normid >= 0) -#endif ) tv_set_norm_i(tvh, tvh->tv_param->normid); else |