summaryrefslogtreecommitdiffstats
path: root/mplayer.h
Commit message (Collapse)AuthorAgeFilesLines
* core: show quvi page title in window title, clean up libquvi handlingwm42012-10-141-0/+8
| | | | | | | | | | | | | | | | | Clean up handling of libquvi (which resolves URLs of streaming sites into URLs to the actual media playable by mpv). Move the code out of open.c to quvi.c, and invoke it explicitly from mplayer.c, instead of trying to resolve every filename passed to open_stream(). This allows easily passing metadata from the quvi context to the frontend. Expose QUVIPROP_PAGETITLE as "media-title" property, and use that instead of "filename" for the mplayer window title. (For YouTube, this is the video title.) It's cleaner too. Handle a potential reliability issue: check quvi_getprop return values. Since open.c contains barely anything but the open_stream() stub, move that to stream.c and delete open.c.
* commands: replace --hardframedrop, change framedropping propertywm42012-10-121-4/+0
| | | | | | | | | | Replace --hardframedrop with --framedrop=hard. Rename the framedrop property from "framedropping" to "framedrop" for the sake of making command line options have the same name as their corresponding property. Change the property to accept choice values instead of numeric values. Remove unused/forgotten auto_quality variable.
* core, timeline: cache external ordered chapter files tooStefano Pigozzi2012-09-181-2/+0
| | | | | | | | | | | | | | | | | | | | | | | Previously, Matroska source files other than the initially opened one were always accessed without caching. Enable cache for extra files too. A separate cache process/thread is started for each file, which is less than optimal but probably better than no caching if the user explicitly enabled cache. This commit only implements caching for Matroska ordered chapters (not for EDL timeline). To build the timeline we need to demux the files in the current directory to look for segments with matching uuid. This first demux is done with no cache since we don't need to read a lot of the stream. If the file is recognized as one of the needed sources it's reopened with cache enabled. Also move the stream_cache_size global variable to the options struct. Conflicts: cfg-mplayer.h mplayer.c stream/stream.h timeline/tl_matroska.c
* libvo: remove exit_player_bad()wm42012-07-301-7/+0
| | | | | For some reason, these 3 VOs basically call exit() if something went wrong.
* mplayer: remove crash handler stuffwm42012-07-301-2/+0
| | | | | | | | | | | | | | | | | | | | mplayer tries to catch all signals by default, and displays a "nice" crash message if a signal is caught. This is mostly useless for diagnosing problems, and it's extremely fragile. It's likely to cause more harm than it possibly solves. Also remove the current_module variable, which was supposed to give a hint which submodule was being run. This was far from accurate or useful. mplayer also caught SIG_CHILD, and tried to wait for any children. This potentially gets rid of zombies, but I'm not sure which ones. The only places that fork(), cache2.c and unrar_exec.c, seem to wait for their child processes properly. Just get rid of it. Note that we don't even catch SIGTERM. Maybe this will have to be added back in order to re-enable screensavers and such when the user terminates mplayer with ^C on the terminal.
* osd: use libass for OSD renderingwm42012-07-281-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The OSD will now be rendered with libass. The old rendering code, which used freetype/fontconfig and did text layout manually, is disabled. To re-enable the old code, use the --disable-libass-osd configure switch. Some switches do nothing with the new code enabled, such as -subalign, -sub-bg-alpha, -sub-bg-color, and many more. (The reason is mostly that the code for rendering unstyled subtitles with libass doesn't make any attempts to support them. Some of them could be supported in theory.) Teletext rendering is not implemented in the new OSD rendering code. I don't have any teletext sources for testing, and since teletext is being phased out world-wide, the need for this is questionable. Note that rendering is extremely inefficient, mostly because the libass output is blended with the extremely strange mplayer OSD format. This could be improved at a later point. Remove most OSD rendering from vo_aa.c, because that was extremely hacky, can't be made work with osd_libass, and didn't work anyway in my tests. Internally, some cleanup is done. Subtitle and OSD related variable declarations were literally all over the place. Move them to sub.h and sub.c, which were hoarding most of these declarations already. Make the player core in mplayer.c free of concerns like bitmap font loading. The old OSD rendering code has been moved to osd_ft.c. The font_load.c and font_load_ft.c are only needed and compiled if the old OSD rendering code is configured.
* options: move sub_name, sub_auto and vobsub_name to structClément Bœsch2011-04-201-2/+0
|
* core: move most mpcommon.c contents to mplayer.cUoti Urpala2011-01-151-0/+5
| | | | | | | | | | | | | | | | 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.
* options: move various mplayer.c options to option structClément Bœsch2010-11-131-1/+0
| | | | | Following options were moved: [no]quiet, [no]autosync, softsleep, [no]rtc, rtc-device.
* cosmetics: mplayer.c: Remove obsolete declarationsdiego2010-11-021-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32126 b3059339-0415-0410-9bf9-f77b7e298cf2
* mplayer.h: remove unnecessary declarations (dvd_device, cdrom_device)Uoti Urpala2010-04-251-3/+0
|
* Merge svn changes up to r30475Uoti Urpala2010-03-091-0/+17
|\
| * Add license header to all top-level files missing them.diego2010-01-301-0/+17
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30471 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Remove the internal GUIAnton Khirnov2009-07-071-2/+0
| | | | | | | | | | | | | | | | | | 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.
* | options: Move osd_level and osd_duration to options structUoti Urpala2009-03-311-1/+0
| |
* | Merge svn changes up to r28087Uoti Urpala2008-12-041-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Rename exit_player() use outside core to exit_player_bad()Uoti Urpala2008-08-121-1/+1
| | | | | | | | | | | | The VOs which use it shouldn't really exit the whole program. The renaming will allow including mplayer.h in mplayer.c without clashing with the static exit_player() there.
* | Move global filename to mpctxUoti Urpala2008-04-261-2/+0
| |
* | Move movie_aspect to options structUoti Urpala2008-04-251-1/+0
| |
* | Move flip and softzoom to options structUoti Urpala2008-04-251-3/+0
| |
* | Move fullscreen to options structUoti Urpala2008-04-251-1/+0
| |
* | Move dvdsub_id to options structUoti Urpala2008-04-231-1/+0
| | | | | | | | | | | | | | Name the field "sub_id" as it's not specific to DVD subs. Remove some other unused extern declarations together with dvdsub_id from demux_mkv.c and demux_lavf.c.
* | Move audio_id and video_id to options structUoti Urpala2008-04-231-2/+0
| |
* | Remove static mpctx from mplayer.cUoti Urpala2008-04-231-2/+12
|/ | | | | | | | Pass it in function calls instead. There's no reasonable way to pass it to exit_player() when used outside mplayer.c. However most of those uses seem to be wrong (the code should not make the program exit) and should be removed. For now just make exit_player() uses outside mplayer.c simply call exit() without any shutdown code.
* 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
* Change force_fps and force_ofps to doublereimar2008-02-141-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25997 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove redundant extern variable declarations, include proper headers instead.diego2007-08-251-6/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24169 b3059339-0415-0410-9bf9-f77b7e298cf2
* Identifiers starting with underscores are reserved.diego2007-07-311-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23954 b3059339-0415-0410-9bf9-f77b7e298cf2
* add new -subfont option, that allows having a different font for OSD ↵ben2007-05-201-0/+1
| | | | | | (controls and menu) and subtitles git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23356 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove some of the worst "headers include headers which includereimar2006-11-291-6/+0
| | | | | | | completely unrelated headers" mess. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21386 b3059339-0415-0410-9bf9-f77b7e298cf2
* marks several read-only string parameters which aren't modified inside the ↵reynaldo2006-07-151-1/+1
| | | | | | called function as const. Patch by Stefan Huehner, stefan AT huehner-org git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19109 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove updating of vo_mouse_timer_const from the main loop and alsouau2006-04-251-1/+1
| | | | | | | | remove the variable itself. Convert code in x11_common.c and OSD timing that depended on the variable to use real time instead. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18288 b3059339-0415-0410-9bf9-f77b7e298cf2
* Patch by Stefan Huehner / stefan % huehner ! org \rathann2006-02-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | 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
* support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>henry2003-04-071-2/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9871 b3059339-0415-0410-9bf9-f77b7e298cf2
* Stream cleanup, don't use blah_on options anymore.albeu2003-03-301-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9747 b3059339-0415-0410-9bf9-f77b7e298cf2
* - add subcppontscho2003-01-211-0/+1
| | | | | | | | - fix some 10l in gui - fix one 10l bug in subreader git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9057 b3059339-0415-0410-9bf9-f77b7e298cf2
* - rewrite sub_fpspontscho2003-01-211-0/+1
| | | | | | | | - add fps support - rewrite history git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9056 b3059339-0415-0410-9bf9-f77b7e298cf2
* add DVD and CDRom device entry's, and fix two 10l bugpontscho2003-01-121-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8934 b3059339-0415-0410-9bf9-f77b7e298cf2
* add overlapping to preferencespontscho2003-01-021-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8718 b3059339-0415-0410-9bf9-f77b7e298cf2
* - fix three submenu bugpontscho2002-12-111-0/+1
| | | | | | | | | | | | | - audio/video track hiding - normal/double/fullscreen handling - dvd audio channel setting bug - fix file/url/vcd/dvd playing - fix variables initialization - some small bug fix - applied some patch from Rüdiger Kuhlmann git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8424 b3059339-0415-0410-9bf9-f77b7e298cf2
* add autosync && some 10l bugfixpontscho2002-11-281-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8312 b3059339-0415-0410-9bf9-f77b7e298cf2
* add and extended Gregory Kovriga's <gkovriga@techunix.technion.ac.il> patchpontscho2002-10-211-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7822 b3059339-0415-0410-9bf9-f77b7e298cf2
* add [video||audio]_driver_listpontscho2002-10-021-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7583 b3059339-0415-0410-9bf9-f77b7e298cf2
* some cleanup - made private vars/funcs static, removed obsolete externsarpi2002-09-291-2/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7560 b3059339-0415-0410-9bf9-f77b7e298cf2
* add aspect changing supportpontscho2002-09-281-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7542 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed obsolete/unused audio|video_fm|codec, has_audio|videoarpi2002-09-281-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7530 b3059339-0415-0410-9bf9-f77b7e298cf2
* - fix new afm/vfm supportpontscho2002-09-281-2/+3
| | | | | | | | - fix fullscreen with xv - add cache support git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7527 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix vfm and add afm supportpontscho2002-08-311-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7187 b3059339-0415-0410-9bf9-f77b7e298cf2
* -afm/-vfm migration from ID (int) to NAME (string) - simplifies code and ↵arpi2002-08-301-1/+1
| | | | | | makes dlopen()'ing possible git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7181 b3059339-0415-0410-9bf9-f77b7e298cf2
* - add play time subtitle change supportpontscho2002-08-291-0/+5
| | | | | | | - better language support git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7151 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix (?) cmd line handlingpontscho2002-08-151-0/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7020 b3059339-0415-0410-9bf9-f77b7e298cf2
* add preferences to guipontscho2002-07-251-0/+13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6797 b3059339-0415-0410-9bf9-f77b7e298cf2
* add equalizer support and fix some small bug...pontscho2002-07-031-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6628 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix volume handling ( step 2 ) -- add balance support and some code cleanup ↵pontscho2002-07-021-0/+3
| | | | | | and fix git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6620 b3059339-0415-0410-9bf9-f77b7e298cf2
* warning & newline fixes by Dominik Mierzejewski <dominik@rangers.eu.org>arpi2002-06-071-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6336 b3059339-0415-0410-9bf9-f77b7e298cf2
* add VCD support for GUIpontscho2002-06-031-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6281 b3059339-0415-0410-9bf9-f77b7e298cf2
* some bug fixpontscho2002-05-011-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5920 b3059339-0415-0410-9bf9-f77b7e298cf2
* rewrite fullscreen support in some libvo driverpontscho2002-03-071-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4982 b3059339-0415-0410-9bf9-f77b7e298cf2
* new gui interface, and gtk moved into mplayer process. fork ... bleh :)pontscho2002-02-231-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4819 b3059339-0415-0410-9bf9-f77b7e298cf2
* new interface ? :)pontscho2002-02-211-79/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4799 b3059339-0415-0410-9bf9-f77b7e298cf2
* add a_frame variable.pontscho2001-06-041-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1007 b3059339-0415-0410-9bf9-f77b7e298cf2
* when using -ss:laaz2001-06-011-2/+2
| | | | | | | | "seek seconds" -> "super seek" now it understands 1:22:41.4 2:13 style time git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@938 b3059339-0415-0410-9bf9-f77b7e298cf2
* init.pontscho2001-05-081-0/+83
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@725 b3059339-0415-0410-9bf9-f77b7e298cf2
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 13:50:47 +0000