diff options
| author | cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-11-07 12:31:05 +0000 |
|---|---|---|
| committer | cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-11-07 12:31:05 +0000 |
| commit | 423c415534f7393c07247b87ab4d95f6d0635474 (patch) | |
| tree | dd986257786302c543d7a1807b4c310d15883276 /libmpcodecs | |
| parent | 1698db0726e4b7c11f4dc47dfc823df5ab1cd80d (diff) | |
| download | mpv-423c415534f7393c07247b87ab4d95f6d0635474.tar.bz2 mpv-423c415534f7393c07247b87ab4d95f6d0635474.tar.xz | |
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
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/dec_teletext.c | 11 | ||||
| -rw-r--r-- | libmpcodecs/dec_teletext.h | 11 |
2 files changed, 16 insertions, 6 deletions
diff --git a/libmpcodecs/dec_teletext.c b/libmpcodecs/dec_teletext.c index b7f1353a55..aa72dae72f 100644 --- a/libmpcodecs/dec_teletext.c +++ b/libmpcodecs/dec_teletext.c @@ -90,7 +90,6 @@ #include <pthread.h> -#include "stream/tv.h" #include "dec_teletext.h" #include "mp_msg.h" #include "help_mp.h" @@ -1653,15 +1652,15 @@ int teletext_control(void* p, int cmd, void *arg) case TV_VBI_CONTROL_RESET: { int i; - tv_param_t* tv_param=arg; + struct tt_param* tt_param=arg; pthread_mutex_lock(&(priv->buffer_mutex)); priv->pagenumdec=0; clear_cache(priv); - priv->pagenum=steppage(0,tv_param->tpage&0x7ff,1); - priv->tformat=tv_param->tformat; + priv->pagenum=steppage(0,tt_param->page&0x7ff,1); + priv->tformat=tt_param->format; priv->subpagenum=0x3f7f; pll_reset(priv,fine_tune); - if(tv_param->tlang==-1){ + if(tt_param->lang==-1){ mp_msg(MSGT_TELETEXT,MSGL_INFO,MSGTR_TV_TTSupportedLanguages); for(i=0; tt_languages[i].lang_code; i++){ mp_msg(MSGT_TELETEXT,MSGL_INFO," %3d %s\n", @@ -1671,7 +1670,7 @@ int teletext_control(void* p, int cmd, void *arg) tt_languages[i].lang_code, tt_languages[i].lang_name); }else{ for(i=0; tt_languages[i].lang_code; i++){ - if(tt_languages[i].lang_code==tv_param->tlang) + if(tt_languages[i].lang_code==tt_param->lang) break; } if (priv->primary_language!=tt_languages[i].lang_code){ diff --git a/libmpcodecs/dec_teletext.h b/libmpcodecs/dec_teletext.h index ce83bbae58..1d367e362b 100644 --- a/libmpcodecs/dec_teletext.h +++ b/libmpcodecs/dec_teletext.h @@ -23,11 +23,22 @@ #ifndef MPLAYER_DEC_TELETEXT_H #define MPLAYER_DEC_TELETEXT_H +struct tt_param { + char *device; ///< teletext device + int format; ///< teletext display format + int page; ///< start teletext page + int lang; ///< primary language code +}; + #define VBI_CONTROL_FALSE 0 #define VBI_CONTROL_TRUE 1 #define VBI_CONTROL_UNKNOWN -1 +#ifdef CONFIG_TV_TELETEXT int teletext_control(void* p, int cmd, void *arg); +#else +#define teletext_control(p, cmd, arg) VBI_CONTROL_FALSE +#endif /* TELETEXT controls (through teletext_control() ) |