diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-08-18 02:29:37 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-08-18 02:29:37 +0300 |
| commit | 95da34aa071d64b21ef3e952b987ba3dcee84ca0 (patch) | |
| tree | eabf4399e40fd270714c53d40688eadadfd4c5ff /stream | |
| parent | f394231f5de9d1ff679f1b2da4d1f1b303ae914a (diff) | |
| parent | 3961e12fca2f1ec10c64e3ff298828feecca52c9 (diff) | |
| download | mpv-95da34aa071d64b21ef3e952b987ba3dcee84ca0.tar.bz2 mpv-95da34aa071d64b21ef3e952b987ba3dcee84ca0.tar.xz | |
Merge svn changes up to r29532
Diffstat (limited to 'stream')
| -rw-r--r-- | stream/tv.h | 38 | ||||
| -rw-r--r-- | stream/tvi_vbi.c | 2 |
2 files changed, 30 insertions, 10 deletions
diff --git a/stream/tv.h b/stream/tv.h index 5a38df690d..d177628e85 100644 --- a/stream/tv.h +++ b/stream/tv.h @@ -1,10 +1,30 @@ +/* + * TV interface + * + * Copyright (C) 2001 Alex Beregszászi + * Copyright (C) 2007 Attila Ötvös + * Copyright (C) 2007 Vladimir Voroshilov <voroshil@gmail.com> + * + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #ifndef MPLAYER_TV_H #define MPLAYER_TV_H -//#include "libao2/afmt.h" -//#include "libmpcodecs/img_format.h" -//#include "mp_msg.h" - typedef struct tv_param_s { char *freq; char *channel; @@ -202,7 +222,7 @@ typedef struct { #define TVI_CONTROL_VBI_INIT 0x501 ///< vbi init /* - TELETEXT controls (through tv_teletext_control() ) + TELETEXT controls (through teletext_control() ) NOTE: _SET_ should be _GET_ +1 _STEP_ should be _GET_ +2 @@ -217,7 +237,7 @@ typedef struct { #define TV_VBI_CONTROL_GET_SUBPAGE 0x516 ///< get grabbed teletext page #define TV_VBI_CONTROL_SET_SUBPAGE 0x517 ///< set grab teletext page number -#define TV_VBI_CONTROL_GET_FORMAT 0x519 ///< get eletext format +#define TV_VBI_CONTROL_GET_FORMAT 0x519 ///< get teletext format #define TV_VBI_CONTROL_SET_FORMAT 0x51a ///< set teletext format #define TV_VBI_CONTROL_GET_HALF_PAGE 0x51c ///< get current half page @@ -273,7 +293,7 @@ void tv_start_scan(tvi_handle_t *tvh, int start); #define TV_NORM_NTSCJP 7 #define VBI_TFORMAT_TEXT 0 ///< text mode -#define VBI_TFORMAT_BW 1 ///< back&white mode +#define VBI_TFORMAT_BW 1 ///< black&white mode #define VBI_TFORMAT_GRAY 2 ///< grayscale mode #define VBI_TFORMAT_COLOR 3 ///< color mode (require color_spu patch!) @@ -287,9 +307,9 @@ void tv_start_scan(tvi_handle_t *tvh, int start); typedef enum{ TT_FORMAT_OPAQUE=0, ///< opaque - TT_FORMAT_TRANSPARENT, ///< translarent + TT_FORMAT_TRANSPARENT, ///< transparent TT_FORMAT_OPAQUE_INV, ///< opaque with inverted colors - TT_FORMAT_TRANSPARENT_INV ///< translarent with inverted colors + TT_FORMAT_TRANSPARENT_INV ///< transparent with inverted colors } teletext_format; typedef diff --git a/stream/tvi_vbi.c b/stream/tvi_vbi.c index 15524d8ccd..8677fa1d69 100644 --- a/stream/tvi_vbi.c +++ b/stream/tvi_vbi.c @@ -880,7 +880,7 @@ static void prepare_visible_page(priv_vbi_t* priv){ * \param pt page to render * \param f opened file descriptor * \param pagenum which page to render - * \param colored use colors not implementede yet) + * \param colored use colors not implemented yet) * * Text will be UTF8 encoded */ |