summaryrefslogtreecommitdiffstats
path: root/libvo/sub.h
Commit message (Collapse)AuthorAgeFilesLines
* Add standard license headers, unify header formatting.diego2009-02-081-0/+17
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28481 b3059339-0415-0410-9bf9-f77b7e298cf2
* Change vo_draw_text to a vo_draw_text_ext function which draws DVD navigationreimar2009-01-101-0/+3
| | | | | | | highlights at the correct position with the high-resolution OSD of -vo gl. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28290 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get rid of pointless 'extern' keywords.diego2008-12-031-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unused declarations and references to vo_draw_text_osd(),diego2008-12-031-13/+0
| | | | | | | vo_draw_text_progbar(), vo_draw_text_sub(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28083 b3059339-0415-0410-9bf9-f77b7e298cf2
* Start unifying names of internal preprocessor directives.diego2008-07-301-1/+1
| | | | | | | | Replace all USE_ prefixes by CONFIG_ prefixes to indicate options which are configurable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27373 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove pointless #ifdefs around extern declarations.diego2008-02-201-4/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26039 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: Whitespace changes, add comments to some #endif directives.diego2008-01-061-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25623 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add explanatory comments to the #endif part of multiple inclusion guards.diego2007-12-311-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25563 b3059339-0415-0410-9bf9-f77b7e298cf2
* Identifiers should not start with two underscores.diego2007-08-151-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24066 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove useless #include and silence warnings when compiling find_sub.c.cehoyos2007-08-081-4/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24032 b3059339-0415-0410-9bf9-f77b7e298cf2
* Teletext supportvoroshil2007-07-291-0/+12
| | | | | | | | Part 4/5: teletext page rendering git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23923 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not use leading underscores in multiple inclusion guards, they are reserved.diego2007-07-021-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23709 b3059339-0415-0410-9bf9-f77b7e298cf2
* suboverlap_enabled is already declared in included subreader.hreimar2007-06-241-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23626 b3059339-0415-0410-9bf9-f77b7e298cf2
* Revert r23530.voroshil2007-06-211-10/+0
| | | | | | | | | r23530 breaks policy: notification was not sent to mailing list, agreements of other devs were not received. Code also should be reviewed/cleaned up/fixed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23593 b3059339-0415-0410-9bf9-f77b7e298cf2
* The audio balance feature implemented with af_pan.zuxy2007-06-201-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23588 b3059339-0415-0410-9bf9-f77b7e298cf2
* Teletext support for tv:// (v4l and v4l2 only)voroshil2007-06-101-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified patch from Otvos Attila oattila at chello dot hu Module uses zvbi library for all low-level VBI operations (like I/O with vbi device, converting vbi pages into usefull vbi_page stuctures, rendering them into RGB32 images). All teletext related stuff (except properties, slave commands and rendering osd in text mode or RGB32 rendered teletext pages in spu mode) is implemented in tvi_vbi.c New properties: teletext_page - switching between pages teletext_mode - switch between on/off/opaque/transparent modes teletext_format - (currently read-only) allows to get format info (black/white,gray,text) teletext_half_page - trivial zooming (displaying top/bottom half of teletext page) New slave commands: teletext_add_dec - user interface for jumping to any page by editing page number interactively teletext_go_link - goes though links, specified on current page git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23530 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove duplicate vo_sub extern definition.reimar2006-12-211-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21715 b3059339-0415-0410-9bf9-f77b7e298cf2
* Mark utf8_get_char parameter as const and fix a compiler warningreimar2006-12-111-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21598 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove some of the worst "headers include headers which includereimar2006-11-291-0/+3
| | | | | | | completely unrelated headers" mess. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21386 b3059339-0415-0410-9bf9-f77b7e298cf2
* missing include for uint16_tben2006-11-251-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21236 b3059339-0415-0410-9bf9-f77b7e298cf2
* keep nav highlight event in dvdnav priv structureben2006-11-251-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21235 b3059339-0415-0410-9bf9-f77b7e298cf2
* support for dvdnav menu buttons overlay as simple alpha boxes (rework from ↵ben2006-11-251-0/+1
| | | | | | Otvos Attila's series of patches) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21209 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make utf8_get_char non-static.eugeni2006-07-071-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18940 b3059339-0415-0410-9bf9-f77b7e298cf2
* Patch by Stefan Huehner / stefan % huehner ! org \rathann2006-02-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | patch replaces '()' for the correct '(void)' in function declarations/prototypes which have no parameters. The '()' syntax tell thats there is a variable list of arguments, so that the compiler cannot check this. The extra CFLAG '-Wstrict-declarations' shows those cases. Comments about a similar patch applied to ffmpeg: That in C++ these mean the same, but in ANSI C the semantics are different; function() is an (obsolete) K&R C style forward declaration, it basically means that the function can have any number and any types of parameters, effectively completely preventing the compiler from doing any sort of type checking. -- Erik Slagter Defining functions with unspecified arguments is allowed but bad. With arguments unspecified the compiler can't report an error/warning if the function is called with incorrect arguments. -- Måns Rullgård git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17567 b3059339-0415-0410-9bf9-f77b7e298cf2
* fixrathann2005-12-051-0/+1
| | | | | | | mplayer.c:509: warning: implicit declaration of function 'free_osd_list' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17101 b3059339-0415-0410-9bf9-f77b7e298cf2
* Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.diego2004-10-281-1/+1
| | | | | | | Based on a patch by Sebastian Hegler <s_hegler at gmx dot de>. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13788 b3059339-0415-0410-9bf9-f77b7e298cf2
* many small typo and grammar fixesgabucino2003-10-041-1/+1
| | | | | | | Based on Bernard Leak's mail <bernard 4t brenda-arkle.demon.co.uk> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11001 b3059339-0415-0410-9bf9-f77b7e298cf2
* Improvements to spudec (DVD/VobSub) subtitle code:rfelker2003-01-241-0/+3
| | | | | | | | | - runtime selectable positioning, like with text subs - runtime selectable scaling/antialiasing algorithm - gaussian blur scaler (finally dvd/vobsub doesn't look like shit!) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9078 b3059339-0415-0410-9bf9-f77b7e298cf2
* Me: -sub-bg-* would be nicer. "Background" is usually shortened as "bg", not ↵rathann2002-12-281-2/+2
| | | | | | | | | "bkg". Arpi: feel free to change... ASAP :) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8618 b3059339-0415-0410-9bf9-f77b7e298cf2
* The following patch adds two new command line options:arpi2002-12-281-0/+2
| | | | | | | | | | | | | | -sub-bkg-color n -sub-bkg-alpha n They control the color and alpha value used to initialize the subtitles and OSD BBOX. With this you can have subtitles inside a traslucent rectangle. This is useful when a movie already have "hardcoded" subtitles and you want to overwrite them with rendered subtitles avoiding too much confusion. patch by Salvador Eduardo Tropea <salvador@inti.gov.ar> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8602 b3059339-0415-0410-9bf9-f77b7e298cf2
* -subwidtharpi2002-12-271-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8584 b3059339-0415-0410-9bf9-f77b7e298cf2
* This patch adds support for vertical subtitle alignmentarpi2002-12-231-0/+1
| | | | | | | | | | | | | | | | | | control. Possible values are top, center, and bottom, with bottom being the default. Alignment is relevant when it comes to positioning subtitles with one line (or fewer lines) of text relative to multi-line subtitles. It is implemented as a new command (sub_alignment) that without an argument cycles the alignment (between top, center, and bottom), or with an argument sets the alignment (0 for top, 1 for center, 2 for bottom). The key 'i' is bound to this command. patch by Oskar Liljeblad (oskar@osk.mine.nu) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8535 b3059339-0415-0410-9bf9-f77b7e298cf2
* overlapping subtitles support is now optional, can be disabled (-nooverlapsub)arpi2002-12-051-0/+1
| | | | | | | patch by Salvatore Falco <sfalco@studenti.ing.uniroma1.it> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8362 b3059339-0415-0410-9bf9-f77b7e298cf2
* This patch adds the functionality to disable/enable subtitles while playingarpi2002-10-061-0/+1
| | | | | | | | | | | | a video. I mapped it to the input-keyword "sub_visibility". This keyword is mapped to the 'v' key on the keyboard. I tested the patch with old-fashioned subtitles, with freetype subtitles and DVD subtitles. Works fine. The patch also includes documentation updates. patch by Uwe.Reder@3SOFT.de git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7629 b3059339-0415-0410-9bf9-f77b7e298cf2
* subtitle/osd cache - pre-render text to a buffer with alpha and bitmap separatedarpi2002-08-281-0/+5
| | | | | | | | | | - it solves overlapping alpha problem - speed up osd rendering (it renders bigger area but in a single pass) patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz> some cleanup by me git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7122 b3059339-0415-0410-9bf9-f77b7e298cf2
* pan&scan support with -vo xv by ?? <mplayer@svennevid.net>arpi2002-06-041-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6305 b3059339-0415-0410-9bf9-f77b7e298cf2
* Improvment for spu subtitles.albeu2002-05-171-1/+0
| | | | | | | | | | | | Removed the integreted spudec in vobsub. Various cleanup/bugfix in vobsub (no more auto palette when a true one is here) HW spu rendering moved in spudec because we first need to reassable the packet before sending them to the hw. Spudec is now created only if nedded. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6111 b3059339-0415-0410-9bf9-f77b7e298cf2
* various openbsd and general warning fixes - patch by Björn Sandell ↵arpi2002-05-121-0/+1
| | | | | | <biorn@dce.chalmers.se> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6058 b3059339-0415-0410-9bf9-f77b7e298cf2
* enabled new OSD code in -vop expand, subtitles rendering support to mencoderarpi2002-04-171-0/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5670 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_osd_check_range_update() added + 10l fixarpi2002-04-161-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5646 b3059339-0415-0410-9bf9-f77b7e298cf2
* osd: ok, now it's possible to do partial draw/clear of the buffer only if ↵arpi2002-04-151-0/+2
| | | | | | changed git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5643 b3059339-0415-0410-9bf9-f77b7e298cf2
* new osd code, use osd objs to follow changes and do minimal updatesarpi2002-04-151-0/+44
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5639 b3059339-0415-0410-9bf9-f77b7e298cf2
* moved font_laod.harpi2002-03-241-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5295 b3059339-0415-0410-9bf9-f77b7e298cf2
* osd outside movie support for vo_sdl, patch by Fredrik Kuivinenatmos42002-02-221-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4808 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add vobsub support.kmkaplan2002-01-101-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4081 b3059339-0415-0410-9bf9-f77b7e298cf2
* DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>arpi2001-11-201-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3035 b3059339-0415-0410-9bf9-f77b7e298cf2
* never declare variables in *.h files, plsnick2001-10-271-17/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2499 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fixed typo.atmos42001-09-181-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1911 b3059339-0415-0410-9bf9-f77b7e298cf2
* changes made for vo_aafolke2001-08-161-0/+19
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1553 b3059339-0415-0410-9bf9-f77b7e298cf2
* argh. i commented out wrong linesarpi_esp2001-05-281-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@899 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed redundant osd.h includesarpi_esp2001-05-241-3/+12
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@866 b3059339-0415-0410-9bf9-f77b7e298cf2
* clean uppontscho2001-04-241-0/+10
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@617 b3059339-0415-0410-9bf9-f77b7e298cf2
* use subreader's sub structarpi_esp2001-03-301-2/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@255 b3059339-0415-0410-9bf9-f77b7e298cf2
* sub/osd interface changesarpi_esp2001-03-271-0/+29
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@219 b3059339-0415-0410-9bf9-f77b7e298cf2