Commit Graph

150 Commits

Author SHA1 Message Date
reimar 186bff568e Fix windows Gui compilation and remove some related typecasts.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30764 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-27 19:53:25 +00:00
diego b63759b175 Do not cast the results of malloc/calloc/realloc.
These functions return void*, which is compatible with any pointer,
so there is no need for casts.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30744 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-26 15:01:37 +00:00
reimar adc345131f Fix silly type of guiGetEvent argument to use void * instead of char * and
get rid of some of the insane amount of casts necessary to hide the utter
idiocy of the type used before.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30731 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-25 21:27:22 +00:00
zuxy b2e8cf6bc2 Include libmpcodecs/vd.h for declaration of "fullscreen".
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30726 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-25 08:39:55 +00:00
diego 36a14ac50c Declare externally used variables from vd.c as extern in vd.h.
This saves declaring them as extern all over the place.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30695 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-22 09:51:44 +00:00
diego 8ba6b4eaf9 cosmetics: Remove pointless empty lines at EOF.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30675 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-20 21:02:49 +00:00
diego d306b727b1 Remove pointless '#if 1' preprocessor directives.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30654 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-19 10:22:29 +00:00
reimar ff8c044318 Fix win32 gui compilation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30600 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-16 19:07:06 +00:00
diego 2e98215f13 Move movie_aspect extern declaration to libmpcodecs/vd.h.
This is the appropriate place for the declaration; the variable is
declared in libmpcodecs/vd.c.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30579 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-14 14:47:22 +00:00
diego 6448809568 Move GUI-related extern declarations to a GUI header file.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30578 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-14 14:33:16 +00:00
diego dc32369107 GUI: Mark functions that are not used outside their files as static.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30577 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-14 14:02:09 +00:00
diego 68219deebf Avoid forward declarations for import_initial_playtree_into_gui() and
import_playtree_playlist_into_gui; declare them in interface.h instead.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30575 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-14 13:49:31 +00:00
diego 93e9e860d7 Rename gui/mplayer/gtk/menu.[ch] --> gui/mplayer/gtk/gtkmenu.[ch].
This avoids confusion with headers of the same name in other places.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30573 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-14 12:55:02 +00:00
diego 7078ce833e GUI: #include associated .h files in .c files.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30571 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-14 12:31:24 +00:00
diego 11b55ec7a8 Fix exit_player() usage throughout the codebase.
exit_player() was declared with differing parameter types in mplayer.c and
mplayer.h. Make the declaration in the .h file match the one in the .c file
and adjust all usages of exit_player() throughout the codebase. Also move
the exit_player() declaration into mp_core.h next to exit_player_with_rc().


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30558 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-14 10:53:20 +00:00
reimar 1a7b69f7f2 Simplify and correct loop condition, also avoids a compiler warning for unused result.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30447 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-27 19:45:16 +00:00
reimar 4526f4da65 Fix newline removal code that might read and write out of bounds.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30446 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-27 19:42:24 +00:00
reimar 0f4d83ce51 Use av_malloc to ensure sufficient alignment and also free at least some
of the allocated memory.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30430 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-24 21:15:43 +00:00
reimar aedf40e334 Do not depend on PIX_FMT_RGB32 which is (currently?) not part of the public API.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30352 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-17 14:53:12 +00:00
reimar 07f7df3208 Call XSync after XShmAttach to avoid a possible race-condition with shmctl.
Patch from FreeBSD ports.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30260 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-10 14:03:10 +00:00
diego 0a1e9b2902 Add missing config.h #include; remove a redundant one.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30204 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-04 13:13:10 +00:00
reimar 2908957147 Remove more direct includes of libass/ass.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30105 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-24 10:26:29 +00:00
diego e5751ced4f Replace WORDS_BIGENDIAN by HAVE_BIGENDIAN in all internal code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29443 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-26 19:53:00 +00:00
diego 6e9cbdc104 whitespace cosmetics: Remove all trailing whitespace.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-13 02:58:57 +00:00
diego be4c9f7142 Remove pointless #ifdef around internal #include.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29190 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-19 13:32:15 +00:00
compn 2a18b0bf36 add tivo (ty) and rm (rmvb) to file chooser, fixes bug 663
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29141 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-04 20:30:49 +00:00
diego c464abb983 Fix some typos, add flv and trp to the list of video formats
and rearrange file type lists alphabetically.
patch by Konrad 'd3viCe' Pióro, konrad.pioro zask pl


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28274 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-05 22:18:35 +00:00
diego 824abb5a65 Add missing 'void' keyword to parameterless function declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28267 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-05 14:48:03 +00:00
diego 0864f92e7a Get rid of pointless 'extern' keywords.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-03 23:01:03 +00:00
diego 959c047930 Add necessary #include <stdlib.h> for realloc/calloc/free.
patch by JonY, 10walls gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27501 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-31 13:05:33 +00:00
diego 2a90e559a9 consistency cosmetics: Avoid using .. in #include paths.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27495 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-29 22:29:27 +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
diego 141e81cce4 Rename a bunch of miscellaneous preprocessor directives.
Switch them from a HAVE_ to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27423 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 08:58:07 +00:00
diego 024b6efdf1 Introduce CONFIG_ALSA preprocessor directive for ALSA 0.9 and 1.x.
Use it in all the places that checked for either ALSA 0.9 or 1.x.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27422 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-06 23:19:29 +00:00
diego f83e779ee4 Rename some audio-output-related preprocessor directives.
Switch them from a HAVE_ prefix to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27419 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-05 16:32:47 +00:00
diego 82f319af62 Change a bunch of X11-specific preprocessor directives.
Switch from a HAVE_ prefix to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27409 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-04 06:16:23 +00:00
diego 02135001b4 Change a bunch of video/audio-output-specific preprocessor directives from
a HAVE_ prefix to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27402 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-03 15:21:40 +00:00
diego d17f9943af Rename some preprocessor directives from CONFIG_* to HAVE_* where appropriate;
CONFIG_ prefix for configurable options, HAVE_ for system-dependent stuff.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27391 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-01 20:28:58 +00:00
diego 3b31fa5717 Rename two GUI-related preprocessor directives:
HAVE_NEW_GUI --> CONFIG_GUI, HAVE_GTK2_GUI --> CONFIG_GTK2


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27375 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-30 13:44:59 +00:00
diego 4b141479da Start unifying names of internal preprocessor directives.
Replace all USE_ prefixes by CONFIG_ prefixes to indicate
options which are configurable.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27373 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-30 12:01:30 +00:00
zuxy d7af803d7a Remove unnecessary and troublesome inline
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27324 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-18 08:26:26 +00:00
zuxy a078ef894c Force gcc to emit function body under -gnu99
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27306 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-17 10:07:21 +00:00
diego 3e1c882458 Mark function not used outside of the file as static.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27239 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-08 15:55:32 +00:00
diego 2ec286d286 Remove declaration of extern inline function that is used nowhere from header
file, fixes the warnings:
gui/mplayer/gui_common.h:32: warning: inline function 'TranslateFilename' declared but never defined
gui/mplayer/gui_common.h:32: warning: inline function 'TranslateFilename' declared but never defined


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27238 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-08 15:54:31 +00:00
diego 05bc68ae36 Add standard GPL header to individual files.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26490 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-22 09:33:39 +00:00
diego e84b4b7686 Use standard GPL header.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26489 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-22 09:32:30 +00:00
albeu a2728034c9 noconfig fix, disable_gui_conf was not defined when compiling mencoder.
Fix mencoder linking when the GUI is enabled.
Patch by Norman Yarvin (yarvin -at- yarchive -dot- net).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26454 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-15 13:20:15 +00:00
albeu 6e62b3a85f Add options to disable some or all config files.
Patch by Andrew Savchenko (Bircoph -at- list -dot- ru).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26448 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-14 11:21:29 +00:00
diego 751c986719 wording improvements suggested by the Wanderer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26424 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-12 22:01:16 +00:00
diego a1a1bd5e31 Make include paths consistent; do not use ../ in them.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26414 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-12 16:03:07 +00:00