Commit Graph

746 Commits

Author SHA1 Message Date
diego c0f231ac47 Conditionally declare a conditionally used variable, fixes the warning:
stream/dvb_tune.c:99: warning: unused variable 'sec_dev'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27820 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-24 09:13:04 +00:00
diego ed0af8844a Determine default CD/DVD device in configure instead of using an #ifdef jungle.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27809 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-21 07:02:25 +00:00
diego 6f6bf7f765 Replace typeof by __typeof__, the former is a non-portable GNU extension.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27807 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-20 09:55:38 +00:00
reimar 3d1f36e3e7 Avoid CreateThread and especially TerminateThread since they cause a memleak.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27804 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-19 18:05:45 +00:00
reimar 834d4c5b7b Remove useless casts.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27803 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-19 17:28:23 +00:00
diego 2195547220 Revert declaring ThreadProc as void, it breaks the WINAPI.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27790 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-16 19:24:21 +00:00
diego 629db77d89 Move DEFAULT_CDROM_DEVICE/DEFAULT_DVD_DEVICE to stream.h where it belongs.
config.h should only contain option definitions, no logic.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27787 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-16 18:28:38 +00:00
diego 17f509905c Rename stream/netstream.h to stream/stream_netstream.h; netstream.h to make it
clearer that netstream.h belongs to stream_netstream.c.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27779 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-16 17:01:40 +00:00
diego 4d644f513c Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__.
This avoids a pointless indirection that only obscures what is really done.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27761 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-13 16:23:55 +00:00
diego 9214b77133 Declare ThreadProc as void, it does not return anything, fixes the warning:
stream/cache2.c:364: warning: control reaches end of non-void function


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27759 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-13 15:51:29 +00:00
diego bc7cf2efd8 Remove unused function, fixes the warning:
stream/tvi_dshow.c:1311: warning: 'reconnect_pins' defined but not used


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27758 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-13 15:25:34 +00:00
diego c8808af5a0 Unconditionally #include osdep/shem.h, fixes the warnings on Cygwin:
stream/cache2.c:244: warning: implicit declaration of function `shmem_alloc'
stream/cache2.c:265: warning: implicit declaration of function `shmem_free'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27757 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-13 15:13:40 +00:00
diego ac3b6d090c Move socklen_t typedef from config.h to stream/network.h.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27744 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-12 12:12:41 +00:00
voroshil 8095d9dacf Add debug message about loaded frequency tables.
Replace printed code of input type with user-frendly "broadcast"/"cable" strings.

patch from Laurent laurent dot aml at gmail dot com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27662 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-24 20:49:27 +00:00
voroshil 7132e7d852 Make output messages of frequency selection code more useful by
providing additional information like requested frequency
and found nearest fequency/channel.

