Commit Graph

1096 Commits

Author SHA1 Message Date
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
reimar 8979378150 Make sure sh_video == NULL when reinit_video_chain fails.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21047 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 11:21:09 +00:00
reimar c339cf1fe5 Do not just skip a file when vo init fails, instead try to play it
as audio-only first.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21046 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 10:52:23 +00:00
nicodvb 7b79fac19a switch_audio and switch_video properties should be in the range -2..MAX_x_STREAMS-1
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21036 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 18:23:38 +00:00
uau 4799a07cf1 When changing playback speed write the current speed to OSD only after
build_afilter_chain() which can alter the value.
(Though I'm not sure whether the current limits in build_afilter_chain
are necessary or correct.)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21028 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 15:50:31 +00:00
nicodvb b96ae083af switch_program property to switch to/set a new program
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21023 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 14:33:04 +00:00
reimar 582d0b7cab more mp_property_deinterlace simplification, patch by
Carl Eugen Hoyos [cehoyos -at- rainbow studorg tuwien ac at]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21018 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 12:38:03 +00:00
nicodvb c7256fa6f9 implemented M_PROPERTY_SET in mp_property_{audio,video}
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21016 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 12:34:06 +00:00
reimar 09be641ba5 reinit_video_chain might set sh_video = NULL, so check against that.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21014 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 12:30:48 +00:00
uau 26eb093e5d Mark some functions static
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21002 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 07:38:58 +00:00
reimar b9b610ed9a Support palette for general vobsub
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20994 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-17 20:11:52 +00:00
reimar 8846cfd6dc consistently use M_PROPERTY_ERROR/M_PROPERTY_OK as return values.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20991 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-17 19:03:53 +00:00
reimar e9c16c4b55 Minor mp_property_deinterlace simplification
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20990 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-17 18:18:28 +00:00
reimar 7b25afd742 Add deinterlace property, patch by Carl Eugen Hoyos
(cehoyos [at] rainbow studorg tuwien ac at) with small modifications
by me.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20989 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-17 18:16:21 +00:00
nicodvb 17fde01155 handle video stream switch using 'switch_video' property'
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20965 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 21:25:35 +00:00
nicodvb 7ddcc3ef32 moved video codec/filters/outdevice initialization code to specific function
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20963 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 21:22:07 +00:00
reimar 7a71da01d6 Introduce step_property command.
Patch by Carl Eugen Hoyos [cehoyos <at> ag or at] with modifications by me.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20931 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 19:52:21 +00:00
reimar 5dcb8b7d82 Fix Unkown -> Unknown typo
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20930 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 19:24:41 +00:00
uau 45200bc6df Use vf control for reading pts from vf_vo
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20922 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 14:02:55 +00:00
reimar de555bc284 Fix statement-before-declaration warnings.
Having a look at the gcc output before committing is a good idea btw.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20920 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 13:41:24 +00:00
uau 31482783c5 Remove write-only variable
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20919 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 12:39:49 +00:00
uau a703241aa9 Update OSD contents only after the correct values for the frame are known.
The most visible inaccuracy caused by the previous update location was
that the OSD always showed position 0 after seeking with demux_mkv.
Split frame decoding and filtering because with -correct-pts the pts
value that should be displayed for the frame is only known after
decoding but is needed before filtering (during which the OSD is drawn).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20918 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 12:29:20 +00:00
uau 0830e05453 Move xscreensaver_heartbeat call next to vo check_events
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20916 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 09:52:49 +00:00