summaryrefslogtreecommitdiffstats
path: root/libao2/ao_oss.c
Commit message (Collapse)AuthorAgeFilesLines
* audio: Remove fixed decode_audio() return size limit (MAX_OUTBURST)Uoti Urpala2009-12-291-2/+0
| | | | | | | | | | | | A couple of months ago MPlayer's ALSA driver started rounding the amount of input data it was willing to accept in one call down to an integer multiple of the value it set in ao_data.outburst. In some configurations it was possible for this value to exceed the 64 KiB limit on the amount MPlayer was willing to write in a single call to the AO. As a result ao_alsa accepted 0 bytes in each play() call and audio playback failed. Fix this by removing the fixed 64 KiB limit on the amount of audio sent to AO at once; the limit was mostly a remnant of older code anyway.
* Merge svn changes up to r29752Uoti Urpala2009-10-061-1/+12
|\ | | | | | | | | | | | | | | | | As part of merging subtitle-in-terminal changes make update_subtitles() only clear existing subtitles if called with the reset argument, and not try to set new ones. Later calls should set the needed new subtitles, and this change avoids some problems with trying to set subtitles when mp_property_sub() in command.c gets called from initialization code before full initialization.
| * fix calculation of ao_data.bps for sample formats with more than 16 bitscladisch2009-10-051-1/+12
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29750 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29455Uoti Urpala2009-07-291-23/+5
|\|
| * Replace WORDS_BIGENDIAN by HAVE_BIGENDIAN in all internal code.diego2009-07-261-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29443 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use the correct OSS format, where possible, for mplayer's packed 24-bitcladisch2009-07-241-22/+4
| | | | | | | | | | | | format (AFMT_x24_xE would be 32-bit aligned). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29438 b3059339-0415-0410-9bf9-f77b7e298cf2
| * whitespace cosmetics: Remove all trailing whitespace.diego2009-05-131-9/+9
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Remove trailing whitespace from most filesUoti Urpala2009-07-071-9/+9
| |
* | Translation system changes part 2: replace macros by stringsAmar Takhar2009-07-071-12/+12
| | | | | | | | | | Replace all MSGTR_ macros in the source by the corresponding English string.
* | Translation system changes part 1: wrap translated stringsAmar Takhar2009-07-071-12/+12
| | | | | | | | | | 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.
* Make ao_info_t structs const.reimar2009-03-061-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28858 b3059339-0415-0410-9bf9-f77b7e298cf2
* 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
* Add standard license headers.diego2009-01-261-0/+20
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28378 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix 'cast from pointer to integer of different size' on 64bit architectures. ↵ranma2008-08-241-1/+1
| | | | | | 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
* Somewhat hackish fix for A-V desync with ao_oss and frame stepping:reimar2007-07-191-0/+9
| | | | | | | send 0-samples according to the amount of data lost during pause. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23829 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove a disabled and completely outdated sample rate mismatch warning.reimar2006-12-101-4/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21563 b3059339-0415-0410-9bf9-f77b7e298cf2
* two variables are made static, one of them additionaly modified to const ↵reynaldo2006-07-091-2/+2
| | | | | | char*. Patch by Stefan Huehner, stefan AT huehner-org git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18971 b3059339-0415-0410-9bf9-f77b7e298cf2
* Respect AOPLAY_FINAL_CHUNKpacman2006-06-281-2/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18846 b3059339-0415-0410-9bf9-f77b7e298cf2
* Part1 of several printf2mp_msg changes in patch from Otvos Attila oattila AT ↵reynaldo2006-03-301-1/+1
| | | | | | chello DOT hu git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17995 b3059339-0415-0410-9bf9-f77b7e298cf2
* Patch by Stefan Huehner / stefan % huehner ! org \rathann2006-02-091-5/+5
| | | | | | | | | | | | | | | | | | | | | | patch replaces '()' for the correct '(void)' in function declarations/prototypes which have no parameters. The '()' syntax tell thats there is a variable list of arguments, so that the compiler cannot check this. The extra CFLAG '-Wstrict-declarations' shows those cases. Comments about a similar patch applied to ffmpeg: That in C++ these mean the same, but in ANSI C the semantics are different; function() is an (obsolete) K&R C style forward declaration, it basically means that the function can have any number and any types of parameters, effectively completely preventing the compiler from doing any sort of type checking. -- Erik Slagter Defining functions with unspecified arguments is allowed but bad. With arguments unspecified the compiler can't report an error/warning if the function is called with incorrect arguments. -- Måns Rullgård git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17567 b3059339-0415-0410-9bf9-f77b7e298cf2
* -aop is long obsolete.diego2005-11-281-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17059 b3059339-0415-0410-9bf9-f77b7e298cf2
* Unify include paths, -I.. is in CFLAGS.diego2005-11-191-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17021 b3059339-0415-0410-9bf9-f77b7e298cf2
* Allow setting the mixer per instance so one can fallback betweenalbeu2005-11-101-11/+25
| | | | | | | | | several oos device and still have correct mixer settings all the time. The sytax is now: oss[:dsp_device[:mixer_device[:mixer_channel]]] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16960 b3059339-0415-0410-9bf9-f77b7e298cf2
* QUERY_FORMAT supportalex2005-07-031-1/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15899 b3059339-0415-0410-9bf9-f77b7e298cf2
* Have OSS audio out fall back to s16ne instead of u8 if it can't open theivo2005-02-261-2/+3
| | | | | | | soundcard for 3+ channels and do it for all audio streams (not only AC3). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14835 b3059339-0415-0410-9bf9-f77b7e298cf2
* print "Unknown/not supported internal format" message only with -v as itreimar2005-01-291-1/+1
| | | | | | | is not an error. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14610 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use AF_FORMAT_S16_NE instead of #ifdef WORDS_BIGENDIAN ...reimar2005-01-061-7/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14405 b3059339-0415-0410-9bf9-f77b7e298cf2
* Check for every 24 and 32 bit AFMT_ separately if it is defined.reimar2005-01-061-4/+28
| | | | | | | Patch by Walter Haidinger walter dot haidinger at gmx dot at git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14398 b3059339-0415-0410-9bf9-f77b7e298cf2
* more verbose messagesalex2004-12-291-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14274 b3059339-0415-0410-9bf9-f77b7e298cf2
* af_fmt2str_shortalex2004-12-281-4/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14265 b3059339-0415-0410-9bf9-f77b7e298cf2
* 100l set default format for AF_FORMATs not supported by sound cardrtognimp2004-12-281-3/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14261 b3059339-0415-0410-9bf9-f77b7e298cf2
* removing AFMT_ dependancyalex2004-12-271-17/+114
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14246 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make include paths consistent.diego2004-12-071-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14124 b3059339-0415-0410-9bf9-f77b7e298cf2
* mp_msg transition of unmaintained audio output drivers.ivo2004-09-181-12/+12
| | | | | | | Patch by Reynaldo H. Verdejo Pinochet <reynaldo at opendot dot cl> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13384 b3059339-0415-0410-9bf9-f77b7e298cf2
* ok this one is beyond stupid. the code didn't even do what was intendedrfelker2004-05-011-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12384 b3059339-0415-0410-9bf9-f77b7e298cf2
* uninit immed flagalex2004-04-061-4/+10
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12146 b3059339-0415-0410-9bf9-f77b7e298cf2
* add option to select mixer channelattila2004-01-241-3/+36
| | | | | | | patch by Catalin Muresan <catalin.muresan@astral.ro> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11838 b3059339-0415-0410-9bf9-f77b7e298cf2
* Set close-on-exec after newer open (in reset func). Patch by Andriy Gapon ↵alex2003-08-131-0/+4
| | | | | | <agapon@cv-nj.com> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10601 b3059339-0415-0410-9bf9-f77b7e298cf2
* 64bit libao2 fix by Jens Axboe <mplayer-dev@kernel.dk>alex2003-03-211-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9634 b3059339-0415-0410-9bf9-f77b7e298cf2
* nice 10l bug, found by Balatoni Denes <pnis@coder.hu>arpi2003-01-281-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9142 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10larpi2003-01-091-2/+1
| | | | | | | noticed by Joe Barnett <sanchezthecactus@yahoo.com> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8849 b3059339-0415-0410-9bf9-f77b7e298cf2
* ao_oss was not using the channel & format returned by the soundcardarpi2002-12-281-5/+5
| | | | | | | | | | for ao_data.bps calcualtion - hence fscked up av sync if soundcard didn't support a number of channels or audio format. patch by Balatoni Denes <pnis@coder.hu> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8604 b3059339-0415-0410-9bf9-f77b7e298cf2
* 1l, opposite meaning of what's intended!rfelker2002-11-281-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8305 b3059339-0415-0410-9bf9-f77b7e298cf2
* avoid giving a /dev/dsp fd to child processes!!rfelker2002-11-281-0/+4
| | | | | | | | (menu exec, xscreensaver nonsense, etc) other parts of mplayer should be fixed like this as well! git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8304 b3059339-0415-0410-9bf9-f77b7e298cf2
* verbose can be negativearpi2002-11-011-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8028 b3059339-0415-0410-9bf9-f77b7e298cf2
* remove nonsense warnings now that libaf is usedrfelker2002-10-081-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7669 b3059339-0415-0410-9bf9-f77b7e298cf2
* tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bugarpi2002-09-221-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7473 b3059339-0415-0410-9bf9-f77b7e298cf2
* release /dev/dsp on pause patch by Eric Lammerts <eric@lammerts.org> (and D ↵alex2002-08-281-2/+4
| | | | | | Richard Felker III <dalias@aerifal.cx>) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7119 b3059339-0415-0410-9bf9-f77b7e298cf2
* format incompatibility warningarpi2002-08-041-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6900 b3059339-0415-0410-9bf9-f77b7e298cf2
* - add some control (ao_oss, pl_extrastereo)pontscho2002-07-251-0/+3
| | | | | | | - cosmetic git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6796 b3059339-0415-0410-9bf9-f77b7e298cf2
* more informal warning and also fixed a 10l bug. Patch by tibcualex2002-06-281-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6589 b3059339-0415-0410-9bf9-f77b7e298cf2
* msg/i18n fixes and some printf->mp_msgarpi2002-06-031-24/+20
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6297 b3059339-0415-0410-9bf9-f77b7e298cf2
* big cosmetics patch, cleanup of messages printed by mplayer and libs.arpi2002-05-201-2/+3
| | | | | | | | some printf->mp_msg conversion, and some debug messages moved from warn/info to v/dbg2 mplayer's output is now shorter, readable and consistent git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6139 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix for L<->R swap with 6ch playback - based on patch by Eric Lammerts ↵arpi2002-05-131-1/+4
| | | | | | <eric@lammerts.org> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6076 b3059339-0415-0410-9bf9-f77b7e298cf2
* nonblock open is not legal for OSS (see OSS api docs), and causes problems ↵arpi2002-04-291-0/+11
| | | | | | on freebsd (and maybe other OSs) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5908 b3059339-0415-0410-9bf9-f77b7e298cf2
* OpenBSD, NetBSD portability patches byarpi2002-04-271-0/+2
| | | | | | | | | Björn Sandell <biorn@dce.chalmers.se> Marcus <core@antbear.org> Bernd Ernesti <mplayer@lists.veego.de> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5873 b3059339-0415-0410-9bf9-f77b7e298cf2
* AFMT_AC3 autodetect/fallback to S16arpi2002-04-221-5/+11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5791 b3059339-0415-0410-9bf9-f77b7e298cf2
* non-blocking open - patch by Fredrik Kuivinen <freku045@student.liu.se>arpi2002-03-191-5/+13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5205 b3059339-0415-0410-9bf9-f77b7e298cf2
* using PATH_DEV_*alex2002-02-221-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4804 b3059339-0415-0410-9bf9-f77b7e298cf2
* Moved HW dependent mixer stuff to libao and removed master switchanders2002-02-211-22/+17
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4789 b3059339-0415-0410-9bf9-f77b7e298cf2
* hwac3 fix for cmedia 8738 by Hans-Peter Raschke ↵arpi2002-01-151-0/+5
| | | | | | <Hans-Peter.Raschke@wintermann-datenservice.de> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4185 b3059339-0415-0410-9bf9-f77b7e298cf2
* limit get_space return <= MAX_OUTBURST, whilst always an exact number of ↵steve2001-12-111-1/+4
| | | | | | fragments git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3456 b3059339-0415-0410-9bf9-f77b7e298cf2
* fixed to check that SNDCTL_DSP_CHANNELS actually grants the requested number ↵steve2001-12-041-3/+4
| | | | | | of channels git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3320 b3059339-0415-0410-9bf9-f77b7e298cf2
* Extended oss output driver and libac3 to support 4 and 6 channel output ↵steve2001-11-281-15/+31
| | | | | | mixes. added -channels command line option git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3182 b3059339-0415-0410-9bf9-f77b7e298cf2
* Audio delay bugfixanders2001-11-261-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3138 b3059339-0415-0410-9bf9-f77b7e298cf2
* interface to libao2 changed ao_plugin addedanders2001-11-241-44/+43
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3096 b3059339-0415-0410-9bf9-f77b7e298cf2
* gcc3 warning fixedarpi2001-10-041-3/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2081 b3059339-0415-0410-9bf9-f77b7e298cf2
* AFMT_AC3 fixedarpi2001-08-151-2/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1533 b3059339-0415-0410-9bf9-f77b7e298cf2
* ac3/spdif patch by German Gomez Garcia <german@piraos.com>arpi2001-08-151-1/+11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1529 b3059339-0415-0410-9bf9-f77b7e298cf2
* printfs cleanup - moved to higher -v level or moved to stderrarpi2001-08-061-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1457 b3059339-0415-0410-9bf9-f77b7e298cf2
* ao_subdevice supportal3x2001-06-211