Commit Graph

64 Commits

Author SHA1 Message Date
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
reimar 7be3e8694b Somewhat hackish fix for A-V desync with ao_oss and frame stepping:
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
2007-07-19 19:15:59 +00:00
reimar 2a2d39f0ed Remove a disabled and completely outdated sample rate mismatch warning.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21563 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-10 00:21:35 +00:00
reynaldo 03485211a9 two variables are made static, one of them additionaly modified to const char*. Patch by Stefan Huehner, stefan AT huehner-org
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18971 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-09 03:50:47 +00:00
pacman b483d64bc0 Respect AOPLAY_FINAL_CHUNK
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18846 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-28 19:22:27 +00:00
reynaldo bf25812a43 Part1 of several printf2mp_msg changes in patch from Otvos Attila oattila AT chello DOT hu
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17995 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-30 06:40:58 +00:00
rathann e7db4ccf1a Patch by Stefan Huehner / stefan % huehner ! org \
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
2006-02-09 14:08:03 +00:00
diego 491ff4b705 -aop is long obsolete.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17059 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-28 23:43:24 +00:00
diego 56770b6eef Unify include paths, -I.. is in CFLAGS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17021 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-19 14:35:45 +00:00
albeu 1f1fc11b84 Allow setting the mixer per instance so one can fallback between
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
2005-11-10 09:02:56 +00:00
alex a1af27beb4 QUERY_FORMAT support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15899 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-03 11:38:35 +00:00
ivo 01191a8392 Have OSS audio out fall back to s16ne instead of u8 if it can't open the
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
2005-02-26 23:03:53 +00:00
reimar 9aeba3298a print "Unknown/not supported internal format" message only with -v as it
is not an error.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14610 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-29 12:58:16 +00:00
reimar 0ec7a2ca21 Use AF_FORMAT_S16_NE instead of #ifdef WORDS_BIGENDIAN ...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14405 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-06 17:35:43 +00:00
reimar 92f7267851 Check for every 24 and 32 bit AFMT_ separately if it is defined.
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
2005-01-06 13:15:53 +00:00
alex 3fe168658a more verbose messages
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14274 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-12-29 19:26:01 +00:00
alex 14a29762f2 af_fmt2str_short
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14265 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-12-28 19:11:14 +00:00
rtognimp 3fda49a8cb 100l set default format for AF_FORMATs not supported by sound card
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14261 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-12-28 01:59:12 +00:00
alex 507121f7fe removing AFMT_ dependancy
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14246 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-12-27 17:30:15 +00:00
diego 67a1fd4053 Make include paths consistent.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14124 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-12-07 02:24:15 +00:00
ivo 0f9f4caba4 mp_msg transition of unmaintained audio output drivers.
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
2004-09-18 20:31:28 +00:00
rfelker c4282b3cfe ok this one is beyond stupid. the code didn't even do what was intended
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12384 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-05-01 19:43:59 +00:00
alex 504270e549 uninit immed flag
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12146 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-06 17:55:36 +00:00
attila a4ac1dc9a4 add option to select mixer channel
patch by Catalin Muresan <catalin.muresan@astral.ro>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11838 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-01-24 11:53:52 +00:00
alex c0298b66cd Set close-on-exec after newer open (in reset func). Patch by Andriy Gapon <agapon@cv-nj.com>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10601 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-08-13 21:04:15 +00:00
alex d65c8518de 64bit libao2 fix by Jens Axboe <mplayer-dev@kernel.dk>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9634 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-03-21 16:42:50 +00:00
arpi 23015ad574 nice 10l bug, found by Balatoni Denes <pnis@coder.hu>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9142 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-28 17:25:53 +00:00
arpi a83c899996 10l
noticed by Joe Barnett <sanchezthecactus@yahoo.com>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8849 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-09 09:27:51 +00:00
arpi bd814ee879 ao_oss was not using the channel & format returned by the soundcard
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
2002-12-28 13:45:04 +00:00
rfelker 837893b654 1l, opposite meaning of what's intended!
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8305 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-28 16:15:13 +00:00
rfelker 0ca2d2a80b avoid giving a /dev/dsp fd to child processes!!
(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
2002-11-28 16:14:08 +00:00
arpi 39fe4d0cd3 verbose can be negative
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8028 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-01 17:46:45 +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 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
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
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
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
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
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
arpi c835270280 big cosmetics patch, cleanup of messages printed by mplayer and libs.
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
2002-05-20 03:25:26 +00:00
arpi a6199c8388 fix for L<->R swap with 6ch playback - based on patch by Eric Lammerts <eric@lammerts.org>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6076 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-13 20:11:51 +00:00
arpi 97506370eb nonblock open is not legal for OSS (see OSS api docs), and causes problems on freebsd (and maybe other OSs)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5908 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-04-29 20:42:15 +00:00
arpi 30d0116d16 OpenBSD, NetBSD portability patches by
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
2002-04-27 22:42:27 +00:00
arpi ceda76523a AFMT_AC3 autodetect/fallback to S16
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5791 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-04-22 22:33:06 +00:00
arpi 3027484518 non-blocking open - patch by Fredrik Kuivinen <freku045@student.liu.se>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5205 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-03-19 19:16:01 +00:00
alex e2af7e8ccb using PATH_DEV_*
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4804 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-02-22 14:20:15 +00:00
anders ee2ed8567e Moved HW dependent mixer stuff to libao and removed master switch
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4789 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-02-21 16:02:26 +00:00
arpi 163a00b4a1 hwac3 fix for cmedia 8738 by Hans-Peter Raschke <Hans-Peter.Raschke@wintermann-datenservice.de>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4185 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-01-15 22:55:28 +00:00
steve f7527242b1 limit get_space return <= MAX_OUTBURST, whilst always an exact number of fragments
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3456 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-12-11 09:23:57 +00:00
steve d18cf2ade3 fixed to check that SNDCTL_DSP_CHANNELS actually grants the requested number of channels
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3320 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-12-04 17:54:08 +00:00