summaryrefslogtreecommitdiffstats
path: root/libao2
Commit message (Collapse)AuthorAgeFilesLines
* ao_pcm, core: use new API in ao_pcm, change timing with itUoti Urpala2011-05-053-138/+125
| | | | | | | | | | | | | | | | | Change ao_pcm to use the new audio output driver API and clean up some of the code. Rewrite the logic controlling how playback timing works when using -ao pcm. Deprecate the "fast" suboption; its only effect now is to print a warning, but it's still accepted so that specifying it is not an error. Before, timing with -ao pcm and video enabled had two possible modes. In the default mode playback speed was rather arbitrary - not realtime, but not particularly fast. -ao pcm:fast tried to play back at maximum video playback speed - mostly succeeding, but not quite guaranteed to work in all cases. Now the default is to play at realtime speed. The -benchmark option can now be used to get faster playback (same as the video-only case). In the audio-only case playback is always maximum speed.
* ao_null: convert to new API, cleanup/rewriteUoti Urpala2011-05-051-74/+70
|
* audio output: add a new AO driver APIUoti Urpala2011-05-053-69/+169
| | | | | | | Add a new audio output driver API. The main change is the addition of a context struct where data can be kept instead of using globals. The old API remains available. This commit does not yet convert any driver to use the new API.
* cleanup: reindent audio_out.[ch]Uoti Urpala2011-05-042-65/+61
| | | | | | Reindent audio_out.c and audio_out.h. Also remove trailing '_s' from two struct names (which are not currently used anywhere) and make the audio_out_drivers[] table static.
* cleanup: avoid various GCC warningsClément Bœsch2011-04-201-1/+1
|
* ao_alsa: remove warning by simplifying error handling caseClément Bœsch2011-04-201-4/+4
| | | | | Avoid a gcc warning about potentially uninitialized variable 'err' (there was no actual problem with the code).
* audio: change external AO interface to "ao_[method](ao, ...)"Uoti Urpala2011-04-093-46/+127
| | | | | | | | Make the outside interface of audio output handling similar to the video output one. An AO object is first created, and then methods called with ao_[methodname](ao, args...). However internally libao2/ still holds all data in globals, and trying to create multiple simultaneous AO instances won't work.
* vo_dxr2, ao_dxr2: drop dxr2 supportUoti Urpala2011-01-312-225/+0
| | | | | | dxr2 support had been broken quite a while and nobody noticed. There were finally commits to fix it in the svn repo, but rather than apply those I'll just drop dxr2 support.
* ao_coreaudio: fix compilation on OS X 10.4.diego2011-01-311-0/+15
| | | | | | | | | This version is the last OS version available for certain classes of PPC Macs, but it lacks AudioDeviceIOProcID, so it has to be emulated. patch by Aaro Koskinen, aaro.koskinen iki fi git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32770 b3059339-0415-0410-9bf9-f77b7e298cf2
* ao_pcm: change message to mention "-novideo" instead of "-vc null"Uoti Urpala2010-12-081-1/+1
| | | | | | | | | -novideo is the right way to disable video, and should also work in more cases now that lavf is used as the default demuxer for more formats (like AVI; internal AVI demuxer fails with -novideo). Also change the man page description of -novideo a bit to make it sound less negative about the chances of the option working.
* cleanup: remove NULL checks before free() all over the codecboesch2010-11-144-14/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32624 b3059339-0415-0410-9bf9-f77b7e298cf2
* ao_sun: Add support for AOPLAY_FINAL_CHUNKreimar2010-11-021-3/+5
| | | | | | | | | | | Reportedly this also fixes a possible hang at the end of playback (shouldn't happen unless delay reporting is broken too). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32509 b3059339-0415-0410-9bf9-f77b7e298cf2 Reindent. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32510 b3059339-0415-0410-9bf9-f77b7e298cf2
* ao_coreaudio: byteswap AC-3 streams on little-endiandiego2010-11-021-0/+4
| | | | | | patch by Sean McGovern, gseanmcg gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32450 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_ivtv; Move ivtv_fd extern variable declaration to vo_ivtv.hdiego2010-11-021-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32159 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_v4l2: Move v4l2_fd extern declaration to vo_v4l2.hdiego2010-11-021-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32158 b3059339-0415-0410-9bf9-f77b7e298cf2
* ao_mpegpes,vo_mpegpes: Rename vo_mpegpes_fd2 variable to ao_mpegpes_fddiego2010-11-021-22/+22
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32154 b3059339-0415-0410-9bf9-f77b7e298cf2
* ao_coreaudio: fix grammar/spelling in mp_msg callsdiego2010-11-021-11/+19
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31972 b3059339-0415-0410-9bf9-f77b7e298cf2
* spelling fixessiretart2010-11-021-1/+1
| | | | | | | | | | Found by the Debian QA tool 'lintian' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31913 b3059339-0415-0410-9bf9-f77b7e298cf2 reintroduce typo in genres.h that was fixed fixed r31913 to match the id3v2 spec git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31920 b3059339-0415-0410-9bf9-f77b7e298cf2
* ao_mpegpes: Properly close file on error or uninitreimar2010-11-021-5/+11
| | | | | | | Avoids failing with "device busy" e.g. when reinitializing the ao. Fixes bug #1746. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31871 b3059339-0415-0410-9bf9-f77b7e298cf2
* ao_mpegpes.c: minor simplificationreimar2010-11-021-1/+1
| | | | | | | Avoid code duplication, use the generated file name instead of generating it twice. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31870 b3059339-0415-0410-9bf9-f77b7e298cf2
* ao_coreaudio: Improve handling of the "help" suboptionadrian2010-11-021-4/+6
| | | | | | | | | | Avoid flagging it as an error and continue intialization if it is selected. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31725 b3059339-0415-0410-9bf9-f77b7e298cf2 Reindent and align after r31725. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31726 b3059339-0415-0410-9bf9-f77b7e298cf2
* ao_coreaudio: Remove some unused variablesdiego2010-11-021-5/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31723 b3059339-0415-0410-9bf9-f77b7e298cf2
* ao_coreaudio: Process the CoreFoundation runloopadrian2010-11-021-0/+6
| | | | | | | Process it in case the vo doesn't do that, e.g. when vo_corevideo is used with shared_buffer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31717 b3059339-0415-0410-9bf9-f77b7e298cf2
* ao_coreaudio: Refactor device selectionadrian2010-11-021-22/+91
| | | | | | | | | | | Add output device selection and correctly set the default device if it's selected. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31715 b3059339-0415-0410-9bf9-f77b7e298cf2 Fix cosmetics after r31715. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31716 b3059339-0415-0410-9bf9-f77b7e298cf2
* ao_coreaudio: use same types as coreaudio APIadrian2010-11-021-3/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31714 b3059339-0415-0410-9bf9-f77b7e298cf2
* ao_coreaudio: replace deprecated functions with OSX 10.4 onesadrian2010-11-021-207/+236
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31713 b3059339-0415-0410-9bf9-f77b7e298cf2
* ao_coreaudio: Fix printf specifiersadrian2010-11-021-2/+2
| | | | | | | Fixes warnings: libao2/ao_coreaudio.c:203: warning: format '%lu' expects type 'long unsigned int', but argument n has type 'UInt32' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31712 b3059339-0415-0410-9bf9-f77b7e298cf2
* ao_pcm: Remove some disabled and pointless codereimar2010-11-021-12/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31686 b3059339-0415-0410-9bf9-f77b7e298cf2
* ao_ivtv: Add header for ivtv_write() instead of forward declaring itdiego2010-11-021-2/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31419 b3059339-0415-0410-9bf9-f77b7e298cf2
* ao_jack: increase maximum allowed channels from 6 to 8.tack2010-11-021-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31358 b3059339-0415-0410-9bf9-f77b7e298cf2
* Merge svn changes up to r31189Uoti Urpala2010-05-301-2/+4
|\
| * Change WAV header updating in ao_pcm to allow to up to almost 4GB size.reimar2010-05-211-2/+4
| | | | | | | | | | | | | | Patch by Rob McMullen [robm users sourceforge net] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31189 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30907Uoti Urpala2010-04-261-0/+1
|\|
| * Include libavutil/avutil.h for FFMINkomh2010-03-101-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30881 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Delete things related to old translation systemUoti Urpala2010-03-1016-16/+0
| | | | | | | | | | Remove the help/ subdirectory, configure code to create toplevel help_mp.h, and all the '#include "help_mp.h"' lines from .c files.
* | Merge svn changes up to r30848Uoti Urpala2010-03-101-15/+2
|\|
| * Drop support for old-style DVB code.diego2010-03-021-15/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30818 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30748Uoti Urpala2010-03-101-5/+5
|\|
| * Do not cast the results of malloc/calloc/realloc.diego2010-02-261-5/+5
| | | | | | | | | | | | | | | | 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
* | Merge svn changes up to r30732Uoti Urpala2010-03-102-45/+73
|\|
| * Mark theRenderProc() as static, it is only used within the file.diego2010-02-231-1/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30718 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Output WAVE_FORMAT_EXTENSIBLE extension in wave header when waveheadertack2010-02-221-44/+68
| | | | | | | | | | | | | | | | option is enabled (default) and channels > 2. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30708 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Mark data argument of my_ao_write() function as const.diego2010-02-221-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30706 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30694Uoti Urpala2010-03-101-2/+1
|\|
| * Add header for v4l2_write() instead of forward declaring it.diego2010-02-211-2/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30692 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Remove pointless empty lines at EOF.diego2010-02-209-24/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30675 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30663Uoti Urpala2010-03-101-3/+0
|\| | | | | | | | | | | | | Conflicts: gui/cfg.c libmpcodecs/vd_dmo.c mplayer.c
| * Remove pointless '#if 1' preprocessor directives.diego2010-02-191-3/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30654 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30643Uoti Urpala2010-03-101-1/+2
|\|
| * Mark some more functions that are not used outside of their files as static.diego2010-02-181-1/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30632 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix exit_player() usage throughout the codebase.diego2010-02-141-2/+2
| | | | | | | | | | | | | | | | | | | | 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
* | Merge svn changes up to r30557Uoti Urpala2010-03-091-2/+0
|\|
| * Remove unused variables, fixes the warnings:diego2010-02-131-2/+0
| | | | | | | | | | | | | | | | libao2/ao_mpegpes.c:336: warning: unused variable 's' libao2/ao_mpegpes.c:335: warning: unused variable 'i' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30555 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30502Uoti Urpala2010-03-091-1/+1
|\| | | | | | | | | | | | | | | Conflicts: libswscale/rgb2rgb.c libswscale/rgb2rgb.h libswscale/swscale.c libvo/x11_common.c
| * Audio buffer is too large so that it takes too long time to respond to audiokomh2010-02-041-1/+1
| | | | | | | | | | | | | | control such as software volume control. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30502 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30484Uoti Urpala2010-03-092-0/+335
|\|
| * Add OS/2 KAI audio driver supportkomh2010-02-012-0/+335
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30481 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30463Uoti Urpala2010-03-091-1/+2
|\| | | | | | | | | | | Note that r30455 is wrong, that commit does not in fact change the default behavior as claimed in the commit message. It only breaks "-af-adv force=0", which was already pretty much useless though.
| * Explain why we still disable the ALSA resampler even though it is probablyreimar2010-01-281-1/+2
| | | | | | | | | | | | | | actually working nowadays. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30452 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Restore collapsed whitespace in output messagesUoti Urpala2010-03-072-2/+2
| | | | | | | | | | | | | | | | | | For some reason commit e306174952d42e1cd6cc5efc50ae6bb0410501bc, which replaced translation macro names with the corresponding English strings, also collapsed multiple consecutive space characters into one. Change most of these back. In a couple of cases the amount of whitespace is important for alignment, and for the rest it at least keeps the strings closer to the existing translations.
* | Merge svn changes up to r30448Uoti Urpala2010-01-281-17/+6
|\|
| * Declare variable closer to where it is used.reimar2010-01-271-9/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30444 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove a useless global variable.reimar2010-01-271-5/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30443 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Do not needlessly make local variable static.reimar2010-01-271-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30442 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove useless initializers.reimar2010-01-271-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30441 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Do not needlessly use (file-)global variables.reimar2010-01-271-4/+3
| | | | | | | | | | | | | | | | Since they also were initialized to a value and non-constant (changed by ALSA) this might actually have caused bugs. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30440 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30419Uoti Urpala2010-01-251-24/+19
|\|
| * Support more formats for -ao pcm in raw mode.reimar2010-01-231-24/+19
| | | | | | | | | | | | | | Patch by Peter Fordham [peter.fordham gmail com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30400 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30301Uoti Urpala