Commit Graph
27612 Commits
Author SHA1 Message Date
Uoti Urpala 8ea7eb77fc core: Clean up move-to-next-file logic
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.
2008-08-13 08:06:26 +03:00
Uoti Urpala e107cf7851 Use correct terminal "clear line" code
The "erase_to_end_of_line" string used to clear the terminal status
line was initialized with the termcap id "cd", which means to clear
all lines below the cursor. Change it to the correct "ce" to clear the
current line.

Usually the status line is on the bottommost line of the terminal so
the behaviour wouldn't differ much. However it did make a difference
when I tested starting MPlayer at the top of a huge gnome-terminal
window so the status line was not at the bottom; in that case clearing
just the current line used less CPU than clearing the part of the huge
window below the status line.
2008-08-13 06:06:29 +03:00
Uoti Urpala e09fe1ce04 Merge svn changes up to r27458 2008-08-12 15:03:34 +03:00
Uoti Urpala 9425571f41 mplayer.c: #include mplayer.h and access_mpcontext.h
Both declare symbols defined in mplayer.c, so include them to make the
compiler check the declarations match.
2008-08-12 14:57:18 +03:00
Uoti Urpala 8685eea8c2 Rename exit_player() use outside core to exit_player_bad()
The VOs which use it shouldn't really exit the whole program. The
renaming will allow including mplayer.h in mplayer.c without clashing
with the static exit_player() there.
2008-08-12 14:57:18 +03:00
Uoti Urpala 9f7c6291a5 Remove special error message for -ao alsa1x and alsa9
Those variants were removed in 2004. Remove the special handling of
those ao names and treat them like any other unrecognized ao name.
This removes a questionable exit_player() call.
2008-08-12 14:57:18 +03:00
Uoti Urpala 1ade57af4b m_config.c: Remove unused function m_config_get_option_ptr 2008-08-12 14:57:18 +03:00
Uoti Urpala 0f2daad81d spuenc.c: Remove unused code 2008-08-12 14:57:18 +03:00
Uoti Urpala cfe2839386 Move some declarations from mplayer.c to proper headers
Declare mp_input_register_options in input.h and
xscreensaver_heartbeat in x11_common.h.
2008-08-12 14:57:18 +03:00
Uoti Urpala 8d5912e60d mpeg ao/vo drivers: Fix packet-writing helper function types
Add missing 'const' to callback functions passed to
send_mpeg_pes_packet() / send_mpeg_lpcm_packet().
2008-08-12 14:57:17 +03:00
Uoti Urpala 680703ecae ao_mpegpes: Remove declarations of unused functions 2008-08-12 14:57:17 +03:00
Uoti Urpala f6dfaf26f8 Make various functions static 2008-08-12 14:57:12 +03:00
Uoti Urpala cab2e4f5ca Include corresponding .h in some .c files 2008-08-12 13:46:01 +03:00
Uoti Urpala 0d09176078 stream.h: Add 2 prototypes instead of declaring them in cache2.c
Declare stream_fill_buffer() and stream_seek_long() always (before
they were only declared if cache was disabled and those were used
instead of cached versions). Remove the now redundant declarations in
cache2.c.
2008-08-12 12:49:37 +03:00
diego f88bf0c7b7 Remove pointless #ifdefs around extern declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27458 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-12 07:38:30 +00:00
diego 51700fd1f5 Remove useless DVB-related #include.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27457 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-12 07:33:15 +00:00
diego ef97d3827a Enable PNG encoder in libavcodec for vf_screenshot only if zlib is enabled.
based on a patch by Magnus Damm, magnus.damm gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27456 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-12 07:16:18 +00:00
compn 1dccc1979c updates
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27455 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-12 01:58:36 +00:00
ben e73396900c Mention IVTV, S3 and SH_VEU drivers within VIDIX section of manpage.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27454 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-11 23:15:24 +00:00
ben 85d48b9bb0 Update ChangeLog with latest VIDIX related changes regarding SuperH.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27453 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-11 23:11:38 +00:00
ben 8903c510f8 Add VIDIX driver for SuperH Mobile VEU hardware block.
Patch by Magnus Damm <magnus dot damm at gmail dot com>.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27452 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-11 23:10:03 +00:00
ben f2918b9240 Add proper VIDIX support for SuperH architecture.
Patch by Magnus Damm <magnus dot damm at gmail dot com>.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27451 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-11 23:04:03 +00:00
gpoirier f14367fac9 sync w/r27348, patch by JRaSH
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27450 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-11 21:10:04 +00:00
compn d4bf4c946c fix audio in some rtsp streams, ok'd by lu_zero
patch by Changjin Liu - !lcj.liu!at!gmail!com!
http://thread.gmane.org/gmane.comp.video.mplayer.user/56893/focus=56894


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27449 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-11 17:32:31 +00:00
diego f2b329942c The PNG encoder in libavcodec needs to be enabled for vf_screenshot even if
MEncoder is disabled.  patch by Adrian Stutz, adrian sttz ch


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27448 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-10 18:38:13 +00:00
compn 880757477b codecs.c note is very old and unneeded.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27447 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-10 15:32:03 +00:00
gpoirier 0bd41be67f sync w/27407 + fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27446 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-09 18:40:51 +00:00
diego ff2a3dd060 Use translatable string instead of hardcoded message for process priority.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27445 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-09 15:45:00 +00:00
diego c324966059 Remove duplicated prototype for XShmGetEventBase(), because
- it is used in other places without checking,
- it is a workaround for a bug elsewhere,
- if the problem is real at all, there should be a proper configure check.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27444 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-09 14:56:09 +00:00
diego 6d01235f44 Skip dependency generation if we just run distclean or if skipping
is requested explicitly on the command line.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27443 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-09 13:53:19 +00:00
eugeni e1ce107366 Don't print drawing commands on screen.
Drawing mode is not implemented in libass.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27442 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-08 20:08:02 +00:00
Uoti Urpala 17d3e4b36d Merge svn changes up to r27441
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
2008-08-08 02:13:09 +03:00
eugeni 6c857af5c0 If (has outline) blur(outline) else blur(glyph).
If there is an outline, the glyph itself should not be blurred. Keeps
the border between glyph and outline clear (unblurred), which is
probably how it should be.

