Commit Graph

1252 Commits

Author SHA1 Message Date
diego 9482a78e67 Fix warnings:
mplayer.c:316: warning: redundant redeclaration of 'vo_subdevice'
libvo/video_out.h:237: warning: previous declaration of 'vo_subdevice' was here
mplayer.c:317: warning: redundant redeclaration of 'ao_subdevice'
libao2/audio_out.h:44: warning: previous declaration of 'ao_subdevice' was here
mplayer.c:320: warning: redundant redeclaration of 'vo_flags'
libvo/video_out.h:189: warning: previous declaration of 'vo_flags' was here


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24184 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 16:19:42 +00:00
uau 95a174a65a Add separate event input type for terminal+vo
Add an input/input.c fd type whose read function takes no arguments and
returns no value. If such a function reads key or command events it'll
add them to the queues itself. Use this type for terminal input which
was special-cased before. The event function for X11-based VOs will use
the same type later.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24152 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 04:28:14 +00:00
uau 6a4478d677 Remove unnecessary OSD visibility code
Don't set osd_visible directly in seek code. It's usually set to the
same value by set_osd_bar() already. In the cases where set_osd_bar()
is not called or doesn't set it (seek is triggered by EDL or loop, or
there is no video output) it seems to make no difference.

This fixes a minor bug: if you set OSD level to disabled while the
progress bar was visible then doing seeks before it disappeared would
keep it visible but not change its value.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24112 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-21 00:24:14 +00:00
uau e833080245 Minor code cleanup
Move timed hiding of OSD progress bar to the same place where OSD
messages are timed out.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24111 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-21 00:24:13 +00:00
uau 730a647a2a Remove an unnecessary #ifdef
The default version of the sleep timer no longer has the code which
required adding a different #ifdef SYS_DARWIN version, so remove
the Darwin implementation.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24090 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-18 05:32:45 +00:00
uau 80dd062ef9 Remove pointless #ifdef
No need to mark stdin non-select()able in the mp_input_add_key_fd call
when no HAVE_POSIX_SELECT; input.c won't use select() on anything if
that is not defined.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24061 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-15 04:50:55 +00:00
reimar 8259c91a1c mixer.afilter must be set to NULL when filter chain is destroyed on uninit.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23972 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-31 17:02:01 +00:00
voroshil da32be7802 Teletext support
Part 4/5: teletext page rendering



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23923 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-29 17:57:39 +00:00
voroshil db734dcc15 Removing global variables from tv://
Step 8 (last): removing old globals from tv.c, tv.h,
fixing remaining references in cfg-common.h and mplayer.c



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23909 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-29 10:30:41 +00:00
reimar daa6cb6cab Get rid of a few more useless malloc casts
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23828 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-19 17:15:56 +00:00
reimar d7f314b0a9 Make sure all demuxer subtitles can be selected with 'j', even
if this leaves "holes" (allows to select subtitles that do not exist).
Fixes subtitle switching with http://samples.mplayerhq.hu/sub/NeroMP4/unsupported-embedded-subs-2.mp4


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23827 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-19 17:14:49 +00:00
Gabrov d2705f7abe fix redundant redeclaration warning
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23817 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-18 13:02:08 +00:00
albeu f48a4beff0 Move loop_times into mpctx.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23746 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-09 14:51:47 +00:00
voroshil 2f76cfc28a Revert r23530.
r23530 breaks policy: notification was not sent to mailing list,
agreements of other devs were not received.
Code also should be reviewed/cleaned up/fixed.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23593 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-21 08:18:51 +00:00
uau 90f1c3cc92 Remove broken option reset from per-file loop
When -loop is used as a per-file option it seeks back to the start of
the file from the end and tries to reset options to their original
values. This reset is not implemented properly: it simply sets the
option variables back without running any of the associated control
code. Implementing the option reset functionality properly would be a
significant amount of work and there is no clear need for it, so I'm
simply removing the broken version.

