mplayer.git
8 years agoAdd const to string pointer argument that will not be modified.
ib [Sun, 19 Jun 2011 13:58:45 +0000 (13:58 +0000)]
Add const to string pointer argument that will not be modified.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33659 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoRename some pixmaps.
ib [Sun, 19 Jun 2011 13:01:20 +0000 (13:01 +0000)]
Rename some pixmaps.

List of changes:

a11 -> aspect11
a169 -> aspect169
a235 -> aspect235
a43 -> aspect43
about -> emblem
ab -> about
delsub -> nosub
eq -> equalizer
fs -> full
pl -> playlist
stop2 -> stop
tongue -> audiolang
tonguebla -> sublang

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33658 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoChange vo_directx to use w32_common.c
reimar [Sun, 19 Jun 2011 12:51:36 +0000 (12:51 +0000)]
Change vo_directx to use w32_common.c

While I tested it quite thoroughly, with and without
-wid, -vm, -fs, ... it is _very_ likely to break
something, please report any regressions!
In the worst case it can still be reverted, however
since it has very little relevance nowadays it will
rot all the faster if not at least some code is shared.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33657 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoGenerate VO_EVENT_MOVE also with -wid.
reimar [Sun, 19 Jun 2011 12:45:28 +0000 (12:45 +0000)]
Generate VO_EVENT_MOVE also with -wid.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33656 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoImplement uiStop and remove outdated comment.
reimar [Sun, 19 Jun 2011 12:36:12 +0000 (12:36 +0000)]
Implement uiStop and remove outdated comment.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33655 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoAdd cfg_gui_include also for win32 GUI.
reimar [Sun, 19 Jun 2011 12:26:38 +0000 (12:26 +0000)]
Add cfg_gui_include also for win32 GUI.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33654 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoAdd const to string pointer argument that will not be modified.
reimar [Sun, 19 Jun 2011 12:23:26 +0000 (12:23 +0000)]
Add const to string pointer argument that will not be modified.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33653 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoFix compilation of w32 gui.
reimar [Sun, 19 Jun 2011 12:05:32 +0000 (12:05 +0000)]
Fix compilation of w32 gui.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33652 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoRename #include guard in gui/ui/actions.h.
ib [Sun, 19 Jun 2011 11:42:24 +0000 (11:42 +0000)]
Rename #include guard in gui/ui/actions.h.

The name of the file has changed.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33651 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agow32_common: also generate VO_EVENT_MOVE.
reimar [Sun, 19 Jun 2011 10:36:15 +0000 (10:36 +0000)]
w32_common: also generate VO_EVENT_MOVE.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33650 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoAvoid including aviheader.h only for mmioFOURCC, it has too many
reimar [Sun, 19 Jun 2011 09:10:35 +0000 (09:10 +0000)]
Avoid including aviheader.h only for mmioFOURCC, it has too many
dependencies, including even subreader.h and via that fribidi.

This causes issues both when cross-compiling and for CODEC2HTML
compilation, so instead use avutil.h/MKTAG.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33649 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoAdd support for converting to interleaved 3D in vf_stereo3d.
reimar [Sun, 19 Jun 2011 08:33:57 +0000 (08:33 +0000)]
Add support for converting to interleaved 3D in vf_stereo3d.

Patch by Steaphan Greene [sgreene cs.binghamton.edu]

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33648 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agomanpage: clarify usage of -endpos with mplayer.
cboesch [Sat, 18 Jun 2011 21:08:29 +0000 (21:08 +0000)]
manpage: clarify usage of -endpos with mplayer.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33647 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agovo_mng: add output sub-option.
cboesch [Sat, 18 Jun 2011 20:50:55 +0000 (20:50 +0000)]
vo_mng: add output sub-option.

This also makes it consistent with vo_gif. Patch by Stefan Schuermans, stefan
on blinkenarea dot org.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33646 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoFix compilation after r33644.
ib [Sat, 18 Jun 2011 16:35:37 +0000 (16:35 +0000)]
Fix compilation after r33644.

Some include file changes apparently got lost.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33645 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoRename GUI directory 'mplayer' and some files in it.
ib [Sat, 18 Jun 2011 16:03:31 +0000 (16:03 +0000)]
Rename GUI directory 'mplayer' and some files in it.

The directory 'mplayer' contains the files for the user interface and
has thus been renamed 'ui'.

Inside this directory the following files have been renamed to better
reflect their contents:

