diff options
author | wm4 <wm4@nowhere> | 2014-06-09 23:54:45 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-06-11 00:34:42 +0200 |
commit | 383cf207859485c4516d29053dafab0bb2d8c347 (patch) | |
tree | 5eb5775fd1b3cc8b94c679f55defeeea9fb46746 /stream/tv.h | |
parent | 98c0930f9b69122996cc725a08336ee6bd9abc7e (diff) | |
download | mpv-383cf207859485c4516d29053dafab0bb2d8c347.tar.bz2 mpv-383cf207859485c4516d29053dafab0bb2d8c347.tar.xz |
tv: remove global option variables
Pretty much nothing changes, but using -tv-scan with suboptions doesn't
work anymore (instead of "-tv-scan x" it's "-tv scan-x" now). Flat
options ("-tv-scan-x") stay compatible.
Diffstat (limited to 'stream/tv.h')
-rw-r--r-- | stream/tv.h | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/stream/tv.h b/stream/tv.h index c5e8aba91f..74363ae846 100644 --- a/stream/tv.h +++ b/stream/tv.h @@ -27,7 +27,7 @@ struct mp_log; -typedef struct tv_param_s { +typedef struct tv_params { char *freq; char *channel; char *chanlist; @@ -42,7 +42,7 @@ typedef struct tv_param_s { int outfmt; float fps; char **channels; - int noaudio; + int audio; int immediate; int audiorate; int audio_id; @@ -68,14 +68,12 @@ typedef struct tv_param_s { int scan; int scan_threshold; float scan_period; - /** - Terminate stream with video renderer instead of Null renderer - Will help if video freezes but audio does not. - May not work with -vo directx and -vf crop combination. - */ } tv_param_t; -extern tv_param_t stream_tv_defaults; +struct tv_stream_params { + char *channel; + int input; +}; typedef struct tvi_info_s { @@ -115,6 +113,10 @@ typedef struct tvi_handle_s { int channel; tv_param_t * tv_param; void * scan; + + struct tv_channels_s *tv_channel_list; + struct tv_channels_s *tv_channel_current, *tv_channel_last; + char *tv_channel_last_real; } tvi_handle_t; typedef struct tv_channels_s { @@ -127,10 +129,6 @@ typedef struct tv_channels_s { struct tv_channels_s *prev; } tv_channels_t; -extern tv_channels_t *tv_channel_list; -extern tv_channels_t *tv_channel_current, *tv_channel_last; -extern char *tv_channel_last_real; - typedef struct { unsigned int scan_timer; int channel_num; |