Commit Graph

643 Commits

Author SHA1 Message Date
reimar 2f2b271649 Sleep based on get_delay in ao_win32 uninit instead of a loop.
The loop for an unknown reason could rarely cause an endless loop.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28828 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-05 22:07:06 +00:00
reimar 8831008bb5 full_buffers and buffered_bytes must be volatile because they are used from
different threads, hopefully this fixes an uninit hang.
The code still relies on luck for thread-safety though.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28811 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-05 12:25:10 +00:00
diego 23599b030c DART audio output driver for OS/2 by KO Myung-Hun, komh chollian net
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28775 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-01 11:36:39 +00:00
reimar 0ef6b6a546 Move resetting audio_info_t samples, eof and error in ao_sun.c to reset(), avoids
duplication code from init() and fixes hangs after seeking.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28689 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-21 13:37:47 +00:00
reimar 0927ebeef7 Work around a PulseAudio bug that causes MPlayer to hang after unpausing.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28668 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-19 14:00:33 +00:00
reimar 0c6b3b8742 Set samplerate in reset also for AC3, and set it before the format in that
case (no idea why, but it is done this way in init, so it is consistent).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28640 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-17 21:08:22 +00:00
reimar 8e90297698 100l, do 0-filling on resume (to avoid desync after pause) in ao_oss only when
the we output a PCM format, not for e.g. AC3.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28614 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-16 18:38:54 +00:00
diego 390a1afef0 1) HAVE_SYS_ASOUNDLIB_H/HAVE_ALSA_ASOUNDLIB_H are defined to 0/1,
not defined/undefined, use them accordingly.
2) Add ESD definitions to avoid undefined preprocessor directives warnings.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28397 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-30 23:21:23 +00:00
diego c1cd81818a Add standard license headers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28378 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-26 15:06:44 +00:00
reimar 4b5c66af76 Replace deprecated jack_client_new with jack_client_open.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28241 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-04 11:51:11 +00:00
reimar d3825e4c8a Move several of the ao_nas int-to-string maps into .rodata
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28227 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-01 11:51:52 +00:00
reimar 6574e5da34 100l, reorder check for AC3 format to avoid a possible memleak
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28153 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-15 20:19:27 +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 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
cehoyos 22bb046adc Replace numeric constants by their defines.
Fixes icc warning #188: enumerated type mixed with another type


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27738 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-09 17:08:47 +00:00
ranma cb8c70d6c2 Fix "format '%d' expects type 'int', but argument 6 has type 'size_t'" warning.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27714 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-04 15:11:39 +00:00
ranma 68fa9667ec Make alsa resume after suspend to disk (would say 'file descriptor is in bad state' before this change)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27712 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-04 15:03:10 +00:00
diego 3311a2ae9c Replace casual GPL notices by proper license headers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27541 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-07 14:09:51 +00:00
diego 691a41a817 Replace casual GPL notice by proper license header.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27534 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-06 18:19:37 +00:00
ranma 4445a58fd3 Fix 'cast from pointer to integer of different size' on 64bit architectures. Casting to long should work for 32bit and 64bit and not make a difference to the boolean operation (since 'format' is always 32bit (int) the upper 32bit of 'arg' won't matter, but the compiler should be happy now. Casting both to unsigned makes sure the compiler isn't messing things up by sign-extending 'format' to 64bit before masking)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27482 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-24 13:52:54 +00:00
ranma 7f26ceaa54 Handle AOPLAY_FINAL_CHUNK
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27481 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-24 13:36:04 +00:00
ranma d5df440c7f fix compiler warnings
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27478 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-23 08:14:37 +00:00
diego 5a4496ca5d Work correctly with very small files where less than outburst is to be played.
patch by Tobias Diedrich, ranma tdiedrich de


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27467 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-15 17:14:53 +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 20e0b5c831 100l: Rename missed preprocessor directives from a HAVE_ prefix to CONFIG_.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27462 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-14 15:48:11 +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 473e2824cb Rename all preprocessor directives related to Apple / Mac OS X.
Switch them from a HAVE_ to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27420 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-06 07:42:26 +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 52d358e3dc Set HAVE_DVB in configure when HAVE_DVB_HEAD is defined
instead of doing in redundantly in DVB-specific files.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27401 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-02 21:39:29 +00:00
diego 429bf7a9dc cosmetics: typo fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27400 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-02 20:35:29 +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 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
corey 5eee4632d3 Add verbose messages about trying and searching for audio output drivers.
Add messages showing why a specified audio output driver failed to be used.

Based on a patch from Bryan Henderson, giraffedata [[]] gmail :: com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27123 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-22 19:25:54 +00:00
diego 92f79295d2 Use standard license header, merge changelog into license header and TODO.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26994 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-06 00:45:35 +00:00
diego bc0058c63e cosmetics: Remove pointless parentheses from return statements.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26789 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-16 09:31:55 +00:00
diego b10c35e0ed Use standard license headers with standard formatting.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26775 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-14 18:02:27 +00:00
reimar c8b5921d06 Avoid dependency on newer pulseaudio version.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26681 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-07 22:46:50 +00:00
reimar 1758d95819 Remove a comment that makes no longer sense (since quite some time actually)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26637 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-01 16:59:37 +00:00
reimar 0f5ee4b7bd Support 32 bit float and integer formats in ao_pcm.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26636 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-01 16:58:52 +00:00
reimar 71247a97b3 Add support for 32 bit format to ao_pulse.
Based on patch by James Warden [warjamy yahoo com]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26635 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-01 16:51:25 +00:00
reimar e1e2527cd4 Make ao_pulse fall back to s16le format instead of just failing.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26634 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-01 16:47:54 +00:00
diego 2bcda50ffe Merge libao2/Makefile into top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26507 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-23 09:33:51 +00:00
reimar 9623100d13 reset() should not senselessly close and reopen
the device but instead just call flush_audio()


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26345 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-07 17:39:41 +00:00
reimar 885709eadd AUDIO_DRAIN makes no sense directly after opening
the device, but it should be done in uninit.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26344 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-07 17:32:44 +00:00
diego f9da8542dd Introduce a separate definition for Mac OS X coreaudio support.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26240 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-15 08:54:21 +00:00
diego 2922e18092 Merge two #ifdefs.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26134 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-01 09:45:38 +00:00
diego a09376d67b cosmetics: reindent, detabify
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26133 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-01 09:04:00 +00:00
diego 4485a60c38 Remove duplicate extern declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26132 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-01 08:56:28 +00:00
diego 8efb2fa21c Add MPLAYER_ prefix to multiple inclusion guards.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26061 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-22 09:09:46 +00:00