None of this affects the use of -loop as a global option. That case has
a separate implementation which always starts a new file from scratch
with default option values.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23567 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-16 19:47:36 +00:00
voroshil 83a2c50ef9 Teletext support for tv:// (v4l and v4l2 only)
modified patch from Otvos Attila oattila at chello dot hu

Module uses zvbi library for all low-level  VBI operations (like I/O with vbi
device, converting vbi pages into usefull vbi_page stuctures, rendering them
into RGB32 images).

All teletext related stuff (except properties, slave commands and rendering
osd in text mode or RGB32 rendered teletext pages in spu mode) is implemented
in tvi_vbi.c

New properties:
teletext_page - switching between pages
teletext_mode - switch between on/off/opaque/transparent modes
teletext_format - (currently read-only) allows to get format info
(black/white,gray,text)
teletext_half_page - trivial zooming (displaying top/bottom half of teletext
page)

New slave commands:
teletext_add_dec - user interface for jumping to any page by editing page number
interactively
teletext_go_link - goes though links, specified on current page



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23530 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-10 00:06:12 +00:00
voroshil 252f69abf7 implement "bind sections"
allows to bind one input key to several slave commands (independently for each section)
as shown below:
RIGHT seek +10
RIGHT {tv} tv_step_channel 1
RIGHT {dvdnav} dvdnav 4
Currenlty only "tv" section added.

patch by Otvos Attila oattila at chello dot hu



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23497 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-07 18:06:53 +00:00
diego ba2799502d Create a new MSGT for just the status line.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23478 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-05 16:13:00 +00:00
ben 194fc1b15b add new -subfont option, that allows having a different font for OSD (controls and menu) and subtitles
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23356 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-20 16:10:45 +00:00
uau 4014582d7b Output message fix
Add missing '\n' to "pts value <= previous", change level to INFO


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23312 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-14 01:23:52 +00:00
diego 5c9abf7f9f Gui --> gui
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23095 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-23 07:42:42 +00:00
rfelker 1400ea6fbf big surprise.. uau broke gcc 2.95 as usual
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23011 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-17 07:06:44 +00:00
cehoyos 633627bc58 Gui: Show correct time after seeking in audio-only files.
Patch by Onur Küçük, onur.--.-.delipenguen.net



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22853 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-31 11:01:28 +00:00
rathann 259cfbe7e2 Code cleanup: don't include a .c file in mplayer.c and fix a few
"implicit declaration of function ‘mplayer_put_key’" warnings