patch from Laurent laurent dot aml at gmail dot com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27661 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-24 20:42:15 +00:00
voroshil 89600cd4ca Fix overflow in frequency conversion code inside tvi_dshow.
patch from Laurent laurent dot aml at gmail dot com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27660 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-24 20:30:06 +00:00
diego 261e389fdd With -identify, ID_DVD_VOLUME_ID is not shown on some systems.
Using DVDISOVolumeInfo instead of DVDUDFVolumeInfo fixes this.
patch by Mathieu SCHROETER, mathieu.schroeter gamesover ch


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27631 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-16 21:30:04 +00:00
diego 788a4d5f91 Move '#define closesocket close' preprocessor directive to a common place
and put it under the proper '#ifndef HAVE_CLOSESOCKET' condition.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27505 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-01 07:31:57 +00:00
diego f27f04a53d Revert moving closesocket definition and network headers to network.h.
This caused lots of trouble on MinGW, we need a different solution.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27504 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-31 13:59:54 +00:00
rathann 97e5f304ce Rename internal libdvdread fork from dvdread to libdvdread
to avoid clashing with external libdvdread.
(Sync with libdvdread r1122)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27498 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-30 12:22:21 +00:00
reimar fd75ca0c6a Print DVD volume ID with -identify.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27497 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-30 11:21:11 +00:00
diego c152b07e66 Move duplicated '#define closesocket close' into network.h along with
network-related #include #ifdeffery.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27496 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-29 22:55:39 +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 3af860b877 Rename HAVE_WINSOCK preprocessor condition to HAVE_WINSOCK_H.
This is what it is called in FFmpeg and more consistent with other
names for similar conditionals. This fixes a potential compilation
failure on MinGW, as described in Bugzilla #1262.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27493 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-29 20:05:08 +00:00
diego 511729a3a2 Use '#include <poll.h>' instead of '#include <sys/poll.h>'.
It is the standard location as defined by the Open Group.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27463 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-14 15:54:53 +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 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 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
reimar fb2b4dea1c Do not include sys/socket.h when using winsock2, it is pointless
and breaks compilation under MinGW.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27352 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-26 20:58:50 +00:00
reimar 6dfb85dc9e Our ALSA code needs alloca, so check for it in configure and include alloca.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27313 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-17 17:11:30 +00:00
reimar 803385a5d7 Replace S_IREAD|S_IWRITE by POSIX-compatible S_IRUSR|S_IWUSR (not exactly the same, but should not matter).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27289 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-15 17:35:52 +00:00
michael 0589f47239 Remove -std=gnu99/gnu89/default dialect linux define, as it violates the
C standard.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27282 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-15 00:21:32 +00:00
nicodvb b16d3fd6c2 in dvd streams the title part ranges from 1 to 99
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27267 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-12 08:07:54 +00:00
diego 3a0ee8a23a Add missing #include <sys/socket.h>, fixes the warnings:
stream/librtsp/rtsp.c: In function 'write_stream':
stream/librtsp/rtsp.c:68: warning: implicit declaration of function 'send'
stream/librtsp/rtsp.c: In function 'read_stream':
stream/librtsp/rtsp.c:95: warning: implicit declaration of function 'recv'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27234 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-08 08:20:39 +00:00
nicodvb efb1379f72 avoid unnecessary strdup(); patch by Aurel
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27226 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-06 18:04:14 +00:00
diego 0b2ed65981 Surround stream cache specific code by an appropriate #ifdef; fixes linking
when stream cache is disabled.
noticed by Andrea Palmatè, andrea amigasoft net


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27210 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-05 14:22:57 +00:00
diego 462fa761e5 Add some more -identify information for CDDB.
patch by Mathieu Schroeter, mathieu.schroeter gamesover ch


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27207 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-05 11:44:13 +00:00
diego dfa733c50b Add disc ID to -identify output.
patch by Mathieu Schroeter, mathieu.schroeter gamesover ch


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27206 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-05 11:39:43 +00:00
diego f3bf43f443 Rename stream_livedotcom.c to stream_live555.c, the name is used everywhere.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27199 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-04 20:14:00 +00:00
nicodvb a4b4b991dc cosmetics: in ifo_stream_oped() aligned the prototype to the style
of the rest of the file and renamed dvd_priv to spriv
(it's a stream_priv_s*, while dvd_priv is used for other
purposes in the rest of the file)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27198 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-04 16:03:57 +00:00
nicodvb 8742c266db in ifo_stream_open() propagate the device based on the dirname of stream->url; patch by Mathieu SCHROETER mathieu.schroeter gamesover ch
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27197 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-04 16:00:07 +00:00
nicodvb 7043b6d0d1 dvd_device must be handled exclusively by the option parser; it can't be changed at will in ifo_stream_open()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27196 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-04 15:57:33 +00:00
nicodvb 93b837f0a7 added support for the device part in the url; patch by
Mathieu SCHROETER mathieu.schroeter gamesover ch


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27195 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-04 15:54:45 +00:00
voroshil 6077530ac2 Try to get frame rate information through VIDIOC_G_PARM if
capture device driver (such as uvcvideo USB video driver) does
not provide VIDIOC_G_STD ioctl.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27171 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-30 17:46:27 +00:00