Commit Graph

238 Commits

Author SHA1 Message Date
arpi 033d4f505a Fixes:
- missing check in init
- missing brackets causing failure
- nas_aformat_to_auformat not working properly
- fix hang that was finally reproducible with high disk activity
- don't cut of audio on uninit(), wait for buffer to empty

It also simplifies the event_handler, making it more readable and
implements Sidik Isani's suggestion to make the buffer size dependent on
bytes per second. I've been using it for two days and found no further
problems.

patch by Tobias Diedrich <td@sim.uni-hannover.de>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7733 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-13 22:00:15 +00:00
jkeil e567bb25ae Fix for audio filters on big endian cpus. It's working now on Solaris SPARC &
x86


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7720 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-12 20:02:01 +00:00
jkeil a8b287fead - ao_data.bps not set, confuses the A-V sync computation when the audio filters
are in use.

- computation in get_delay() was returning bogus values


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7715 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-11 21:22:55 +00:00
rfelker 6f6342a4b0 remove nonsense warnings now that libaf is used
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7669 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-08 22:41:45 +00:00
arpi e89f059882 fill ao_data correctly
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7661 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-07 20:01:28 +00:00
arpi 9e3911b77d updated for libaf...
please someone verify this, i'm not sure it's ok, looks weird:
    alsa_format.voices = ao_data.channels*2;


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7660 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-07 19:56:26 +00:00
arpi 24d0b8f5e1 updated for libaf rules
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7659 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-07 19:51:00 +00:00
arpi f12673921c fixed ao_data.bps - patch by Tobias Diedrich <td@sim.uni-hannover.de>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7658 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-07 19:21:35 +00:00
jkeil 34b4b61bea Handle playback of sample rates not supported by the sun audio hardware.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7657 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-07 18:42:31 +00:00
arpi 80727bf898 libaf compliance (ao_data) fix by Tobias Diedrich <td@sim.uni-hannover.de>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7647 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-07 01:50:49 +00:00
arpi 1b28b8a9c7 DPRINTF -> mp_msg()
patch by Tobias Diedrich <td@sim.uni-hannover.de>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7628 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-06 17:31:36 +00:00
arpi 6ca9809c9e Small error, the buffer size got set incorrectly.
(Now BUFFER_SIZE * 3 instead of BUFFER_SIZE * 2)
patch by Tobias Diedrich <td@sim.uni-hannover.de>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7627 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-06 17:30:38 +00:00
arpi 0ab47ea363 10l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7610 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-06 01:08:04 +00:00
arpi 4defc3ee59 - init fails if no -vo mpegpes
- do not fail if unsupported samplerate, instead force resample to 48khz


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7608 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-06 00:22:32 +00:00
arpi 1acee84acd audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7564 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-29 22:57:54 +00:00
anders 49696a0864 Correction of spelling errors and removal of old code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7508 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-26 10:12:50 +00:00
arpi d483a015a2 tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7473 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-22 02:33:28 +00:00
arpi 8680f58f89 "One can cause a permanent hang on a seek, and the other just causes
general jerkiness because the writer thread was holding a lock
  during the time it was writing to the network."
patch by Sidik Isani <lksi@cfht.hawaii.edu>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7450 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-20 18:26:54 +00:00
arpi 86349f9208 *bsd doesn't have info.output_muted - patch by Björn Sandell <biorn@dce.chalmers.se>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7423 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-16 19:46:02 +00:00
jkeil a019c0dd3d Reconstruct the muting state for the playback from a l/r volume of 0.0.
This way the sound card is really silent, when the mute state is toggled in
gmplayer.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7380 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-12 16:59:11 +00:00
jkeil dbe6de1995 - gui version of mplayer is using the audio 'control' function before(!) the
audio-out module is initialized.  As a workaround, initialize the audio
  device pathnames in the control function, otherwise the mixer does not work
  in gmplayer.

