From 423c415534f7393c07247b87ab4d95f6d0635474 Mon Sep 17 00:00:00 2001 From: cehoyos Date: Sat, 7 Nov 2009 12:31:05 +0000 Subject: Separate teletext from tv support. Path by Francesco Lavra, francescolavra interfree it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29848 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/tv.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'stream/tv.h') diff --git a/stream/tv.h b/stream/tv.h index abcbb0b680..48ff88ecc2 100644 --- a/stream/tv.h +++ b/stream/tv.h @@ -25,6 +25,9 @@ #ifndef MPLAYER_TV_H #define MPLAYER_TV_H +#include "libmpcodecs/dec_teletext.h" +#include "libmpdemux/demuxer.h" + typedef struct tv_param_s { char *freq; char *channel; @@ -62,10 +65,7 @@ typedef struct tv_param_s { int hue; int saturation; int gain; - char *tdevice; ///< teletext device - int tformat; ///< teletext display format - int tpage; ///< start teletext page - int tlang; ///< primary language code + struct tt_param teletext; int scan; int scan_threshold; @@ -125,6 +125,7 @@ typedef struct tvi_handle_s { const tvi_functions_t *functions; void *priv; int seq; + demuxer_t *demuxer; /* specific */ int norm; @@ -220,6 +221,7 @@ typedef struct { //tvi_* ioctl (not dec_teletext.c !!!) #define TVI_CONTROL_VBI_INIT 0x501 ///< vbi init +#define TVI_CONTROL_GET_VBI_PTR 0x502 ///< get teletext private pointer int tv_set_color_options(tvi_handle_t *tvh, int opt, int val); int tv_get_color_options(tvi_handle_t *tvh, int opt, int* val); -- cgit v1.2.3