Based on Attila's suggestions.
Approved by Uoti and Ivan.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22841 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-29 17:16:11 +00:00
cehoyos 91e150c019 Gui: Allow progress bar to move when playing mov or mp4 files
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22826 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-26 09:26:02 +00:00
diego d6a63f429f Invert logic for HAVE_NO_POSIX_SELECT to HAVE_POSIX_SELECT to be in line
with the other HAVE_ #defines throughout the codebase.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22769 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-21 08:24:20 +00:00
uau a4c58e8f87 Allow demuxers to return packets with no pts in -correct-pts mode
as long as there are enough pts values for frames that the decoder
returns.
This should allow passing NAL units individually.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22516 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-11 17:30:44 +00:00
uau c60af33716 Move the sh_audio->delay field to mpctx->delay.
The value is related to overall a/v sync and is not used by audio
demuxers or decoders.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22506 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-11 06:16:14 +00:00
reimar c73a6a15d3 Fix bad uninit when switching DVB channels.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22476 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-06 11:24:08 +00:00
uau eeec36107d Fix copy-paste bug (must have broken something in the GUI)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22429 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-03 22:15:19 +00:00
uau b07b695aa0 Seek to -ss position, not 0, in per-file loop.
Fixes -ss combined with per-file loop after r22356.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22383 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-01 00:22:03 +00:00
uau 5074d4728f Seek to -ss position without first starting audio/video from the start.
Manual seeks no longer shift -endpos position (hopefully no one
considered that a "feature").


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22356 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-27 01:16:59 +00:00
uau 46c3f03853 Remove some #if 0 code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22331 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-24 07:28:07 +00:00
uau e5ab09bb64 Move parsing of the -ss option to the option code.
Also fixes a memory leak of the parameter string.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22330 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-24 07:11:57 +00:00
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
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
uau 173381f74d Replace sleep time calculation in main() with a separate function.
Fixes some problems with playback_speed!=1: sleep limits which were
supposed to be real time were calculated in scaled time, timing
inaccuracies in nosound mode affected next frame by 
err*(1-1/playback_speed), auto quality code used scaled time.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20915 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 09:29:03 +00:00
uau d1628d12f5 simplify
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20914 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 06:56:17 +00:00
uau c29775e901 Move -frames check out of frame flip code (like -endpos earlier)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20913 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 06:49:37 +00:00
uau 7181a091f8 Remove some unused code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20912 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 06:44:16 +00:00
uau 031e9068cc Move endpos handling from page flip code to a saner location, change < to <=
If the shown frame was already at exactly the end pos we don't want to
show one more frame after it.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20911 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 06:35:55 +00:00
uau 186e0d274e move vo event check together with gui event check
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20910 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 06:25:02 +00:00
uau 9e9851231f Remove some incorrect code
This code was apparently intended to duplicate frames in constant-
framerate output in case of skipped input frames, but the test used
(blit_frame not set at that location) is not correct for that use.
If removing this code turns out to make the brokenness of other code
more apparent then a better fix might be needed.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20908 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 05:56:20 +00:00
uau e978f405a1 Try filling audio buffers more if they're very large, add some comments.
Larger buffers could make sense with lots of high-bitrate audio
channels.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20906 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 04:17:41 +00:00
uau b65c295b31 Move audio playing code from main() into a separate function.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20905 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 03:13:45 +00:00
uau 8c6ce53875 Remove useless check.
sh_video should always be non-NULL if this code is run.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20904 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 01:59:46 +00:00
uau a6863268cc Split some from main() into separate functions.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20903 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 01:40:06 +00:00
uau 0f6d5e4fd9 Change value used to indicate "unknown audio format" from 0 to -1.
0 collided with a valid format value.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20787 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-08 18:31:04 +00:00
nicodvb faa4d4ea23 now the OSD shows the value returned by demuxer_get_current_time() rather than sh_video->pts
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20766 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-07 22:57:42 +00:00
reimar 74a504f25b ARCH_X86 simplifications
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20593 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-01 18:41:25 +00:00
eugeni 978061ad27 Move ass_library initialization code to ass_mp.c.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20518 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 15:26:13 +00:00
eugeni 219d0cfca9 Always initialize and destroy ass_library.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20499 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 03:23:23 +00:00
uau 4df2014879 Always initialize libass to fix crashes caused by use without initialization.
Library init was only done if ass_enabled was true at program startup.
However there are at least 2 ways how MPlayer can later try to access
the library even if ass_enabled is false at that point:
- per-file options can turn on ass support later
- if the embeddedfonts option is enabled and the file has fonts 
  demux_mkv will call ass_process_font


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20498 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 00:23:12 +00:00
eugeni efea99c2c9 Libass interface reworked:
- ass_instance_t renamed to ass_renderer_t
- ass_library_t introduced
- use of mplayer-specific global variables limited to ass_mp.c


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20493 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-28 15:07:18 +00:00
reimar 3ee22e98d4 Do not forget to clear subtitles when switching files for embedded subtitles.
Fixes bug #409.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20347 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-21 23:45:41 +00:00
ptt 0e3c3727ce applied patch for -endpos, to work without a blit_frame, pointed out by Andrew Savchenko
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20329 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-21 09:32:58 +00:00
rtogni c844ece6d4 Disable loading of file-specific configuration file from the same
directory as the played file. Add a command-line switch to enable it.
Patch by reimar, manpage patch by me


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20257 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-15 21:27:15 +00:00
reimar e6fd2e126e Remove unused ABS define
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20213 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-14 16:31:41 +00:00
reimar 24bdd688d3 10l, used MSGTR_Unknown instead of lang in mp_property_audio
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20188 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-12 18:15:07 +00:00
reimar 1018bf78dc simplify mp_property_sub
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20187 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-12 18:10:45 +00:00
reimar a21817cecd Cosmetics for previous mplayer.c patch
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20185 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-12 18:06:18 +00:00
reimar ee65f7b7d9 Simplify mp_property_audio
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20184 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-12 18:03:28 +00:00
ptt 07198ca3ae modifications pointed out by reimar doffinger
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20174 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-12 14:11:39 +00:00
ptt 68613bbee7 added OSD audio switching visualization
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20162 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-11 17:25:46 +00:00
ptt 928da7a448 after a long time, finally i could add -endpos option to mplayer executable.
as oded told me on 1006 02 24, i applied it, blame me if some problem occurs,
i hope not, since i tried it for a while....


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19979 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-25 16:47:56 +00:00
diego 0a612539ea Fix the sound mute switch in the GUI menu by moving the corresponding
piece of GUI code after audio initialization.
patch by Stanislav Maslovski, stanislav.maslovski gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19952 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-23 13:06:55 +00:00
reimar a32e00516f Fix audio stream switching with demux_mkv:
return value of demuxer_switch_audio is new stream number for
-aid, the index in a_streams array is in demuxer->audio->id instead.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19951 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-23 11:07:58 +00:00
nicodvb cf23d6d116 when changing chapter, in the osd print the channel number in a more natural form:
1-based (rather than 0-based)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19949 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-23 10:27:32 +00:00
nicodvb 9910eae2ba show in the osd the number of the button selected by the mouse
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19916 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-19 22:44:19 +00:00
jonas 776787600d Іnitial button value is -1. Only (button>0) is a correct button selection.
Initialized "dvdnav_status_t status" explicitly for clarity.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19914 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-19 21:42:43 +00:00
nicodvb 78992c7fdc report mouse coordinates after movement to dvdnav; this permits to enable button selection using the mouse; patch by Jonas Jermann and me
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19857 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-16 15:25:31 +00:00
nicodvb 2003857aa2 report to mplayer with a slave command the coordinates of the pointer reported by x11; rescale coordinates to [0,1]x[0,1] range - patch by Jonas Jermann and me
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19856 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-16 15:13:41 +00:00
nicodvb 3cb5c5b62a don't uninit the video_out when using -fixed-vo; patch by Jonas Jermann
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19843 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-15 17:26:30 +00:00
eugeni 21faec3791 Add repeated screenshot mode to vf_screenshot.
It is triggered by "screenshot 1".


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19839 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-15 13:27:59 +00:00
attila 840a77bd06 * remove extern definitions of functions in .c files
* create new .h files where necessary

