| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| | |
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'.
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
|\| |
|
| |
| |
| |
| | |
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29659 b3059339-0415-0410-9bf9-f77b7e298cf2
|
| |
| |
| |
| | |
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29658 b3059339-0415-0410-9bf9-f77b7e298cf2
|
|\| |
|
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| | |
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29471 b3059339-0415-0410-9bf9-f77b7e298cf2
|
| |
| |
| |
| |
| | |
Remove the libass/ directory and use the newest standalone version of
the library instead.
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
|\| |
|
| |
| |
| |
| |
| |
| |
| | |
property functions.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29407 b3059339-0415-0410-9bf9-f77b7e298cf2
|
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| | |
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
|
| | |
|
| |
| |
| |
| |
| | |
Replace all MSGTR_ macros in the source by the corresponding English
string.
|
| |
| |
| |
| |
| | |
Replace mp_msg() calls which have a translated string as the format
argument with mp_tmsg and add _() around all other translated strings.
|
| |
| |
| |
| |
| |
| | |
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.
|
| | |
|
| |
| |
| |
| |
| |
| | |
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.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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).
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
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.
|
|\| |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| |
| |
| |
| |
| |
| |
| | |
Add separate pause_player() / unpause_player functions(), move some
pausing-related state into explicit variables and make commands while
paused not unpause. Not everything works properly while paused yet (no
screen updates etc).
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| | |
Patch by rvm [rvm3000 ya com]
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28066 b3059339-0415-0410-9bf9-f77b7e298cf2
|
|\|
| |
| |
| |
| | |
Conflicts:
mplayer.c
|
| |
| |
| |
| |
| |
| |
| | |
not active.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27840 b3059339-0415-0410-9bf9-f77b7e298cf2
|
|\|
| |
| |
| |
| |
| |
| |
| |
| | |
Addition of the "outdir" suboption to vo_png in svn was reverted
before merging.
Conflicts:
command.c
mplayer.c
|
| |
| |
| |
| |
| |
| | |
(incorrectly).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27682 b3059339-0415-0410-9bf9-f77b7e298cf2
|
| |
| |
| |
| |
| |
| | |
append them to its child instead.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27681 b3059339-0415-0410-9bf9-f77b7e298cf2
|
| |
| |
| |
| |
| |
| | |
Behaviour without pausing_keep_force prefix is a bit weird.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27680 b3059339-0415-0410-9bf9-f77b7e298cf2
|
| |
| |
| |
| |
| |
| | |
kdekorte gmail com
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27667 b3059339-0415-0410-9bf9-f77b7e298cf2
|
|\| |
|
| |
| |
| |
| | |
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27489 b3059339-0415-0410-9bf9-f77b7e298cf2
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The mpctx->eof field was used to also store other reasons to stop
playing the current file besides EOF, and the code didn't properly
distinguish those from EOF. Rename the field to "stop_play" and clean
up some of the code accessing it. Properly separating EOF from other
reasons allows handling file switching better.
Before this commit buffered audio was always drained before moving to
the next file (the only exception when it was NOT drained when
stopping a file was when quitting the player completely). This added
an extra delay when manually moving to the next file as you had to
wait for the currently buffered audio to finish playing before the
next file would start. After this commit audio is only drained if the
file reaches EOF normally; otherwise audio is cut and the next file
starts immediately.
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| | |
Switch them from a HAVE_ to a CONFIG_ prefix.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27425 b3059339-0415-0410-9bf9-f77b7e298cf2
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
of the play_tree to pop all existing configurations.
Patch by Mathieu Schroeter <mathieu dot schroeter at gamesover dot ch>.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27424 b3059339-0415-0410-9bf9-f77b7e298cf2
|
| |
| |
| |
| | |
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27415 b3059339-0415-0410-9bf9-f77b7e298cf2
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Without it, MPlayer segv trying to dereference NULL demuxer.
Patch by Mathieu Schroeter (mathieu dot schroeter at gamesover dot ch)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27414 b3059339-0415-0410-9bf9-f77b7e298cf2
|
| |
| |
| |
| | |
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27413 b3059339-0415-0410-9bf9-f77b7e298cf2
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Without it, MPlayer segv trying to dereference NULL demuxer.
Patch by Mathieu Schroeter (mathieu dot schroeter at gamesover dot ch)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27412 b3059339-0415-0410-9bf9-f77b7e298cf2
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Without it, MPlayer segv trying to dereference NULL demuxer.
Patch by Mathieu Schroeter (mathieu dot schroeter at gamesover dot ch)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27411 b3059339-0415-0410-9bf9-f77b7e298cf2
|
| |
| |
| |
| |
| |
| |
| | |
a HAVE_ prefix to a CONFIG_ prefix.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27402 b3059339-0415-0410-9bf9-f77b7e298cf2
|