summaryrefslogtreecommitdiffstats
path: root/cfg-mplayer.h
Commit message (Collapse)AuthorAgeFilesLines
* options: remove CONF_OLD option flagUoti Urpala2011-01-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The resulting semantics of this flag are weird enough that they're unlikely to be what is wanted in any situation. Remove the flag and convert the two options using it, -screenw and -screenh, to use CONF_NOSAVE instead. I'm not sure why those specific options had the flag and if any flag is really needed, but I don't want to check in detail now and using CONF_NOSAVE should keep about the same behavior in practice. A bit more detail about the weird behavior this flag had: When not using file groups, the flag had the same behavior as CONF_NOSAVE, namely that when switching files the option would not be reset to the global value (only possible file-specific settings were applied). When using file groups, group-specific options would apply to the _first two_ files in the group, but for the rest after the first two, settings would not be reset when changing files (wtf?). This was a result of the following sequence: 1) push higher-level settings, enter group 2) apply group-specific settings 3) push settings before applying ones specific to file 1 in group 4) apply file 1 settings, play file 1 5) pop settings to return to group settings 6) push settings before applying ones specific to file 2 7) apply file 2 settings 8) pop settings Here the option was set at 2). 3) saved it because it had been set after last push, so 5) restored the setting and it was used for file 2 too. However 6) no longer saved it because there had been pushes after the original setting in 2), thus 8) no longer restored the setting and the option was no longer forced to any particular value when playing further files after that.
* options: mark -fs with CONF_NOSAVE to keep state between filesUoti Urpala2011-01-311-1/+1
| | | | | | | | | | | Most of the time users want to keep current fullscreen state when switching to another file, rather than always resetting to the global default that was determined when the command line was parsed. Add the CONF_NOSAVE flag to the -fs option to achieve this. The change means that the fullscreen state from the previous file is kept unless there is an explicit file-specific -fs or -nofs setting for the new file (or in case file groups are used, moving to the new file enters a group with explicitly specified state).
* options: remove unused "func_full" option typeUoti Urpala2011-01-311-12/+0
| | | | | | vo_zr was the last user of the "func_full" option type. I think it's better if future features are implemented using more straightforward option functionality. Delete the func_full implementation.
* vo_zr2: drop Zoran supportUoti Urpala2011-01-311-6/+0
| | | | | | | There were multiple files specific to Zoran support, and they also depended on internal FFmpeg headers (so it would probably have been hard to get them to compile now even if you tried). It's obsolete now, so just drop the whole mess.
* vo_dxr2, ao_dxr2: drop dxr2 supportUoti Urpala2011-01-311-6/+0
| | | | | | dxr2 support had been broken quite a while and nobody noticed. There were finally commits to fix it in the svn repo, but rather than apply those I'll just drop dxr2 support.
* vidix: drop VIDIX supportUoti Urpala2011-01-311-1/+0
| | | | | | | | | | | | | By now VIDIX is too obscure to justify the amount of code and complexity it requires in the sources. Although there is no pressing need to drop it just now from a code point of view, I'll rather remove it before release than release with VIDIX support and then drop it later. Some of the manpage mentions of VIDIX were in "this option supported for these VOs" lists that looked outdated and failed to mention vdpau for example. Replace such incorrect lists with a generic "not supported for all VOs" mention.
* Merge branch 'sub'Uoti Urpala2011-01-261-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * sub: sub/OSD: move some related files to sub/ subtitles: options: enable -ass by default subtitles: change default libass rendering style demux_mkv, chapters: change millisecond arithmetic to ns cleanup: rename ass_* functions to mp_ass_* subs: use correct font aspect ratio for libass + converted subs cleanup: some random minor code simplification and cleanup vf_vo: fix EOSD change detection bug sd_ass: remove subreader use, support plaintext markup subtitles: style support for common SubRip tags and MicroDVD core: ordered chapters: fix bad subtitle parameter subs/demux: don't try to enable sub track when creating it subtitles/demux: store duration instead of endpts in demux packets subtitles: add framework for subtitle decoders options: add special -leak-report option subtitles: remove code trying to handle text subs with libavcodec cleanup: move MP_NOPTS_VALUE definition to mpcommon.h subtitles: move global ass_track to struct osd_state core: move most mpcommon.c contents to mplayer.c core: move global "subdata" and "vo_sub_last" to mpctx subtitles: remove sub_last_pts hack options: move -noconfig to option struct, simplify
| * options: add special -leak-report optionUoti Urpala2011-01-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Add a special option "-leak-report" that enables talloc leak reporting. It only works if it's given as the first argument. The code abuses the CONF_TYPE_PRINT option type to make main option parsing ignore the option. The parser incorrectly consumed the following commandline argument as a "parameter" for options of this type when they had the flag to not exit after printing the message. Fix this. It makes no difference for any previously existing option I think.
* | cleanup: remove unused MEncoder-related codeClément Bœsch2011-01-251-2/+0
|/ | | | | Remove some code and variables that were no longer used after MEncoder removal. Also remove some MEncoder references in comments.
* core: add support for precise non-keyframe-limited seeksUoti Urpala2010-12-201-0/+2
| | | | | | | | | | | | | Add support for seeking to an arbitrary non-keyframe position by decoding video starting from the previous keyframe. Whether to use this functionality when seeking is controlled by the new option -hr-seek and a new third argument to the "seek" command. The default is to use it for absolute seeks (like chapter seeks) but not for relative ones. Because there's currently no support for cutting encoded audio some desync is expected if encoded audio passthrough is used. Currently precise seeks always go to the first frame with timestamp equal to or greater than the target position; there's no support for "matching or earlier" backwards seeks at frame level.
* options: add "choice" option type, use for -pts-association-modeUoti Urpala2010-12-181-1/+2
| | | | | | | | | | | | | Add a "choice" option type. Options of this type take a string as input and set an int option variable to the value corresponding to the string. The string->int mapping is option-specific and is given in the option definition. Strings not found in the mapping are rejected as invalid option values. Change the option -pts-association-mode to use this new option type and accept values "auto, decoder, sort" instead of "0, 1, 2". The change in accepted values shouldn't cause problems as this option is not appropriate to use in normal user config files.
* core: ordered chapters: add heuristic for merging inaccurate chaptersUoti Urpala2010-11-261-0/+1
| | | | | | | | | | Some Matroska files have inaccurate ordered chapter endpoints, and so parts where one chapter should end and the next begin at the same timestamp were not merged. This resulted in an unnecessary seek over a minimal distance. Add a heuristic to merge parts with a minimal gap or overlap between them. Based on patch by Hector Martin <hector@marcansoft.com>.
* options: more mplayer.c options moved to option structClément Bœsch2010-11-141-11/+8
| | | | | | Following options were moved: autoq, benchmark, [no]term-osd, term-osd-esc, playing-msg, [no]idle, [no]consolecontrols, list-properties.
* options: move various mplayer.c options to option structClément Bœsch2010-11-131-6/+5
| | | | | Following options were moved: [no]quiet, [no]autosync, softsleep, [no]rtc, rtc-device.
* core: do initial A-V sync by modifying audio streamUoti Urpala2010-11-131-0/+1
| | | | | | | Add code to enforce matching pts with video when (re)starting the audio stream, by either cutting away the first samples or inserting silence at the beginning. New option -noinitial-audio-sync can be used to disable this and return to old behavior.
* audio: add -gapless-audio optionUoti Urpala2010-11-121-2/+3
| | | | | | | | | If the option is enabled and all audio has been buffered to the AO, then the player will move to the next file without waiting for the buffered audio to drain, while leaving the AO initialized. If the playback of the next file starts quickly enough (before the AO buffer empties) then it should continue writing audio to the same AO with no gap in between.
* options: add OPT_MAKE_FLAGS macro, creates "opt/noopt" flag pairClément Bœsch2010-11-041-16/+8
|
* options: move -name and -title to option structClément Bœsch2010-11-041-2/+2
|
* Add a simple capture feature (-capture)Uoti Urpala2010-11-021-0/+3
| | | | | | | | | | | | | | | | | If a specified key is pressed during playback, the current stream is captured to a file, similar to what -dumpstream achieves. original patch by Pásztor Szilárd, don tricon hu Taken from the following svn commits, but with several fixes and modifications (one obvious user-visible difference is that the default key binding is 'C', not 'c'): git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32524 b3059339-0415-0410-9bf9-f77b7e298cf2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32529 b3059339-0415-0410-9bf9-f77b7e298cf2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32530 b3059339-0415-0410-9bf9-f77b7e298cf2
* options: move -dumpfile to option structUoti Urpala2010-11-021-1/+1
|
* cfg-mplayer.h: Remove old obsolete warning about dfboptsdiego2010-11-021-5/+0
| | | | | | The DIRECTFBVERSION macro that it depends on has been removed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32281 b3059339-0415-0410-9bf9-f77b7e298cf2
* cfg-common*: Replace common options template by a common options arraydiego2010-11-021-6/+0
| | | | | | | | | This solution works just as well, but avoids a separate template file that needs to be #included from multiple places. The end result is simpler since common options and those of MPlayer and MEncoder are now in only one file each. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31434 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: Remove some unused linesdiego2010-11-021-6/+0
| | | | | | | | | | | | | | | | | | | | | | Remove some unused extern declarations. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31424 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove an unused extern declaration. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31425 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove commented-out forward declaration for removed function. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31429 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove unused extern fs_layer declaration. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31435 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove unused 'extern int vo_osd_changed_flag' declaration. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31438 b3059339-0415-0410-9bf9-f77b7e298cf2
* Merge svn changes up to r31291Uoti Urpala2010-06-021-0/+1
|\
| * Move TS_MAX_PROBE_SIZE #define to demux_ts.h instead of duplicating it.diego2010-05-301-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31291 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn change r31134Uoti Urpala2010-05-071-209/+209
|\| | | | | | | Fix some search/replace errors introduced in the svn commit.
| * the great MPlayer tab removal: part IIdiego2010-05-031-212/+212
| | | | | | | | | | | | | | some extra indentation fixes are put in as a bonus git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31134 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31040Uoti Urpala2010-04-261-2/+0
|\|
| * Remove commented-out and long-gone dapsync options.diego2010-04-151-2/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31040 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31004Uoti Urpala2010-04-261-1/+1
|\|
| * Mark dxr2_opts array as const.diego2010-04-041-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30998 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Declare externally used variables from vd.c as extern in vd.h.diego2010-02-221-5/+1
| | | | | | | | | | | | | | This saves declaring them as extern all over the place. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30695 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Remove pointless empty lines at EOF.diego2010-02-201-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30675 b3059339-0415-0410-9bf9-f77b7e298cf2
* | cfg-mplayer.h: add casts to silence warningsUoti Urpala2010-04-251-3/+3
| |
* | Merge svn changes up to r30643Uoti Urpala2010-03-101-5/+1
|\|
| * Add header for functions exported from vo_zr.c and use it appropriately.diego2010-02-181-3/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30635 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove forward declarations for non-existing functions readPPOpt, revertPPOpt.diego2010-02-181-2/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30634 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30475Uoti Urpala2010-03-091-0/+18
|\|
| * Add license header to all top-level files missing them.diego2010-01-301-0/+18
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30471 b3059339-0415-0410-9bf9-f77b7e298cf2
* | core: Add support for decoder reordering of pts valuesUoti Urpala2009-11-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a mode where libavcodec's reordered_opaque feature is used to associate container packet timestamps with decoded frames. This should improve behavior at least for MPEG files with interlaced h264; the previous code does not cope well with the libavformat demuxer producing two field packets with separate timestamps but the libavcodec h264 decoder only producing a single output frame for those two packets (so half the timestamps have no associated output frame). The current libavformat mpeg demuxer seems to finally work with interlaced h264 files and produce valid timestamps which are useful with a mode like this. By default MPlayer now selects between this new mode and the old one automatically based on the number of timestamp problems they cause; by default the new mode is used if both seem to work. The new option -pts-association-mode can be used to force a particular mode. If correct-pts mode is disabled this has no effect on timing. Also remove the "EXPERIMENTAL" marker from the manpage description of -correct-pts.
* | Merge svn changes up to r29912Uoti Urpala2009-11-161-0/+5
|\|
| * Added -name, -title and -use-filename-title options and implementation in ↵ptt2009-11-121-0/+5
| | | | | | | | | | | | X11 vos git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29904 b3059339-0415-0410-9bf9-f77b7e298cf2
| * whitespace cosmetics: Remove all trailing whitespace.diego2009-05-131-8/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Remove the internal GUIAnton Khirnov2009-07-071-13/+3
| | | | | | | | | | | | | | | | | | The GUI is badly designed and too closely coupled to the internal details of other code. The GUI code is in bad shape and unmaintained for years. There is no indication that anyone would maintain it in the future either. Even if someone did volunteer to implement a better integrated GUI having the current code in the tree probably wouldn't help much. So get rid of it.
* | Remove trailing whitespace from most filesUoti Urpala2009-07-071-9/+8
| |
* | Add option -noordered-chapters.Uoti Urpala2009-04-081-0/+3
| |
* | options: Move osd_level and osd_duration to options structUoti Urpala2009-03-311-2/+2
| |
* | VO: Don't force window position in X11 VOsUoti Urpala2009-03-311-0/+2
| | | | | | | | | | | | | | | | | | | | Disable by default the code that forcefully moved the video output window to the middle of the screen whenever it was reconfigured or created. That behavior was really annoying when switching video streams within a file, and overriding the window manager like that is not good default behavior for the initial creation of a window either. Add a new option "-force-window-position" that can be used to restore the old behavior.
* | Merge svn changes up to r28862Uoti Urpala2009-03-071-1/+1
|\|
| * Make WinID a 64 bit integer, this should avoid issues with valid Windowreimar2009-03-021-1/+1
| | | | | | | | | | | | | | handles on windows being interpreted as "no wid set". git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28795 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28087Uoti Urpala2008-12-041-4/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: command.c libao2/ao_ivtv.c libao2/ao_v4l2.c libmpcodecs/dec_video.h libvo/aspect.h libvo/sub.c libvo/sub.h libvo/vo_directx.c libvo/vo_macosx.m libvo/vo_quartz.c mp_core.h mplayer.c mplayer.h osdep/getch2.h osdep/timer.h
| * Get rid of pointless 'extern' keywords.diego2008-12-031-4/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27899Uoti Urpala2008-11-061-0/+1
|\|
| * Add an option that sets initial playback volume.diego2008-10-311-0/+1
| | | | | | | | | | | | | | patch by Reimar and rvm, rvm300