diff options
author | voroshil <voroshil@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-07-29 10:30:41 +0000 |
---|---|---|
committer | voroshil <voroshil@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-07-29 10:30:41 +0000 |
commit | db734dcc1591533da1adc9222ddb801c2da570fc (patch) | |
tree | 3f2862dacb6726f62758a215786fa08890ed076c /stream | |
parent | a890471f6d07e254f01ccaaec1442d1df62050f0 (diff) | |
download | mpv-db734dcc1591533da1adc9222ddb801c2da570fc.tar.bz2 mpv-db734dcc1591533da1adc9222ddb801c2da570fc.tar.xz |
Removing global variables from tv://
Step 8 (last): removing old globals from tv.c, tv.h,
fixing remaining references in cfg-common.h and mplayer.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23909 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream')
-rw-r--r-- | stream/tv.c | 42 | ||||
-rw-r--r-- | stream/tv.h | 42 |
2 files changed, 0 insertions, 84 deletions
diff --git a/stream/tv.c b/stream/tv.c index 7a82c6a787..884271d53b 100644 --- a/stream/tv.c +++ b/stream/tv.c @@ -35,48 +35,6 @@ #include "frequencies.h" -/* some default values */ -int tv_param_audiorate = 44100; -int tv_param_noaudio = 0; -int tv_param_immediate = 0; -char *tv_param_freq = NULL; -char *tv_param_channel = NULL; -char *tv_param_norm = "pal"; -#ifdef HAVE_TV_V4L2 -int tv_param_normid = -1; -#endif -char *tv_param_chanlist = "europe-east"; -char *tv_param_device = NULL; -char *tv_param_driver = "dummy"; -int tv_param_width = -1; -int tv_param_height = -1; -int tv_param_input = 0; /* used in v4l and bttv */ -int tv_param_outfmt = -1; -float tv_param_fps = -1.0; -char **tv_param_channels = NULL; -int tv_param_audio_id = 0; -int tv_param_automute = 0; -#if defined(HAVE_TV_V4L) -int tv_param_amode = -1; -int tv_param_volume = -1; -int tv_param_bass = -1; -int tv_param_treble = -1; -int tv_param_balance = -1; -int tv_param_forcechan = -1; -int tv_param_force_audio = 0; -int tv_param_buffer_size = -1; -int tv_param_mjpeg = 0; -int tv_param_decimation = 2; -int tv_param_quality = 90; -#if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X) -int tv_param_alsa = 0; -#endif -#endif -char* tv_param_adevice = NULL; -int tv_param_brightness = 0; -int tv_param_contrast = 0; -int tv_param_hue = 0; -int tv_param_saturation = 0; tv_channels_t *tv_channel_list; tv_channels_t *tv_channel_current, *tv_channel_last; char *tv_channel_last_real; diff --git a/stream/tv.h b/stream/tv.h index 277eb815cb..ad40780414 100644 --- a/stream/tv.h +++ b/stream/tv.h @@ -5,48 +5,6 @@ //#include "libmpcodecs/img_format.h" //#include "mp_msg.h" -extern char *tv_param_freq; -extern char *tv_param_channel; -extern char *tv_param_chanlist; -extern char *tv_param_norm; -extern int tv_param_automute; -#ifdef HAVE_TV_V4L2 -extern int tv_param_normid; -#endif -extern char *tv_param_device; -extern char *tv_param_driver; -extern int tv_param_width; -extern int tv_param_height; -extern int tv_param_input; -extern int tv_param_outfmt; -extern float tv_param_fps; -extern char **tv_param_channels; -extern int tv_param_noaudio; -extern int tv_param_immediate; -extern int tv_param_audiorate; -extern int tv_param_audio_id; -#if defined(HAVE_TV_V4L) -extern int tv_param_amode; -extern int tv_param_volume; -extern int tv_param_bass; -extern int tv_param_treble; -extern int tv_param_balance; -extern int tv_param_forcechan; -extern int tv_param_force_audio; -extern int tv_param_buffer_size; -extern int tv_param_mjpeg; -extern int tv_param_decimation; -extern int tv_param_quality; -#if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X) -extern int tv_param_alsa; -#endif -extern char* tv_param_adevice; -#endif -extern int tv_param_brightness; -extern int tv_param_contrast; -extern int tv_param_hue; -extern int tv_param_saturation; - typedef struct tv_param_s { char *freq; char *channel; |