Commit Graph

1156 Commits

Author SHA1 Message Date
reimar 527d293139 Do not reset user-enabled mute on EOF, but only on exit.
Make behaviour more consistent with general volume control.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24337 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-03 21:11:41 +00:00
nicodvb 7ac5a60a2b moved to reinit_video_chain() the assignment of sh_video->stream_aspect, where it makes more sense
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24322 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-01 20:56:45 +00:00
nicodvb be450f8293 if the stream reader supports it assign to the video the stream aspect ratio
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24320 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-01 15:56:19 +00:00
diego 84157efa5a Clean up the way get_path is handled: Compile get_path.c to an object to link
against instead of directly #including the C file and replace the many extern
declarations by a proper header file.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24262 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-28 11:20:24 +00:00
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