From 2a5611473cb3696597240be15b0e1e662c1c79b8 Mon Sep 17 00:00:00 2001
From: cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sat, 7 Nov 2009 16:40:42 +0000
Subject: 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
---
 stream/tvi_dshow.c | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'stream/tvi_dshow.c')

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;
 }
-- 
cgit v1.2.3