mw.c -> main.c
sw.c -> sub.c
pb.c -> playbar.c
gui_common.* -> render.*
play.* -> actions.*

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33644 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoCosmetic: Rename some GUI variables and functions.
ib [Sat, 18 Jun 2011 14:33:41 +0000 (14:33 +0000)]
Cosmetic: Rename some GUI variables and functions.

The new names are more intelligible and consistent.

List of changes:

guiIntfStruct -> guiInfo
appMPlayer -> guiApp
txSample -> guiImage (and member BPP -> Bpp)
mplDrawBuffer -> mainDrawBuffer
mplPBDrawBuffer -> playbarDrawBuffer
mplMenuDrawBuffer -> menuDrawBuffer
mpl.* -> ui.* (or mpl dropped)
.*bar.* -> .*playbar.*
URLItem -> urlItem
ChangeSkin -> uiChangeSkin
Convert32to1 -> bpRenderMask

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33643 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agobuild: Only compile DLL loader test program under x86_32.
diego [Sat, 18 Jun 2011 10:33:30 +0000 (10:33 +0000)]
build: Only compile DLL loader test program under x86_32.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33642 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agobuild: Fix TOOLS/subrip object dependencies.
diego [Sat, 18 Jun 2011 10:32:45 +0000 (10:32 +0000)]
build: Fix TOOLS/subrip object dependencies.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33641 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoSpelling fix.
reimar [Sat, 18 Jun 2011 08:07:53 +0000 (08:07 +0000)]
Spelling fix.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33640 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoAdd a warning message for unavailable or unusable icons.
ib [Fri, 17 Jun 2011 18:59:03 +0000 (18:59 +0000)]
Add a warning message for unavailable or unusable icons.

This is a preparation for differently sized icons to come.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33639 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoCosmetic: Adjust indent.
ib [Fri, 17 Jun 2011 18:31:35 +0000 (18:31 +0000)]
Cosmetic: Adjust indent.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33638 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoAdjust message levels in wsXInit().
ib [Fri, 17 Jun 2011 18:27:00 +0000 (18:27 +0000)]
Adjust message levels in wsXInit().

Additionally, change debug output calls to mp_dbg().

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33637 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoRemove unused parameter 'Size' in wsConvert().
ib [Fri, 17 Jun 2011 17:51:50 +0000 (17:51 +0000)]
Remove unused parameter 'Size' in wsConvert().

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33636 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoSynced with help_mp-en.h rev. 33618
jrash [Fri, 17 Jun 2011 13:22:41 +0000 (13:22 +0000)]
Synced with help_mp-en.h rev. 33618

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33635 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoUse the same yasm check as FFmpeg.
cehoyos [Thu, 16 Jun 2011 21:37:21 +0000 (21:37 +0000)]
Use the same yasm check as FFmpeg.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33634 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoCosmetic: Adjust indent.
ib [Thu, 16 Jun 2011 17:43:05 +0000 (17:43 +0000)]
Cosmetic: Adjust indent.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33633 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoCheck whether a specific icon is available.
ib [Thu, 16 Jun 2011 17:40:55 +0000 (17:40 +0000)]
Check whether a specific icon is available.

If icons are no longer included in the source, but will be read from
files, then reading may fail and a particular icon (size) may not be
available.

This is a preparation for differently sized icons to come.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33632 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoUse small icon for property KWM_WIN_ICON, if available.
ib [Thu, 16 Jun 2011 15:03:18 +0000 (15:03 +0000)]
Use small icon for property KWM_WIN_ICON, if available.

This property will allow the window manager to select
from differently sized icons.

It is a preparation for this feature to come.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33631 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoAdd support for _NET_WM_ICON
ib [Thu, 16 Jun 2011 14:50:24 +0000 (14:50 +0000)]
Add support for _NET_WM_ICON

This property will allow the window manager to select
from differently sized icons.

It is a preparation for this feature to come.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33630 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoAvoid compiler warnings.
ib [Thu, 16 Jun 2011 13:09:52 +0000 (13:09 +0000)]
Avoid compiler warnings.

Remove unused parameter, use passed parameter instead of global variable
or tag variable as unused to avoid warnings of unused variables.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33629 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoRevise wsSetIcon().
ib [Thu, 16 Jun 2011 12:44:28 +0000 (12:44 +0000)]
Revise wsSetIcon().

