summaryrefslogtreecommitdiffstats
path: root/libao2
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r29412Uoti Urpala2009-07-071-1/+11
|\
| * Add a hack to detect when we are writing into a Windows pipe since the fseekreimar2009-05-161-1/+11
| | | | | | | | | | | | | | | | | | incorrectly does not fail like it should. This ensures we will not incorrectly append the file header at the end. Based on patch by Zhou Zongyi [zhouzongyi at pset.suntec.net] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29311 b3059339-0415-0410-9bf9-f77b7e298cf2
| * whitespace cosmetics: Remove all trailing whitespace.diego2009-05-1320-196/+196
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Remove trailing whitespace from most filesUoti Urpala2009-07-0722-220/+196
| |
* | Translation system changes part 2: replace macros by stringsAmar Takhar2009-07-0714-132/+139
| | | | | | | | | | Replace all MSGTR_ macros in the source by the corresponding English string.
* | Translation system changes part 1: wrap translated stringsAmar Takhar2009-07-0714-132/+132
| | | | | | | | | | Replace mp_msg() calls which have a translated string as the format argument with mp_tmsg and add _() around all other translated strings.
* | Add OSS4 vmix volume control to ao_ossGrigori Goronzy2009-06-241-0/+29
| | | | | | | | | | | | Support for per-application volume control, introduced by OSS4. This adds a check in configure to add the proper include path to the CFLAGS, if needed. The path is taken from /etc/oss.conf.
* | Merge svn changes up to r29277Uoti Urpala2009-05-085-98/+49
|\|
| * Add missing 'void' to parameterless function declarations.diego2009-05-041-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29254 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rename macosx audio output driver to coreaudio.diego2009-05-042-10/+10
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29251 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use libavutil/fifo.h for macosx ao instead of its own FIFO implementation.reimar2009-05-031-77/+21
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29243 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify: use av_fifo_spacereimar2009-04-102-4/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29166 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Disable pause-hack from PulseAudio 0.9.15 on, it should be fixed.reimar2009-04-091-3/+3
| | | | | | | | | | | | | | | | Patch Lennart Poettering [lennart poettering net] with documentation update by me. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29160 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Split oversized of "argument" onto a separate line.reimar2009-04-091-1/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29159 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Also lock the mainloop when doing adjusting the volume for PulseAudio.reimar2009-04-091-0/+3
| | | | | | | | | | | | | | Patch by Lennart Poettering [lennart poettering net] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29158 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make sure waitop always unlocks the mainloop even if the operation could notreimar2009-04-091-1/+4
| | | | | | | | | | | | | | | | be created. Patch by Lennart Poettering [lennart poettering net] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29157 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29117Uoti Urpala2009-04-011-132/+138
|\|
| * Add forgotten "static" to new data_length variable in ao_pcmreimar2009-03-221-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29037 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Whitespace-only cosmetics: use consistent indentation in ao_pcm.creimar2009-03-221-137/+137
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29036 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Print a warning if ao_pcm wrote more data than what can be specified in thereimar2009-03-221-5/+11
| | | | | | | | | | | | | | WAV header (ca. 2GB currently) or if it can not update the header at all. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29035 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28951Uoti Urpala2009-03-143-134/+58
|\|
| * Do not call waveOutReset in uninit if you should wait till playing finishes,reimar2009-03-091-1/+2
| | | | | | | | | | | | | | and retry waveOutClose if it fails due to still playing. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28918 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Reuse libavutil fifo code instead of reimplementing it over and over.reimar2009-03-092-133/+56
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28917 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28862Uoti Urpala2009-03-0725-99/+424
|\|
| * Make audio_out_* structs const so they end up in .rodatareimar2009-03-062-24/+24
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28859 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make ao_info_t structs const.reimar2009-03-0623-23/+23
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28858 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use code that is actually thread-safe to calculate delay, free space etc. in ↵reimar2009-03-061-10/+13
| | | | | | | | | | | | ao_win32 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28857 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Cosmetics: get rid of trailing whitespace.reimar2009-03-061-23/+23
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28856 b3059339-0415-0410-9bf9-f77b7e298cf2
| * get rid of full_buffers variable, if the check it is used for is triggeredreimar2009-03-061-9/+0
| | | | | | | | | | | | | | something is seriously wrong and the ao will not work right anyway. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28855 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove now unused buf_write_pos variable from ao_win32reimar2009-03-061-4/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28854 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Always write full buffers in ao_win32, except for the last block.reimar2009-03-061-8/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28853 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use calloc instead of malloc+memsetreimar2009-03-061-3/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28852 b3059339-0415-0410-9bf9-f77b7e298cf2
| * The 8 bit per sample formats are unsigned on Windows, fixes playback withreimar2009-03-062-2/+2
| | | | | | | | | | | | | | | | -af format=s8 for -ao dsound and -ao win32. Patch by Zhou Zongyi [zhouzongyi (at) pset suntec net] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28850 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Sleep based on get_delay in ao_win32 uninit instead of a loop.reimar2009-03-051-1/+2
| | | | | | | | | | | | | | 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
| * full_buffers and buffered_bytes must be volatile because they are used fromreimar2009-03-051-2/+2
| | | | | | | | | | | | | | | | 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
| * DART audio output driver for OS/2 by KO Myung-Hun, komh chollian netdiego2009-03-012-0/+338
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28775 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28690Uoti Urpala2009-02-212-8/+27
|\|
| * Move resetting audio_info_t samples, eof and error in ao_sun.c to reset(), ↵reimar2009-02-211-8/+9
| | | | | | | | | | | | | | | | | | 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
| * Work around a PulseAudio bug that causes MPlayer to hang after unpausing.reimar2009-02-191-0/+18
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28668 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28641Uoti Urpala2009-02-181-1/+3
|\| | | | | | | | | | | | | | | Convert vo_x11_border (used in vo_gl/gl2 though the vo_gl_border macro) to use a wrapper macro in old-style VOs which do not provide a VO object argument. Before this function had an explicit global_vo argument in vo_gl/gl2. New vo_vdpau uses it too so use the same mechanism as most other functions.
| * Set samplerate in reset also for AC3, and set it before the format in thatreimar2009-02-171-0/+2
| | | | | | | | | | | | | | 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
| * 100l, do 0-filling on resume (to avoid desync after pause) in ao_oss only whenreimar2009-02-161-1/+1
| | | | | | | | | | | | | | 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
* | Merge svn changes up to r28403Uoti Urpala2009-01-3114-32/+269
|\|
| * 1) HAVE_SYS_ASOUNDLIB_H/HAVE_ALSA_ASOUNDLIB_H are defined to 0/1,diego2009-01-302-3/+4
| | | | | | | | | | | | | | | | 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
| * Add standard license headers.diego2009-01-2613-29/+265
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28378 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28310Uoti Urpala2009-01-152-10/+18
|\| | | | | | | | | | | | | | | The libdvdread4 and libdvdnav directories, which are externals in the svn repository, are at least for now not included in any form. I added configure checks to automatically disable internal libdvdread and libdvdnav if the corresponding directories are not present; if they're added manually then things work the same as in svn.
| * Replace deprecated jack_client_new with jack_client_open.reimar2009-01-041-2/+10
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28241 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move several of the ao_nas int-to-string maps into .rodatareimar2009-01-011-8/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28227 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28162Uoti Urpala2008-12-191-3/+3
|\|
| * 100l, reorder check for AC3 format to avoid a possible memleakreimar2008-12-151-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28153 b3059339-0415-0410-9bf9-f77b7e298cf2
* | ao_alsa: Sanity check get_space() return values betterUoti Urpala2008-12-101-4/+4
| | | | | | | | | | | | | | | | | | Sometimes after seek audio reset I see snd_pcm_status_get_avail() return huge values. get_space() already had a check againt the value being larger than the whole buffer; however since the unsigned value from the ALSA function had been cast to signed by that point it was interpreted as negative and the check didn't trigger. Use unsigned instead to make the check reliable and ensure the return value is sane.
* | ao_alsa: If pause loses samples replace them with silenceUoti Urpala2008-12-081-0/+13
| | | | | | | | | | | | | | If the ALSA pause functionality is not available the driver has to drop buffered samples when MPlayer calls pause(). Replace them by playing a corresponding amount of silence in resume() instead of shortening the overall audio duration.
* | Merge svn changes up to r28087Uoti Urpala2008-12-043-4/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: command.c libao2/ao_ivtv.c libao2/ao_v4l2.c libmpcodecs/dec_video.h libvo/aspect.h libvo/sub.c libvo/sub.h libvo/vo_directx.c libvo/vo_macosx.m libvo/vo_quartz.c mp_core.h mplayer.c mplayer.h osdep/getch2.h osdep/timer.h
| * Get rid of pointless 'extern' keywords.diego2008-12-033-4/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to 27824Uoti Urpala2008-10-252-6/+10
|\| | | | | | | | | | | | | | | | | | | Conflicts: cfg-common-opts.h libmpcodecs/dec_video.c libmpcodecs/vd.c libvo/x11_common.h mplayer.c stream/cache2.c
| * Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__.diego2008-10-131-1/+1
| | | | | | | | | | | | | | 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
| * Replace numeric constants by their defines.cehoyos2008-10-091-4/+4
| | | | | | | | | | | | | | 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
| * Fix "format '%d' expects type 'int', but argument 6 has type 'size_t'" warning.ranma2008-10-041-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27714 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make alsa resume after suspend to disk (would say 'file descriptor is in bad ↵ranma2008-10-041-0/+4
| | | | | | | | | | | | state' before this change) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27712 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27573Uoti Urpala2008-09-105-21/+88
|\| | | | | | | | | Conflicts: libmpcodecs/vd_ffmpeg.c
| * Replace casual GPL notices by proper license headers.diego2008-09-074-18/+69
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27541 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Replace casual GPL notice by proper license header.diego2008-09-061-3/+19
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27534 b3059339-0415