- gui: Add support for left/right balance to the sun audio driver


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7379 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-12 12:56:05 +00:00
alex 1d057df47f added needed errno.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7165 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-30 13:34:08 +00:00
alex baab7aa3fd mp_msg'ized
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7162 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-30 11:20:51 +00:00
alex cad4462de5 release /dev/dsp on pause patch by Eric Lammerts <eric@lammerts.org> (and D Richard Felker III <dalias@aerifal.cx>)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7119 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-28 19:37:13 +00:00
joyping 325311af33 iec958-init completly rewritten
some debug printfs cleaned


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7078 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-23 13:03:00 +00:00
anders 2a9ec68ddc Fixed *= bug in length calculation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7076 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-23 01:41:12 +00:00
joyping 89ed1748ae changed spdif default from "hw:0,2" to general alias "iec958"
based on a patch by Benedikt Hunz <hunz@hunz.org>
corrected typo in ugly spdif-warning message
added 32/20bit modes for 'high-end'-soundcards
disabled hw-mixer-access for big-endian machines
(mplayer seems to screw up hw-mixer on LinuxPPC running ALSA
needs more testing, but its safer to disable it for now.)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7051 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-20 14:15:25 +00:00
arpi c30e50123a HPUX porting fixes - patch by Gansser, Martin <MGansser@rand.de>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6957 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-09 21:30:21 +00:00
arpi c750b8ab2d -vc null is better than -hardframedrop -- hint by gabor <gabor@realtime.sk>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6942 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-06 20:31:48 +00:00
arpi 4c10cccd82 format incompatibility warning
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6900 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-04 18:33:26 +00:00
rfelker 0b4294fe82 no need for ioctl.h if not using dvb
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6857 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-07-31 05:25:57 +00:00
pontscho e1ef3196ec fix (?) equalizer distortion problem
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6840 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-07-30 11:48:18 +00:00
atmos4 000819f4fe Improved ao_arts delay and buff er handling, patch by Szombathelyi Gy|rgy <gyurco@freemail.hu>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6808 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-07-26 00:02:31 +00:00
pontscho dde3c15266 - add some control (ao_oss, pl_extrastereo)
- cosmetic


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6796 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-07-25 20:28:47 +00:00
arpi 8b9de50aff endianess fix by Colin Leroy <colin@colino.net>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6763 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-07-21 12:13:40 +00:00
joyping 5bafd479ae added real mmap support
support for -abs opt, 4 different modes


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6750 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-07-18 16:09:54 +00:00
joyping 51b5404658 fixed spdif
spdif device depends now on the given subdevice
was hardcoded to hw:0,2 before
fixed opt-parsing for hw:x,y like opts
seperated initialization of spdif from common init as it was
probably intended before


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6703 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-07-11 10:20:54 +00:00
joyping a678a1018a cVS: ---------------------------------------------------------------------
added get/set_sound controls
stripped down initializing
changed play() again
outsourced xrun-handling
added some cases to get_space() as xrun-handling
added nonblock-mode
added mmap-mode
added subopts for mmap and noblock called mmap and noblock
could be accessed as -ao alsa9:noblock:mmap


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6634 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-07-03 21:43:28 +00:00
atmos4 ed856102c6 Patch to improve bufferhandling on OpenBSD and NetBSD, by Björn Sandell and Bernd Ernesti <mplayer at lists.veego.de>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6631 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-07-03 21:17:31 +00:00
alex 4f40ec312c cleanup and bufferhandling fix by Joy Ping <joy at pingfm.org>. Bufferhandling fix based on idea by Marius David <marius at rohost.com>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6590 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-06-28 16:48:10 +00:00
alex e9cf7c083b more informal warning and also fixed a 10l bug. Patch by tibcu
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6589 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-06-28 16:42:32 +00:00
albeu 3a376cd09c Allow writing to pipe.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6502 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-06-22 12:10:02 +00:00
atmos4 a5737c25ee Fixed lround replacement, hopefully fast enough.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6440 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-06-16 01:44:33 +00:00
atmos4 29043c589c Remove unportable lround and maybe speed up rounding a bit.
Anders: please check if this is correct.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6438 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-06-15 23:31:58 +00:00
anders ee6efd29d9 Adding equalizer plugin
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6431 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-06-15 06:15:07 +00:00
anders dc1a616150 Applying patch from Eric that fixes 6ch resampling
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6373 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-06-10 12:10:52 +00:00
arpi 89e9c29aff warning & newline fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6336 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-06-07 22:43:29 +00:00
arpi 954e9892f2 disables those plugins that can't handle the audio format.
it also fixes a bug(and i'm pretty sure this _is_ a bug) where, when playing
multiple files, after the first file only the first audio plugin is used.

patch by Christian Ohm <chr.ohm@gmx.net>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6320 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-06-07 00:30:32 +00:00
arpi f1748e040e msg/i18n fixes and some printf->mp_msg
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6297 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-06-03 23:23:03 +00:00
pl e045dc53b4 warning fixes (string.h is required for memset)
moved config.h at the top of the include (often avoids 10L when adding a
  new #include ;)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6238 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-30 11:53:51 +00:00