summaryrefslogtreecommitdiffstats
path: root/command.c
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | Merge svn changes up to r30419Uoti Urpala2010-01-251-40/+56
|\|
| * Also handle ASS subtitles when removing subtitles via sub_remove slave command.reimar2010-01-221-0/+15
| | | | | | | | | | | | | | | | Fixes memory leaks and other strange behaviour like mismatch of name and subtitle data. Based on patch by Yuriy Kaminskiy [yumkam mail ru]. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30387 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Avoid duplicating code to remove subtitles (sub_remove slave command).reimar2010-01-221-38/+41
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30386 b3059339-0415-0410-9bf9-f77b7e298cf2
* | translations: corrently translate most OSD outputUoti Urpala2010-01-121-49/+52
| | | | | | | | | | | | Add various fixes needed to actually produce translated OSD output. About every OSD string that had a translation macro under the old system should be translatable now.
* | translations: add infrastructure for translated OSD messagesUoti Urpala2010-01-121-4/+4
| | | | | | | | | | | | | | Add function set_osd_tmsg() which is a version of set_osd_msg that translates its format argument. Pass OSD message strings in the command.c property_osd_display table through mp_gtext before they're used.
* | Merge svn changes up to r30136Uoti Urpala2009-12-301-27/+41
|\| | | | | | | Ignore another broken correct-pts change in 30134.
| * Return the actually playing audio/video id for get_property, not the onereimar2009-12-271-12/+12
| | | | | | | | | | | | | | | | selected e.g. via commandline (which resulted in -1 being returned most of the time). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30124 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Subtitle are now also available without video, so remove thatreimar2009-12-271-3/+0
| | | | | | | | | | | | | | check from the subtitle property handling. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30122 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use the same condition to decide if the audio/video id property isreimar2009-12-271-12/+4
| | | | | | | | | | | | | | not available for all commands (get, set and print). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30121 b3059339-0415-0410-9bf9-f77b7e298cf2
| * When setting audio or video track make sure we will not try toreimar2009-12-271-2/+4
| | | | | | | | | | | | | | dereference a NULL pointer, e.g. because there is no video stream. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30120 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Print a ANS_ERROR reply if one of the *_property slave command fails.reimar2009-12-271-2/+25
| | | | | | | | | | | | | | Based on patch by Adrian Stutz [adrian sttz ch]. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30119 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Never include ass.h and ass_types.h directly, use ass_mp.h instead.reimar2009-12-191-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30067 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Fix printf format strings with invalid '%lf' conversionUoti Urpala2009-12-151-2/+2
| | | | | | | | | | | | | | Some code used an invalid '%lf' conversion specification for double arguments. Maybe they were written that way due to confusion with scanf where doubles are indicated by '%lf'; however it is not a valid printf format specifier. Change those cases to use '%f'.
* | options: Move ass_enabled to options structUoti Urpala2009-12-021-5/+6
| |
* | Merge svn changes up to r29912Uoti Urpala2009-11-161-31/+21
|\|
| * Show OSD message when enabling/disabling de-interlacing.cehoyos2009-11-141-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29912 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Avoid modifying dvdsub_id in command.c where possible.reimar2009-11-111-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29895 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make sure the teletext property stuff does not crash if no demuxer is available.reimar2009-11-091-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29862 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove CONFIG_TV_TELETEXT.cehoyos2009-11-071-10/+0
| | | | | | | | | | | | | | | | DVB teletext support is nearly finished, it will be possible to read teletext from file, it will not be depending on reception any more. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29851 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Separate teletext from tv support.cehoyos2009-11-071-19/+18
| | | | | | | | | | | | | | Path by Francesco Lavra, francescolavra interfree it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29848 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move teletext specific code from stream into libmpcodecs.cehoyos2009-10-291-0/+1
| | | | | | | | | | | | | | Patch by Francesco Lavra, francescolavra interfree it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29801 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Add yuv_colorspace property, implemented in vo_vdpau and vo_xvUoti Urpala2009-11-151-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a property to select YUV colorspace. Currently implemented only in vo_vdpau and vo_xv. Allows switching between BT.601, BT.709 and SMPTE-240M (vdpau only). The xv support uses the "XV_ITURBT_709" attribute. At least my NVIDIA card supports that; I don't know whether other xv implementations do. Bind the colorspace switch to the 'c' key by default. 'c' is currently used by vo_sdl for some fullscreen mode change thing, but at the moment that does not conflict and if it will in the future then vo_sdl can change. VDPAU part based on a patch from Lauri Mylläri <lauri.myllari@gmail.com>
* | Merge svn changes up to r29752Uoti Urpala2009-10-061-2/+3
|\| | | | | | | | | | | | | | | | | 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.
| * Make update_subtitles work without sh_video for text subtitles.reimar2009-09-231-1/+6
| | | | | | | | | | | | | | | | | | 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
* | UI: Make the 'D' key print the new deinterlace statusUoti Urpala2009-09-191-1/+4
| | | | | | | | | | | | | | Define a way to show the property on the OSD and use step_property_osd instead of step_property. Also change the mp_property_deinterlace() function to use m_property_flag_ro() to make it print 'enabled/disabled' instead of 'yes/no'.
* | commands: Add set_property_osd and step_property_osdUoti Urpala2009-09-191-0/+11
| |
* | command.c: Split property OSD display from property commandsUoti Urpala2009-09-191-75/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function set_property_command() handles commands that require only changing a property and then possibly displaying the new value on the OSD somehow. Split it into two parts: one that executes commands by doing property manipulation according to a table, and one that displays the value of a given property on the OSD in a manner listed for that property in another table. The goal is to allow using the OSD-display code and information in generic commands that take the property name as an argument. Splitting the table in two was not strictly necessary - I could have kept it as a single table with possibly dummy field values for entries that only make sense for one part of the split function or the other. However I think splitting it is cleaner and more readable.
* | Merge svn changes up to r29684Uoti Urpala2009-09-161-0/+4
|\|
| * Make indentation consistent with the rest of the filereimar2009-09-081-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29659 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Never switch to a program with no audio and no video.reimar2009-09-081-0/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29658 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29532Uoti Urpala2009-08-181-10/+0
|\|
| * Only #include stream/stream_dvd.h when libdvdread is enabled.diego2009-08-031-0/+2
| | | | | | | | | | | | | | | | stream_dvd.h #includes some system headers that may be unavailable. Fixes compilation with libdvdread disabled. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29475 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove pointless #ifdefs around harmless internal header #includes.diego2009-08-021-16/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29471 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Remove internal libass treeUoti Urpala2009-07-261-4/+1
| | | | | | | | | | Remove the libass/ directory and use the newest standalone version of the library instead.
* | Remove the internal GUIAnton Khirnov2009-07-071-24/+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.
* | Merge svn changes up to r29412Uoti Urpala2009-07-071-4/+4
|\|
| * Make set_property chapter 0-based like all other chapter-relatedreimar2009-06-281-2/+2
| | | | | | | | | | | | | | property functions. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29407 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Do not use MAX_A/V_STREAMS as upper limit for switch_audio/switch_videoreimar2009-06-201-2/+2
| | | | | | | | | | | | | | | | They take the stream id as argument, which is not necessarily the same as the as the index in the streams array and can be larger. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29375 b3059339-0415-0410-9bf9-f77b7e298cf2
| * whitespace cosmetics: Remove all trailing whitespace.diego2009-05-131-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Remove trailing whitespace from most filesUoti Urpala2009-07-071-1/+1
| |
* | Translation system changes part 2: replace macros by stringsAmar Takhar2009-07-071-72/+72
| | | | | | | | | | Replace all MSGTR_ macros in the source by the corresponding English string.
* | Translation system changes part 1: wrap translated stringsAmar Takhar2009-07-071-71/+71
| | | | | | | | | | Replace mp_msg() calls which have a translated string as the format argument with mp_tmsg and add _() around all other translated strings.
* | Disallow subtitles without videoUoti Urpala2009-06-131-2/+2
| | | | | | | | | | | | Make sure no subtitle stream can be selected when no video stream exists. The code doesn't handle subtitles without video properly and it was possible to trigger crashes in some cases.
* | Support chapter seeking with ordered chaptersUoti Urpala2009-04-021-4/+4
| |
* | Change demuxer_seek_chapter() parametersUoti Urpala2009-04-021-5/+5
| | | | | | | | | | | | Remove the "num_chapters" and "mode" parameters that aren't needed by any callers. Change "float *seek_pts" to "double *". Allocate the string returned via "chapter_name" with talloc.
* | Initial ordered chapters supportUoti Urpala2009-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | 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.
* | core: Clean up OSD seek info logicUoti Urpala2009-03-311-5/+6
| | | | | | | | | | | | | | | | | | | | Clean up the code and make the behavior more consistent. Before bits of the OSD information were triggered in different places, and various property commands that affect playback position only showed the seek bar while the main seek command also triggered showing the percentage in OSD text. Now only the seek and chapter commands trigger all information and others nothing (which is consistent with most property behavior).
* | options: Move osd_level and osd_duration to options structUoti Urpala2009-03-311-13/+17
| |
* | Set the fullscreen option value too when fs state changesUoti Urpala2009-03-291-0/+1
| | | | | | | | | | | | | | If the fullscreen state was changed via keyboard commands or the slave interface the option value was not changed. However that value is used if the VO is reconfigured. Set the option too to avoid switching back to the previous state in that case.
* | Merge svn changes up to r28403Uoti Urpala2009-01-311-0/+4
|\|
| * command.c: Fix some commands crashing during audio-only playbackuau2009-01-311-0/+4
| | | | | | | | | | | | | | | | | | | | The SWITCH_RATIO and VF_CHANGE_RECTANGLE cases crashed if the user gave those commands when there was no video stream. Make them no-op instead. Patch by ShadowJK git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28403 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Update OSD while pausedUoti Urpala2008-12-091-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | When OSD contents change while paused, try to change the OSD drawn in the currently visible frame. If such OSD updates are not supported then advance by one frame and draw the OSD normally. Add some support for OSD redrawing to vo xv. The new xv code makes a copy of the original frame contents before drawing the OSD if MPlayer is already paused when the frame is drawn. If such a copy of the current frame exists then the frame contents can be restored and a different OSD drawn on top of the same frame.
* | Allow seeking while pausedUoti Urpala2008-12-091-10/+1
| | | | | | | | | | | | | | | | | | | | Screen is now updated immediately (doesn't always work without correct-pts yet though). Doing audio unpause after the seek reset can display errors. Main loop code now checks for possible reasons to stop command processing instead of relying on each command to also set an explicit 'break' flag.
* | Start pause handling changesUoti Urpala2008-12-091-15/+29
| | | | | |