aboutsummaryrefslogtreecommitdiffhomepage
path: root/mpcommon.h
Commit message (Collapse)AuthorAge
* subs: move vobsub loading logic down to find_subfiles.cGravatar Uoti Urpala2011-04-20
| | | | | | | Analogously to the previous commit, move path handling logic for loading external vobsub files from mplayer.c to find_subfiles.c. Based on a commit from Clément Bœsch but fixed and simplified.
* tl_matroska.c: move the find_files() function hereGravatar Uoti Urpala2011-03-03
| | | | | | Move the find_files() function from findfiles.c to tl_matroska.c. Delete the findfiles.c file. Add a check against opendir() failure in find_files().
* cleanup: define ROUND() macro in mpcommon.hGravatar cboesch2011-01-31
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32751 b3059339-0415-0410-9bf9-f77b7e298cf2
* cleanup: move MP_NOPTS_VALUE definition to mpcommon.hGravatar Uoti Urpala2011-01-15
|
* subtitles: move global ass_track to struct osd_stateGravatar Uoti Urpala2011-01-15
|
* core: move most mpcommon.c contents to mplayer.cGravatar Uoti Urpala2011-01-15
| | | | | | | | | | | | | | | | The contents of mpcommon.c were quite arbitrary; the most common reason to place some functions in this file had been "MEncoder happens to need similar code as MPlayer and we want to share some parts, but we have no clue whatsoever how to organize things in a sensible way, so we'll just dump those parts we want to share in mpcommon.c". As a result of containing an essentially random subset of top-level player functionality the mpcommon.h header required access to central structs and was unsuitable for inclusion in lower-level code, but was nonetheless included there for the mplayer_version symbol. Move almost all contents from mpcommon.c to mplayer.c. mplayer.c is already big and should perhaps be split further, but keeping a few random functions in mpcommon.c would not be an improvement.
* core: move global "subdata" and "vo_sub_last" to mpctxGravatar Uoti Urpala2011-01-11
|
* subtitles: remove sub_last_pts hackGravatar Uoti Urpala2011-01-11
| | | | | This code was probably added because of bad pts handling in old timing code, and should not be needed any more.
* options: move -noconfig to option struct, simplifyGravatar Uoti Urpala2011-01-11
|
* mpcommon.h: reduce header dependencies on other headersGravatar Uoti Urpala2010-11-02
| | | | | Use "struct foo *ptr" without full definition of the struct, instead of using typedef names and including other headers for them.
* cosmetics: mpcommon.h: Group all extern variable declarations togetherGravatar diego2010-11-02
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32113 b3059339-0415-0410-9bf9-f77b7e298cf2
* Factorize MPlayer/MEncoder version string handling.Gravatar diego2010-11-02
| | | | | | | The string now resides in a central object file instead of being duplicated in every file that requires a version string. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31577 b3059339-0415-0410-9bf9-f77b7e298cf2
* libass: match font attachments based on extensionGravatar Grigori Goronzy2010-06-01
| | | | | | | Instead of only relying on the MIME type, use the file extension as a fallback for deciding which attachments are fonts and should be fed to libass. This also refactors the check into a separate function in mpcommon.
* Merge svn changes up to r30967Gravatar Uoti Urpala2010-04-26
|\
* \ Merge svn changes up to r30917Gravatar Uoti Urpala2010-04-26
|\ \
| | * Get rid of pointless def_path variable; use codec_path directly instead.Gravatar diego2010-03-23
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30949 b3059339-0415-0410-9bf9-f77b7e298cf2
| | * Make all instances of codec_patch unconditional, otherwiseGravatar attila2010-03-21
| |/ | | | | | | | | | | | | | | | | | | | | compilation will break on systems that do not have win32 dlls enabled. Fixes compilation bug introduced by r30942 10l to the anonymous guy who explains the importance of commit messages and would like to have romance novels in these very messages. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30945 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Follow a more proper way to support -codecpath.Gravatar komh2010-03-17
| | | | | | | | | | | | | | | | | | | | 1. Include loader/drv.h for SetCodecPath() instead of a declaration of it. 2. Move codec_path from get_path.h to mpcommon.h and mpcommon.c. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30914 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30475Gravatar Uoti Urpala2010-03-09
|\|
| * Add license header to all top-level files missing them.Gravatar diego2010-01-30
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30471 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Some ugly hacks to make compiling against a newer external version of libass ↵Gravatar reimar2009-12-24
| | | | | | | | | | | | work. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30107 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29752Gravatar Uoti Urpala2009-10-06
|\| | | | | | | | | | | | | | | | | As part of merging subtitle-in-terminal changes make update_subtitles() only clear existing subtitles if called with the reset argument, and not try to set new ones. Later calls should set the needed new subtitles, and this change avoids some problems with trying to set subtitles when mp_property_sub() in command.c gets called from initialization code before full initialization.
| * Add support for displaying subtitles on the command-line when playingGravatar reimar2009-09-23
| | | | | | | | | | | | | | audio-only files. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29712 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make function argument name in header match name in .c file.Gravatar reimar2009-09-23
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29711 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make update_subtitles work without sh_video for text subtitles.Gravatar reimar2009-09-23
| | | | | | | | | | | | | | | | | | This fixes a crash with e.g. auto-enabled subtitles and -novideo due to command.c calling update_subtitles even without video and is a step toward subtitle support for audio-only files. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29710 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Change libass type names to match upstream renamesGravatar Uoti Urpala2009-07-29
| |
* | Initial ordered chapters supportGravatar Uoti Urpala2009-04-02
|/ | | | | | | | | | | Add basic support for Matroska ordered chapters. The switching between segments is implemented as a general edit timeline that could also be used for other purposes. Some things still need improvement. In particular the current code does not try to do any proper mapping between audio/video/subtitle streams of different files and there should be options for better control of how MPlayer searches other files for the required content.
* Factorize print_version().Gravatar diego2009-01-25
| | | | | | | Print CPU information in verbose mode instead of by default. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28360 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add options to disable some or all config files.Gravatar albeu2008-04-14
| | | | | | | Patch by Andrew Savchenko (Bircoph -at- list -dot- ru). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26448 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add necessary #includes to pass 'make checkheaders'.Gravatar diego2008-03-04
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26163 b3059339-0415-0410-9bf9-f77b7e298cf2
* Select audio stream in mplayer and mencoder, overriding demuxer decision.Gravatar eugeni2008-02-29
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26122 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add MPLAYER_ prefix to multiple inclusion guards.Gravatar diego2008-02-22
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26061 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix compilation with ASS disabledGravatar reimar2008-02-20
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26040 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove pointless #ifdefs around extern declarations.Gravatar diego2008-02-20
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26039 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add multiple inclusion guards to all header files that lack them.Gravatar diego2008-01-01
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25581 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix warning:Gravatar diego2007-08-25
| | | | | | | | mplayer.c: In function 'generate_video_frame': mplayer.c:1631: warning: implicit declaration of function 'update_teletext' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24185 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix warnings:Gravatar diego2007-08-25
| | | | | | | | | | | | | | | In file included from mplayer.c:380: mpcommon.h:5: warning: redundant redeclaration of 'subdata' libvo/sub.h:63: warning: previous declaration of 'subdata' was here In file included from command.c:26: mpcommon.h:5: warning: redundant redeclaration of 'subdata' libvo/sub.h:63: warning: previous declaration of 'subdata' was here In file included from mencoder.c:239: mpcommon.h:5: warning: redundant redeclaration of 'subdata' libvo/sub.h:63: warning: previous declaration of 'subdata' was here git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24177 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move some subtitle handling from mplayer.c to mpcommon.c and share it with ↵Gravatar reimar2007-02-17
mencoder.c git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22251 b3059339-0415-0410-9bf9-f77b7e298cf2