diff options
author | cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-11-07 16:40:42 +0000 |
---|---|---|
committer | cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-11-07 16:40:42 +0000 |
commit | 2a5611473cb3696597240be15b0e1e662c1c79b8 (patch) | |
tree | b975e1a5a810d109e78a419af4818455de9f0192 /stream/tvi_v4l.c | |
parent | 241164f72c01b4e15e7afff36064a9217ebad77f (diff) | |
download | mpv-2a5611473cb3696597240be15b0e1e662c1c79b8.tar.bz2 mpv-2a5611473cb3696597240be15b0e1e662c1c79b8.tar.xz |
Remove CONFIG_TV_TELETEXT.
DVB teletext support is nearly finished, it will be possible to read
teletext from file, it will not be depending on reception any more.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29851 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream/tvi_v4l.c')
-rw-r--r-- | stream/tvi_v4l.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/stream/tvi_v4l.c b/stream/tvi_v4l.c index eb09610d34..e46f13797c 100644 --- a/stream/tvi_v4l.c +++ b/stream/tvi_v4l.c @@ -142,14 +142,12 @@ typedef struct { long audio_recv_blocks_total; long audio_sent_blocks_total; long mjpeg_bufsize; -#ifdef CONFIG_TV_TELETEXT char *vbi_dev; int vbi_fd; int vbi_bufsize; int vbi_shutdown; pthread_t vbi_grabber_thread; void *priv_vbi; -#endif tv_param_t *tv_param; } priv_t; @@ -676,7 +674,6 @@ static int uninit(priv_t *priv) { unsigned long num; -#ifdef CONFIG_TV_TELETEXT priv->vbi_shutdown=1; if(priv->vbi_grabber_thread) pthread_join(priv->vbi_grabber_thread, NULL); @@ -694,8 +691,6 @@ static int uninit(priv_t *priv) priv->vbi_dev=0; } -#endif - priv->shutdown = 1; mp_msg(MSGT_TV, MSGL_V, "Waiting for threads to finish... "); @@ -782,7 +777,6 @@ static int get_capture_buffer_size(priv_t *priv) return cnt; } -#ifdef CONFIG_TV_TELETEXT static int vbi_init(priv_t* priv,char* device) { int vbi_fd=0; @@ -898,7 +892,6 @@ static void *vbi_grabber(void *data) free(buf); return NULL; } -#endif /* CONFIG_TV_TELETEXT */ static int start(priv_t *priv) { @@ -1112,13 +1105,11 @@ static int start(priv_t *priv) ioctl(priv->video_fd, VIDIOCSAUDIO, &priv->audio[priv->audio_id]); } -#ifdef CONFIG_TV_TELETEXT /* start vbi thread */ if(priv->priv_vbi){ priv->vbi_shutdown = 0; pthread_create(&priv->vbi_grabber_thread, NULL, vbi_grabber, priv); } -#endif /* launch capture threads */ priv->shutdown = 0; @@ -1512,7 +1503,6 @@ static int control(priv_t *priv, int cmd, void *arg) priv->immediate_mode = 1; return TVI_CONTROL_TRUE; } -#ifdef CONFIG_TV_TELETEXT case TVI_CONTROL_VBI_INIT: { void* ptr; @@ -1533,7 +1523,6 @@ static int control(priv_t *priv, int cmd, void *arg) case TVI_CONTROL_GET_VBI_PTR: *(void **)arg=priv->priv_vbi; return TVI_CONTROL_TRUE; -#endif } return TVI_CONTROL_UNKNOWN; |