Group WMHints and KWM_WIN_ICON statements.
Use X11 Bool symbolic constant.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33628 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoCosmetic: Format to MPlayer coding style.
ib [Thu, 16 Jun 2011 12:31:42 +0000 (12:31 +0000)]
Cosmetic: Format to MPlayer coding style.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33627 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoCosmetic: Format to MPlayer coding style.
ib [Thu, 16 Jun 2011 12:30:24 +0000 (12:30 +0000)]
Cosmetic: Format to MPlayer coding style.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33626 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoMove key definitions for multimedia keyboards to libvo/wskeys.h,
ib [Thu, 16 Jun 2011 11:52:44 +0000 (11:52 +0000)]
Move key definitions for multimedia keyboards to libvo/wskeys.h,
making wm/wskeys.h finally obsolete.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33625 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoRemove support for Acer AirKey V keyboard multimedia keys.
ib [Thu, 16 Jun 2011 11:45:47 +0000 (11:45 +0000)]
Remove support for Acer AirKey V keyboard multimedia keys.

Multimedia key support for arbitrary keyboards should be
realized differently.

(Blame me, if someone's actually using this keyboard.)

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33624 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoRename Render() RenderAll().
ib [Thu, 16 Jun 2011 11:30:11 +0000 (11:30 +0000)]
Rename Render() RenderAll().

All items are rendered by this function at one go,
so the new name is more appropriate.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33623 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoRemove function Normalize().
ib [Thu, 16 Jun 2011 11:19:15 +0000 (11:19 +0000)]
Remove function Normalize().

This function changed ARGB data as if it had been RGB24 data (not quite
correctly) converted to ARGB with all colors transparent.

Instead now, set the alpha channel for RGB24 data and leave ARGB data
untouched.

For X11, the alpha channel is disregarded, so both approaches are equal,
but the new one is more intelligible as we get correct ARGB PNG data.

For legacy reasons, all kind of fuchsia/magenta must be treated as
transparent, because some skins are using at least both full opaque and
full transparent fuchsia/magenta for transparency.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33622 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoAdd some missing libavutil #includes.
diego [Thu, 16 Jun 2011 09:27:31 +0000 (09:27 +0000)]
Add some missing libavutil #includes.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33621 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoSupport "Length" option is .pls playlist files.
reimar [Wed, 15 Jun 2011 18:06:28 +0000 (18:06 +0000)]
Support "Length" option is .pls playlist files.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33620 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoGet non-multimedia X11 key definitions from libvo/wskeys.h.
ib [Wed, 15 Jun 2011 09:28:20 +0000 (09:28 +0000)]
Get non-multimedia X11 key definitions from libvo/wskeys.h.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33619 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoRevise some messages.
ib [Tue, 14 Jun 2011 23:05:02 +0000 (23:05 +0000)]
Revise some messages.

Revise message levels, message types and texts, move some messages
at a more appropriate place and remove an unused message.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33618 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoStore icon data in a struct variable.
ib [Tue, 14 Jun 2011 18:55:04 +0000 (18:55 +0000)]
Store icon data in a struct variable.

This is a preparation for differently sized icons to come.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33617 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoDo some gtkInit() cleanup.
ib [Tue, 14 Jun 2011 18:01:22 +0000 (18:01 +0000)]
Do some gtkInit() cleanup.

Move debug message at top of function and revise message text.
Remove commented code.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33616 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoCosmetic: Adjust indent.
ib [Tue, 14 Jun 2011 17:53:40 +0000 (17:53 +0000)]
Cosmetic: Adjust indent.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33615 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoFix GUI icon bug.
ib [Tue, 14 Jun 2011 17:51:17 +0000 (17:51 +0000)]
Fix GUI icon bug.

The GUI icon did not display properly but showed up with various distortions.
The reason was the icon mask which hadn't been put to the X server yet when
used.

The icon itself was okay, but is rendered now in a way that doesn't need a
drawable which spares creating a GTK window and destroying it right after.

The locally used GDK variables have been moved inside the function where
they are needed.

Patch with grateful support by Steaphan Greene, sgreene cs.binghamton edu.

This closes Bugzilla #582.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33614 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoAdd support for multimedia pause key.
ib [Tue, 14 Jun 2011 14:48:52 +0000 (14:48 +0000)]
Add support for multimedia pause key.

This closes Bugzilla #1290.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33613 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoAdd note on wsXFMM key definitions.
ib [Tue, 14 Jun 2011 14:39:26 +0000 (14:39 +0000)]
Add note on wsXFMM key definitions.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33612 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoRemove unused key definitions.
ib [Tue, 14 Jun 2011 14:33:54 +0000 (14:33 +0000)]
Remove unused key definitions.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33611 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoUse correct type CARD32 for the KWM_WIN_ICON data.
ib [Tue, 14 Jun 2011 14:21:49 +0000 (14:21 +0000)]
Use correct type CARD32 for the KWM_WIN_ICON data.

Based on a patch by Steaphan Greene, sgreene cs.binghamton edu.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33610 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoAllow Pause/Break key to be bound as MPlayer input key under X11.
diego [Tue, 14 Jun 2011 12:13:47 +0000 (12:13 +0000)]
Allow Pause/Break key to be bound as MPlayer input key under X11.
patch by Steaphan Greene, sgreene cs.binghamton edu

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33609 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoMark some char * arguments that are strdup'd const,
reimar [Mon, 13 Jun 2011 19:39:18 +0000 (19:39 +0000)]
Mark some char * arguments that are strdup'd const,
makes the API slightly clearer.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33608 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoRemove a pointless "return".
reimar [Mon, 13 Jun 2011 19:33:17 +0000 (19:33 +0000)]
Remove a pointless "return".

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33607 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agotighten dependency on libx264-dev package
siretart [Sun, 12 Jun 2011 19:19:51 +0000 (19:19 +0000)]
tighten dependency on libx264-dev package

mplayer will silently fail to compile against libx264 if an older version is installed.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33606 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoChange code to allow STREAM_CTRL_GET_CURRENT_TIME with cache enabled.
reimar [Sun, 12 Jun 2011 11:26:22 +0000 (11:26 +0000)]
Change code to allow STREAM_CTRL_GET_CURRENT_TIME with cache enabled.

Due to that time being from what is currently read into the cache it
is unfortunately somewhat inaccurate and unsmooth, however for streams
that do have stream timestamps it is till a lot better than going by
the demuxer alone.
In particular it fixes bug #1081, when starting a DVD with -chapter
following seeks would be relative to the start of the DVD instead
of the current position.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33605 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoRemove pointless ().
reimar [Sun, 12 Jun 2011 11:12:17 +0000 (11:12 +0000)]
Remove pointless ().

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33604 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoFix dvd_get_current_time so the cell argument actually has a purpose.
reimar [Sun, 12 Jun 2011 11:10:13 +0000 (11:10 +0000)]
Fix dvd_get_current_time so the cell argument actually has a purpose.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33603 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agovobsub: simplify origin parsing.
cboesch [Sun, 12 Jun 2011 10:56:03 +0000 (10:56 +0000)]
vobsub: simplify origin parsing.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33602 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agovobsub: simplify timestamp parsing.
cboesch [Sun, 12 Jun 2011 10:55:24 +0000 (10:55 +0000)]
vobsub: simplify timestamp parsing.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33601 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoFix comment and placement of out-commented code.
reimar [Sun, 12 Jun 2011 10:41:49 +0000 (10:41 +0000)]
Fix comment and placement of out-commented code.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33600 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoMake mp_dvdnav_save_smpi more robust and ensure consistency of nav buffer.
reimar [Sun, 12 Jun 2011 09:57:07 +0000 (09:57 +0000)]
Make mp_dvdnav_save_smpi more robust and ensure consistency of nav buffer.

It seems that in_size could be negative sometimes, this would
cause crashes if the malloc somehow succeeded.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33599 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoSpelling fix.
reimar [Sun, 12 Jun 2011 09:17:05 +0000 (09:17 +0000)]
Spelling fix.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33598 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoReplace GDK_WINDOW_XWINDOW by GDK_PIXMAP_XID.
ib [Sun, 12 Jun 2011 07:07:32 +0000 (07:07 +0000)]
Replace GDK_WINDOW_XWINDOW by GDK_PIXMAP_XID.

Although both macros lead to the same result, GDK_PIXMAP_XID
intuitively gives the idea of what is happening.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33597 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoRename gtkIcon variables gdkIcon.
ib [Sun, 12 Jun 2011 06:56:43 +0000 (06:56 +0000)]
Rename gtkIcon variables gdkIcon.

Since they hold GDK objects this is the more appropriate name.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33596 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoMake variables static that are only used inside the file.
ib [Sun, 12 Jun 2011 06:48:10 +0000 (06:48 +0000)]
Make variables static that are only used inside the file.

There is no need to declare them extern.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33595 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoRemove needless explicit initialization of GdkPixmap variables.
ib [Sun, 12 Jun 2011 06:33:19 +0000 (06:33 +0000)]
Remove needless explicit initialization of GdkPixmap variables.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33594 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agofix legacy translation errors
jrash [Sun, 12 Jun 2011 02:31:07 +0000 (02:31 +0000)]
fix legacy translation errors

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33593 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoPass "native" filter chain sample format to audio encoder.
reimar [Sun, 12 Jun 2011 00:28:51 +0000 (00:28 +0000)]
Pass "native" filter chain sample format to audio encoder.
Make ae_lavc try to match this format.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33592 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoActually use the AF_FORMAT_UNKNOWN define instead of having it in a comment.
reimar [Sun, 12 Jun 2011 00:23:10 +0000 (00:23 +0000)]
Actually use the AF_FORMAT_UNKNOWN define instead of having it in a comment.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33591 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoRemove outdated message.
reimar [Sun, 12 Jun 2011 00:04:43 +0000 (00:04 +0000)]
Remove outdated message.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33590 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoFix encoding to formats taking input other than 16 bits per sample.
reimar [Sun, 12 Jun 2011 00:03:35 +0000 (00:03 +0000)]
Fix encoding to formats taking input other than 16 bits per sample.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33589 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoAlways choose AV_SAMPLE_FMT_S16 then the encoder supports it.
reimar [Sat, 11 Jun 2011 23:36:52 +0000 (23:36 +0000)]
Always choose AV_SAMPLE_FMT_S16 then the encoder supports it.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33588 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoOnly enable NEED_GLOB on win32, currently this has the effect
reimar [Sat, 11 Jun 2011 16:40:10 +0000 (16:40 +0000)]
Only enable NEED_GLOB on win32, currently this has the effect
of compiling win32-only code - and even if that compiled it would
not be used anyway!

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33587 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoAdd support for detecting VFPV3, required for compiling libavcodec for some
reimar [Sat, 11 Jun 2011 16:38:49 +0000 (16:38 +0000)]
Add support for detecting VFPV3, required for compiling libavcodec for some
ARM targets.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33586 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoChange linking order: Due to av_get_cpu_flags libswscale now depends on
reimar [Sat, 11 Jun 2011 16:28:37 +0000 (16:28 +0000)]
Change linking order: Due to av_get_cpu_flags libswscale now depends on
libavutil, too, and thus must come before it.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33585 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoReplace sys/fcntl.h include by fcntl.h include used everywhere else.
reimar [Sat, 11 Jun 2011 16:21:54 +0000 (16:21 +0000)]
Replace sys/fcntl.h include by fcntl.h include used everywhere else.

Also fixes compilation with the Android NDK.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33584 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoPut code checking if at the EOS in a function.
cboesch [Sat, 11 Jun 2011 15:39:00 +0000 (15:39 +0000)]
Put code checking if at the EOS in a function.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33583 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoReplace color constants in the MPlayer xpm icon file
ib [Sat, 11 Jun 2011 15:34:01 +0000 (15:34 +0000)]
Replace color constants in the MPlayer xpm icon file
by their respective RGB values.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33582 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoa_pos is also used by update_subtitles, so initialize it always.
reimar [Sat, 11 Jun 2011 15:07:37 +0000 (15:07 +0000)]
a_pos is also used by update_subtitles, so initialize it always.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33581 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoSet host_cc after cross-compile check.
reimar [Sat, 11 Jun 2011 14:54:59 +0000 (14:54 +0000)]
Set host_cc after cross-compile check.

This allows to set "cc" as a more sensible, almost always
working default when cross-compiling instead of using
the cross-compiler as host-cc which is just nonsense.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33580 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoVarious alignment cosmetics and brackets simplifications.
cboesch [Sat, 11 Jun 2011 13:52:11 +0000 (13:52 +0000)]
Various alignment cosmetics and brackets simplifications.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33579 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoClarify child_sighandler loop.
cboesch [Sat, 11 Jun 2011 13:27:29 +0000 (13:27 +0000)]
Clarify child_sighandler loop.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33578 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agosync with en/mplayer.1 rev. 33564
jrash [Fri, 10 Jun 2011 12:52:23 +0000 (12:52 +0000)]
sync with en/mplayer.1 rev. 33564

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33577 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoSynced with help_mp-en.h rev. 33565
jrash [Fri, 10 Jun 2011 11:59:43 +0000 (11:59 +0000)]
Synced with help_mp-en.h rev. 33565

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33576 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoFix typos.
cehoyos [Fri, 10 Jun 2011 08:31:00 +0000 (08:31 +0000)]
Fix typos.

Patch by Mike Castle, dalgoda+mplayer gmail

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33575 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoChange -udp-slave code to temporarily fall back to normal
reimar [Wed, 8 Jun 2011 18:58:10 +0000 (18:58 +0000)]
Change -udp-slave code to temporarily fall back to normal
timing after 30s network timeout.
This is the second try, this time tested with -vo xv
to avoid being tricked by vsync.
It will also still wait 30s for a message right after startup.
As a side-effect it also contains a fix against a minor issue that
-udp-slave would start up playing or seeking for files with
a non-zero start time.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33574 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoPartially revert r33242: it was broken, instead of continuing to
reimar [Wed, 8 Jun 2011 18:25:17 +0000 (18:25 +0000)]
Partially revert r33242: it was broken, instead of continuing to
play at normal speed playback started at maximum possible speed.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33573 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoProvide a desktop icon of reasonable size (48x48) and quality.
ib [Tue, 7 Jun 2011 15:16:22 +0000 (15:16 +0000)]
Provide a desktop icon of reasonable size (48x48) and quality.

All three icon files (ico, png and xpm) derive from the same
48x48 graphic which itself derives from the svg at
http://en.wikipedia.org/wiki/File:MPlayer.svg.

GUI's icon has been renamed mplayer.xpm (from MPlayer_mini.xpm)
and the format of the icon to be installed has been changed
from xpm to png.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33572 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoDelete unused pixmaps.
ib [Tue, 7 Jun 2011 13:40:41 +0000 (13:40 +0000)]
Delete unused pixmaps.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33571 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoFix segmentation fault when pressing U (stop playing) in GUI.
ib [Tue, 7 Jun 2011 13:17:05 +0000 (13:17 +0000)]
Fix segmentation fault when pressing U (stop playing) in GUI.

The GUI doesn't make use of playtree_iter, so it can't call
the play_tree_iter functions but has to stop in its own way.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33570 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoFix compilation without gui.
cehoyos [Tue, 7 Jun 2011 00:08:06 +0000 (00:08 +0000)]
Fix compilation without gui.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33569 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoCheck error when creating the GUI config object.
ib [Mon, 6 Jun 2011 15:11:24 +0000 (15:11 +0000)]
Check error when creating the GUI config object.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33568 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoPass m_config_new() error information to caller.
ib [Mon, 6 Jun 2011 14:55:06 +0000 (14:55 +0000)]
Pass m_config_new() error information to caller.

If allocation fails, return NULL instead of continuing.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33567 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoCosmetic: Adjust indent.
ib [Mon, 6 Jun 2011 14:10:09 +0000 (14:10 +0000)]
Cosmetic: Adjust indent.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33566 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoAdd option '-idle' to the GUI configuration file.
ib [Mon, 6 Jun 2011 14:08:18 +0000 (14:08 +0000)]
Add option '-idle' to the GUI configuration file.

Also, add a check button for it to the preferences menu.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33565 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoMake option '-noidle' working for the GUI.
ib [Mon, 6 Jun 2011 11:55:35 +0000 (11:55 +0000)]
Make option '-noidle' working for the GUI.

So far, -idle was implicitly a default option to the GUI (although
the corresponding option variable was set to the '-noidle' value).

Explicitly set option '-idle' in the GUI now, remove the error (both
message and exit) that "the -idle option cannot be used with GMPlayer",
start the GUI without filename in either mode (idle or noidle) and
go to play_next_file only as long as the GUI has something to play
(or -idle was given).

This allows using option '-noidle' for the GUI which can be used to
quit it after it has finished playing.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33564 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoWhen adding a playlist item, preventively set its next pointer to NULL.
ib [Sun, 5 Jun 2011 14:54:41 +0000 (14:54 +0000)]
When adding a playlist item, preventively set its next pointer to NULL.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33563 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoRemove unused member 'played' from playlist structure plItem.
ib [Sun, 5 Jun 2011 14:45:49 +0000 (14:45 +0000)]
Remove unused member 'played' from playlist structure plItem.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33562 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoCosmetic: Correct a comment and add a new one.
ib [Sun, 5 Jun 2011 14:32:53 +0000 (14:32 +0000)]
Cosmetic: Correct a comment and add a new one.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33561 b3059339-0415-0410-9bf9-f77b7e298cf2

8 years agoKeep the old option '-guiwid' around as CONF_TYPE_PRINT
ib [Sun, 5 Jun 2011 12:14:30 +0000 (12:14 +0000)]
Keep the old option '-guiwid' around as CONF_TYPE_PRINT
to inform of the new name.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33560 b3059339-0415-0410-9bf9-f77b7e298cf2