1
0
mirror of https://github.com/mpv-player/mpv synced 2025-04-11 04:01:31 +00:00
Commit Graph

1118 Commits

Author SHA1 Message Date
uau
a8007d3c44 Fix error in comment
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22320 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-23 02:10:02 +00:00
uau
06160ed2c5 Reset the edl_decision flag after the seek is done.
Previously it affected every later seek (even in other files).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22319 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-23 01:53:09 +00:00
uau
19e430af9a Separate function for seeking
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22318 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-23 01:49:51 +00:00
uau
894ea071bf Remove useless fflush(stdout) calls. mp_msg already flushes output, and
there is no other output before the calls.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22317 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-22 23:44:43 +00:00
uau
8443741eef Move EDL code to separate functions
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22316 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-22 21:05:31 +00:00
uau
24de991a1c Fix nonsense function type
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22308 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-22 05:39:17 +00:00
uau
3c0c8686fd Cleanup, move "global" state from the frame_time_remaining mainloop
variable to mpctx.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22306 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-21 21:59:33 +00:00
uau
e65e0651d5 Fix GUI compilation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22304 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-21 19:14:49 +00:00
uau
122cd3e706 Add missing "if (use_gui)" before some GUI calls
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22303 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-21 19:08:00 +00:00
uau
00b3c78196 Fix menu to work with mpctx
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22302 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-21 18:28:48 +00:00
uau
45f2227e52 Add missing #ifdef
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22299 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-21 03:13:48 +00:00
uau
d5d4c6c7e2 Split command/property handling from mplayer.c to a new file command.c.
Move some global and static variables under a struct that can be given
as a parameter. Add a context argument to the property functions so that
they do not have to depend on global/static variables.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22298 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-21 00:49:24 +00:00
uau
7ac889b796 Remove remnants of the nonfunctional "grab_frames" command.
The command has been a no-op for years.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22273 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-19 06:20:47 +00:00
uau
6f797ffeab Remove unused variable "osd_level_saved"
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22254 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-18 00:41:09 +00:00
reimar
6683b20b62 Make sure that -sid works even if the number of subtitles initially detected
by the demuxer is smaller. Should improve a bit problems with non-selectable
DVD/VOB subtitles.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22252 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-17 21:12:27 +00:00
reimar
4b774aacd1 Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22251 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-17 21:04:46 +00:00
reimar
c0d2859fc8 Clear/update subtitles after seeking backwards.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22202 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-11 13:23:13 +00:00
uau
dd9ef5468e reindent
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22163 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-06 00:24:49 +00:00
uau
b5c470a029 Fix multiple appearing or appearing+disappearing subs in the same frame
in non-ASS mode. The latter is common (old sub replaced by new) and 
resulted in an incorrect frame where both appeared simultaneously.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22162 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-06 00:18:35 +00:00
uau
d524405f5c Add missing type to declaration and remove unused variable
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22161 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-05 23:56:18 +00:00
reimar
de73d4dd97 Another round of subtitle code cleanup
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22155 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-05 18:25:28 +00:00
gpoirier
333436a8aa filename double-conversion, especially usefull for CJK users :-)
Patch by Zuxy Meng <zuxy.meng@gmail.com> 
date: Oct 25, 2006 2:20 AM
subject: [MPlayer-dev-eng] [PATCH] Filename double-conversion


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22020 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-26 09:57:09 +00:00
michael
25736732af print_version() and others get executed before the command line has been parsed so -really-quiet does not silence them even though it should according to the verbosity level set by it, this simple change/hack fixes it
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21948 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-17 00:27:41 +00:00
diego
cae4f4e7b4 DO NOT recommend or even suggest installing codecs.conf.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21906 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-13 11:57:40 +00:00
reimar
61e4a80191 Subtitle handling cleanup: factor out code for parsing embedded subtitles
and adding and removing of lines in subtitle struct into subreader.c.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21845 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-06 19:07:58 +00:00
ben
5028a513dd restore volume if muted at exit
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21820 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-04 16:30:06 +00:00
vayne
42552b211a avoid code duplication.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21780 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-28 15:31:48 +00:00
nicodvb
21515f91bb show audio language in osd when playing dvdnav streams
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21620 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-14 23:11:11 +00:00
nicodvb
1b36df0c85 call dvd_lang_from_aid() only if stream_type is DVD
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21618 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-14 22:37:13 +00:00
nicodvb
b24971e15f support for -alang in dvdnav
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21617 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-14 22:12:28 +00:00
nicodvb
5244303111 check that stream_type is DVD before calling dvd_lang_from_aid
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21578 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-10 17:28:56 +00:00
nicodvb
6c985e22b4 show subtitle language in OSD ; patch by Otvos Attila
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21577 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-10 17:28:01 +00:00
nicodvb
14dc3c4f29 use dvdnav's palette if available
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21555 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-09 19:24:12 +00:00
diego
0810e42750 Make MPlayer/MEncoder print the compile-time configuration in verbose mode.
based on a patch by Brian Murray, brian game-sat com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21358 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-28 18:29:24 +00:00
ben
1e30c2e5ae keep nav highlight event in dvdnav priv structure
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21235 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 17:44:22 +00:00
nicodvb
6913dd5d92 support for -slang and subtitles in dvdnav; patch by Attila Otvos (oattila chello hu) and me. No palette yet
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21219 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 14:46:21 +00:00
ben
42eecb4f1b better nav highlight handling
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21216 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 13:03:51 +00:00
ben
c913e7dba1 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21209 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 11:20:02 +00:00
uau
544233bded Make compilation depending on USE_OSD unconditional.
USE_OSD was hardcoded to true in configure, manually turning it off
would break compilation, and most OSD-related code wasn't affected by it
anyway so it did nothing useful.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21177 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-22 19:21:16 +00:00
uau
2b50b7ddab Make compilation depending on USE_SUB unconditional.
USE_SUB was hardcoded to true in configure, manually turning it off
would break compilation, and there's no apparent reason why having all
subtitle code under #ifdefs (even working ones) would be worth the
clutter.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21156 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 20:48:17 +00:00
reimar
68faef14e9 Reuse init_vo_spudec in subtitle switching code.
Also generalize vobsub and ass init code to work for demuxers
besides matroska (fixes subtitle switching with
http://samples.mplayerhq.hu/sub/NeroMP4/unsupported-embedded-subs-2.mp4)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21136 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 15:48:00 +00:00
reimar
c99a4cad08 Move vo_spudec initialization into a separate function, for later reuse
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21135 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 15:43:23 +00:00
uau
8d6ef999b1 Move pause loop into a separate function.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21098 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 11:37:23 +00:00
uau
1390d0cf93 Reorganize code to move more things out of main().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21093 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 09:12:07 +00:00
nicodvb
a1fc33994e in mp_property_{video,audio} permit uniniting of the corresponding chain
by setting *arg to -2


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21084 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 23:16:15 +00:00
reimar
8e56fda7d4 Remove superfluous demuxer->type==DEMUXER_TYPE_MATROSKA check,
d_dvdsub->id >= 0 is enough in for this case, too.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21077 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 19:39:16 +00:00
uau
e4a54f7196 Fix printf format/argument count mismatch in mp_property_video
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21073 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 18:08:03 +00:00
uau
1b0c4bb4f0 Move subtitle updating to a separate function, fix inverted condition
which caused timing of DVD subtitles to be ignored so that they were
shown as soon as they were demuxed rather than in their timed position.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21071 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 17:55:38 +00:00
voroshil
f41cff8360 new slave command: radio_step_freq
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21058 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 16:15:05 +00:00
reimar
b38e1ca6e7 Generalize subtitle switching, demux_ogg does not need a special case
anymore and demux_mov works now, too.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21054 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 14:23:54 +00:00