summaryrefslogtreecommitdiffstats
path: root/cfg-mplayer.h
Commit message (Collapse)AuthorAgeFilesLines
* 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, rvm3000 ya com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27872 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27441Uoti Urpala2008-08-081-10/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cfg-common-opts.h command.c configure input/input.c libmpcodecs/dec_video.c libmpcodecs/vd.c libmpdemux/stheader.h libvo/sub.c libvo/video_out.c libvo/vo_xv.c libvo/vosub_vidix.c libvo/x11_common.c libvo/x11_common.h mp_core.h mplayer.c stream/stream.h
| * Give a CONFIG_ prefix to preprocessor directives that lacked one anddiego2008-08-071-1/+1
| | | | | | | | | | | | | | change arbitrary prefixes to CONFIG_. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27429 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rename font-related preprocessor directives.diego2008-08-071-2/+2
| | | | | | | | | | | | | | Switch them from a HAVE_ to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27425 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rename a bunch of miscellaneous preprocessor directives.diego2008-08-071-1/+1
| | | | | | | | | | | | | | Switch them from a HAVE_ to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27423 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rename preprocessor directives related to image libraries.diego2008-08-051-2/+2
| | | | | | | | | | | | | | Change a HAVE_ prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27417 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Change a bunch of X11-specific preprocessor directives.diego2008-08-041-2/+2
| | | | | | | | | | | | | | Switch from a HAVE_ prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27409 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Change a bunch of video/audio-output-specific preprocessor directives fromdiego2008-08-031-2/+2
| | | | | | | | | | | | | | a HAVE_ prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27402 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27399Uoti Urpala2008-08-021-9/+9
|\| | | | | | | | | | | | | | | | | | | Conflicts: libmpcodecs/vd.c libmpcodecs/ve_raw.c libvo/video_out.c libvo/x11_common.c mplayer.c
| * Change a bunch of video-output-specific preprocessor directives from a HAVE_diego2008-08-021-4/+4
| | | | | | | | | | | | | | prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27397 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rename some preprocessor directives from CONFIG_* to HAVE_* where appropriate;diego2008-08-011-2/+2
| | | | | | | | | | | | | | CONFIG_ prefix for configurable options, HAVE_ for system-dependent stuff. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27391 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rename preprocessor directive HAVE_MENU --> CONFIG_MENU.diego2008-07-301-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27377 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rename two GUI-related preprocessor directives:diego2008-07-301-1/+1
| | | | | | | | | | | | | | HAVE_NEW_GUI --> CONFIG_GUI, HAVE_GTK2_GUI --> CONFIG_GTK2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27375 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27374Uoti Urpala2008-07-301-6/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cfg-common-opts.h cfg-mplayer.h command.c configure libmpcodecs/dec_video.c libmpcodecs/vd.c libmpcodecs/vf_vo.c libmpdemux/demuxer.h libmpdemux/stheader.h mp_core.h mplayer.c stream/stream_radio.c
| * Start unifying names of internal preprocessor directives.diego2008-07-301-6/+6
| | | | | | | | | | | | | | | | 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
* | Merge svn changes up to r26979Uoti Urpala2008-06-041-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of the conflicts are trivial. Conflicts: Makefile cfg-mplayer.h input/input.c libmenu/vf_menu.c libmpcodecs/dec_video.c libmpcodecs/vf_expand.c libmpcodecs/vf_vo.c libmpdemux/demux_mkv.c libmpdemux/demuxer.c libmpdemux/demuxer.h libvo/vo_directfb2.c libvo/vo_gl.c libvo/vo_winvidix.c libvo/vo_xv.c libvo/vo_xvidix.c libvo/vo_xvmc.c libvo/x11_common.c mplayer.c osdep/timer-linux.c stream/cache2.c
| * remove extra dash in nocorrect-pts optioncompn2008-05-211-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26842 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Move aspect.c options to option structUoti Urpala2008-05-011-8/+3
| |
* | Mark option -key-fifo-size globalUoti Urpala2008-04-291-1/+1
| | | | | | | | | | | | | | The fifo is only allocated once and not resized later. After the previous commit trying to change it for later files would have no effect. With older code it could cause memory corruption if you set the option to a value larger than the already allocated size.
* | Move key_fifo_size & doubleclick_time to options structUoti Urpala2008-04-291-5/+2
| |
* | Silence "discards qualifiers" warnings when compiling mplayer.cUoti Urpala2008-04-261-2/+2
| | | | | | | | | | | | | | | | | | | | Add casts to subconfig entries in option lists to avoid the excessive amount of "initialization discards qualifiers from pointer target type" warnings. Also add const to the type of mpctx_get_audio_out to eliminate a warning and make it match the type in the header (svn r25793 had added a const to the header but not mplayer.c). Make libmenu_vfs a table of pointers to const to eliminate another warning plus make the table itself const.
* | Move vo_gamma_* to options structUoti Urpala2008-04-261-4/+4
| |
* | Move opt_screen_size_[x|y] to options structUoti Urpala2008-04-251-5/+2
| |
* | Move vidmode to options structUoti Urpala2008-04-251-3/+2
| |
* | Move fullscreen to options structUoti Urpala2008-04-251-3/+2
| |
* | Modify option helper macrosUoti Urpala2008-04-241-13/+13
| | | | | | | | | | | | | | Give them a OPT_ prefix, move them to m_option.h, move the "flags" parameter to third position (so all start with option name, field name, flags) and use "&m_option_type_x" in them instead of the indirect #define "CONF_TYPE_X".
* | Move option helper #defines to cfg-common.h for nowUoti Urpala2008-04-231-6/+0
| |
* | Move loop_times to option structUoti Urpala2008-04-231-2/+3
| |
* | Move vo_screenwidth,vo_screenheight to options structUoti Urpala2008-04-231-2/+2
| |
* | Move vo_dbpp to options structUoti Urpala2008-04-231-1/+2
| |
* | Move vo_ontop to options structUoti Urpala2008-04-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | Add a 'struct vo *vo' argument to the x11_common.c functions that access the variable so it's available as vo->opts->vo_ontop. To keep VOs using the old API working create a global vo variable that is set to the currently used old vo. "vo_ontop" will be #defined to "global_vo->opts->vo_ontop", and x11_common.h will add defines like the following when it is included by old VOs: #define vo_x11_ontop() vo_x11_ontop(global_vo) so that they will call the function according to the new declaration.
* | Move correct_pts to options structUoti Urpala2008-04-231-2/+2
| |
* | Move options "vo" and "ao" to common structUoti Urpala2008-04-231-2/+3
| |
* | Start of new option systemUoti Urpala2008-04-231-2/+8
|/ | | | | | | | First part of option restructuring. The aim is to move option values from a huge number of separate globals to a single non-global struct. This part adds some support for parsing option values into such struct instances, and moves one example option (fixed-vo) to the struct.
* Split cfg-common.h into two separate header files. It was being included twicediego2008-04-111-4/+2
| | | | | | | | | with different definitions set that activated either the lower or the upper half of the header. The effectively simulated using two different header files. It is more straightforward to split the header instead. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26392 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add comments to #endif preprocessor directives.diego2008-03-041-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26158 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add MPLAYER_ prefix to multiple inclusion guards.diego2008-02-221-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26061 b3059339-0415-0410-9bf9-f77b7e298cf2
* Allow demuxers to choose a default value for correct_ptsreimar2008-02-031-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25951 b3059339-0415-0410-9bf9-f77b7e298cf2
* typo fixdiego2008-01-161-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25772 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add heartbeat-cmd optionreimar2008-01-071-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25639 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add multiple inclusion guards to all header files that lack them.diego2008-01-011-0/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25581 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support using unrar executable to access rar-compressed vobsub files.ulion2007-12-141-0/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25389 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make the main m_option_t arrays constreimar2007-12-021-5/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25261 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move fakemono extern to cfg-common.h where it is actually used.reimar2007-12-021-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25259 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove pointless ifdefs around extern declarationsreimar2007-12-021-20/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25258 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix warning:diego2007-10-211-1/+0
| | | | | | | | | In file included from mplayer.c:794: cfg-mplayer.h:64: warning: redundant redeclaration of 'enqueue' mplayer.c:230: warning: previous definition of 'enqueue' was here git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24832 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix warnings:voroshil2007-09-101-2/+0
| | | | | | | | | | cfg-mplayer.h:43: warning: redundant redeclaration of 'mDisplayName' libvo/x11_common.h:30: warning: previous declaration of 'mDisplayName' was here cfg-mplayer.h:46: warning: redundant redeclaration of 'vo_fstype_list' libvo/x11_common.h:28: warning: previous declaration of 'vo_fstype_list' was here git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24393 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix warnings:voroshil2007-09-101-6/+0
| | | | | | | | | | | | | | cfg-mplayer.h:9: warning: redundant redeclaration of 'noconsolecontrols' mplayer.c:191: warning: previous definition of 'noconsolecontrols' was here cfg-mplayer.h:22: warning: redundant redeclaration of 'volstep' mplayer.c:566: warning: previous definition of 'volstep' was here cfg-mplayer.h:37: warning: redundant redeclaration of 'osd_level' mplayer.c:235: warning: previous definition of 'osd_level' was here cfg-mplayer.h:82: warning: redundant redeclaration of 'use_filedir_conf' mplayer.c:370: warning: previous declaration of 'use_filedir_conf' was here git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24388 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix redundant declaration warnings for variables already definedvoroshil2007-09-091-26/+0
| | | | | | | | in libvo/video_out.h git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24385 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add comments to some #endif preprocessor directives.diego2007-09-091-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24383 b3059339-0415-0410-9bf9-f77b7e298cf2
* Suboptions structure should be passed as array not as address of array.voroshil2007-08-261-1/+1
| | | | | | | | | patch from Bernd Ernesti mplayer-dev-eng at lists dot veego dot de git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24208 b3059339-0415-0410-9bf9-f77b7e298cf2
* Automatic TV channels scanning ability for MPlayer.voroshil2007-08-231-0/+13
| | | | | | | Code is based on patch from Otvos Attila oattila at chello dot hu git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24125 b3059339-0415-0410-9bf9-f77b7e298cf2
* Experimental negative panscan valuesreimar2007-07-281-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23897 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use a new variable for user-supplied monitor-aspect so we can overwritereimar2007-07-281-2/+2
| | | | | | |