Patch by Diogo Franco (diogomfranco gmail com).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27441 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 22:20:58 +00:00
eugeni a925925543 \org turns off collision detection.
Patch by Diogo Franco (diogomfranco gmail com).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27440 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 22:20:56 +00:00
eugeni 6c92d9358b Treat \h as space character.
Patch by Robert Rudd (robrudd at users sourceforge net).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27439 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 22:20:54 +00:00
eugeni 054f28e2d1 Calculate subtitle origin in floating point.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27438 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 22:20:52 +00:00
eugeni 1670e33e21 Calculate subtitle position in floating point.
Improves subtitle position precision from a unit of script coordinates
to a screen pixel.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27437 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 22:20:50 +00:00
diego af76be6e19 Add separate variables for CFLAGS that are specific to internal libraries
and only add them to CFLAGS when compiling objects from those libraries.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27436 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 21:46:06 +00:00
diego 2be57955c5 Remove unused Makefile variable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27435 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 21:44:26 +00:00
diego b3e99753a3 cosmetics: Rename some CFLAGS-related variables.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27434 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 21:03:14 +00:00
diego 2d6b7f320b 10l: Remove stray backslash at end of line.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27433 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 20:32:02 +00:00
diego d04687fc92 Merge two redundantly declared lines into one.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27432 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 12:36:31 +00:00
diego a64801ec63 cosmetics: Sort things into alphabetical order in various places.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27431 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 12:35:34 +00:00
ben f56b633045 Add NV12 colorspace support to VIDIX driver.
patch by Magnus Damm <magnus dot damm at gmail dot com>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27430 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 12:28:28 +00:00
diego e0b1c9a6b7 Give a CONFIG_ prefix to preprocessor directives that lacked one and
change arbitrary prefixes to CONFIG_.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27429 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 12:20:50 +00:00
diego 7377a6a60a generalized SH architecture support by Magnus Damm, magnus.damm gmail com
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27428 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 11:58:37 +00:00
diego e98e792843 10l: MUSEPACK --> CONFIG_MUSEPACK
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27427 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 11:19:54 +00:00
diego 5641e60698 Ahem, the MACOSX_FINDER_SUPPORT directive was renamed to MACOSX_FINDER.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27426 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 10:57:40 +00:00
diego 091d352d06 Rename font-related preprocessor directives.
Switch them from a HAVE_ to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27425 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 10:36:07 +00:00
ben dba246199c Fix wrong behavior with slave command by going back to the starting point
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
2008-08-07 09:53:59 +00:00