todo:
* go trough other files than mplayer.c
* vf_menu_pause_update()
* mp_input_register_options()
* import_playtree_playlist_into_gui()
* import_initial_playtree_into_gui()

For more infos see http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2006-September/045683.html
( 20060902133225.2cc82aec.attila@kinali.ch on -dev-eng )


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19814 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-12 16:24:23 +00:00
nicodvb aab523e18b in mp_dvdnav_handle_input() assign the currently selected button, shown in the OSD by main()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19780 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-09 22:40:22 +00:00
nicodvb 0292752ed0 first touch of support for dvdnav menus; the selection is based on the keyboard selection and is completely blind: there's not the slightest visual feedback
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19775 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-09 21:45:23 +00:00
nicodvb 6462618244 unconditionally include label goto_enable_cache (to be used next by dvdnav)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19773 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-09 21:32:06 +00:00
gpoirier 4026edffd8 fix broken term_osd output in update_osd_msg()
Patch by Andrew Savchenko Bircoph A list P ru
Original thread:
03.09.2006 13:22
[MPlayer-dev-eng] [PACTH] mplayer.c: broken term_osd output in	
update_osd_msg()


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19766 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-09 11:57:43 +00:00
uau 2ca1aba8b5 Disable rtc timing by default.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19762 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-09 02:08:52 +00:00