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

3 files changed, 0 insertions, 35 deletions

diff --git a/stream/tvi_dshow.c b/stream/tvi_dshow.c
index 40951a698e..97fb5f0d5f 100644
--- a/stream/tvi_dshow.c
+++ b/stream/tvi_dshow.c
@@ -2264,7 +2264,6 @@ static int get_audio_framesize(priv_t * priv)
     return priv->chains[1]->rbuf->blocksize;
 }
 
-#ifdef CONFIG_TV_TELETEXT
 static int vbi_get_props(priv_t* priv,tt_stream_props* ptsp)
 {
     if(!priv || !ptsp)
@@ -2310,7 +2309,6 @@ static void vbi_grabber(priv_t* priv)
     }
     free(buf);
 }
-#endif /* CONFIG_TV_TELETEXT */
 
 /**
  * \brief fills given buffer with video data (usually one frame)
@@ -2355,9 +2353,7 @@ static double grab_video_frame(priv_t * priv, char *buffer, int len)
       rb->count--;
     LeaveCriticalSection(rb->pMutex);
 
-#ifdef CONFIG_TV_TELETEXT
     vbi_grabber(priv);
-#endif
     return pts;
 }
 
@@ -2546,7 +2542,6 @@ static HRESULT build_audio_chain(priv_t *priv)
  */
 static HRESULT build_vbi_chain(priv_t *priv)
 {
-#ifdef CONFIG_TV_TELETEXT
     HRESULT hr;
 
     if(priv->chains[2]->rbuf)
@@ -2566,7 +2561,6 @@ static HRESULT build_vbi_chain(priv_t *priv)
             return 0;
         }
     }
-#endif
     return S_OK;
 }
 
@@ -2902,10 +2896,8 @@ static int init(priv_t * priv)
             OLE_QUERYINTERFACE(priv->pBuilder,IID_IBaseFilter,pBF);
             OLE_CALL_ARGS(pBF,SetSyncSource,rc);
         }
-#ifdef CONFIG_TV_TELETEXT
        if(vbi_get_props(priv,&(priv->tsp))!=TVI_CONTROL_TRUE)
            break;
-#endif
         result = 1;
     } while(0);
 
@@ -2975,9 +2967,7 @@ static int uninit(priv_t * priv)
     if (priv->dwRegister) {
         RemoveFromRot(priv->dwRegister);
     }
-#ifdef CONFIG_TV_TELETEXT
     teletext_control(priv->priv_vbi,TV_VBI_CONTROL_STOP,(void*)1);
-#endif
     //stop audio grabber thread
 
     if (priv->state && priv->pMediaControl) {
@@ -3482,7 +3472,6 @@ static int control(priv_t * priv, int cmd, void *arg)
     case TVI_CONTROL_IMMEDIATE:
 	priv->immediate_mode = 1;
 	return TVI_CONTROL_TRUE;
-#ifdef CONFIG_TV_TELETEXT
     case TVI_CONTROL_VBI_INIT:
     {
         void* ptr;
@@ -3496,7 +3485,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;
 }
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;
diff --git a/stream/tvi_v4l2.c b/stream/tvi_v4l2.c
index fe2789e24d..1472d7b6d9 100644
--- a/stream/tvi_v4l2.c
+++ b/stream/tvi_v4l2.c
@@ -89,14 +89,12 @@ typedef struct {
     /* video */
     char                        *video_dev;
     int                         video_fd;
-#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
     int                         mp_format;
     struct v4l2_capability      capability;
     struct v4l2_input           input;
@@ -592,7 +590,6 @@ static int get_control(priv_t *priv, struct v4l2_control *control, int val_signe
     return TVI_CONTROL_TRUE;
 }
 
-#ifdef CONFIG_TV_TELETEXT
 static int vbi_init(priv_t* priv,char* device)
 {
     int vbi_fd=0;
@@ -715,7 +712,6 @@ static void *vbi_grabber(void *data)
     free(buf);
     return NULL;
 }
-#endif /* CONFIG_TV_TELETEXT */
 
 static int control(priv_t *priv, int cmd, void *arg)
 {
@@ -1039,7 +1035,6 @@ static int control(priv_t *priv, int cmd, void *arg)
         if (audio_in_set_samplerate(&priv->audio_in, *(int*)arg) < 0) return TVI_CONTROL_FALSE;
 //        setup_audio_buffer_sizes(priv);
         return TVI_CONTROL_TRUE;
-#ifdef CONFIG_TV_TELETEXT
     case TVI_CONTROL_VBI_INIT:
     {
         void* ptr;
@@ -1060,7 +1055,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
     }
     mp_msg(MSGT_TV, MSGL_V, "%s: unknown control: %d\n", info.short_name, cmd);
     return TVI_CONTROL_UNKNOWN;
@@ -1107,7 +1101,6 @@ static int uninit(priv_t *priv)
 {
     int i, frames, dropped = 0;
 
-#ifdef CONFIG_TV_TELETEXT
     priv->vbi_shutdown=1;
     if(priv->vbi_grabber_thread)
         pthread_join(priv->vbi_grabber_thread, NULL);
@@ -1124,9 +1117,6 @@ static int uninit(priv_t *priv)
         free(priv->vbi_dev);
 	priv->vbi_dev=0;
     }
-
-#endif
-
     priv->shutdown = 1;
     if(priv->video_grabber_thread)
         pthread_join(priv->video_grabber_thread, NULL);
@@ -1562,13 +1552,11 @@ static int start(priv_t *priv)
         }
     }
 
-#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
     /* start audio thread */
     priv->shutdown = 0;
     priv->audio_skew_measure_time = 0;