Reworked from the ground up.

Basically, mpg123 assumptions about audio is broken. It assumes that
audio ioctl that change mode are instantaneous, which they are not, most
often, so that with the old model, start-up was 80 ioctl, which amounts to
~10 seconds with wss.

Added lazyness to basic audio.c so that it won't try to determine whether
we can play @ 8000Hz mono when 44100Hz stereo is what we want, and it
works...
This commit is contained in:
espie 1999-03-23 21:33:49 +00:00
parent f9e77b406b
commit d43acf86bf
3 changed files with 28 additions and 21 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.4 1999/03/05 14:26:57 brad Exp $
# $OpenBSD: Makefile,v 1.5 1999/03/23 21:33:49 espie Exp $
DISTNAME= mpg123-0.59q
CATEGORIES= audio
@ -9,6 +9,8 @@ MASTER_SITES= http://www-ti.informatik.uni-tuebingen.de/~hippm/mpg123/ \
ftp://ftp.tu-clausthal.de/pub/unix/audio/mpg123/ \
http://ftp.tu-clausthal.de/pub/unix/audio/mpg123
post-patch:
cp ${FILESDIR}/audio_openbsd.c ${WRKSRC}
.if (${MACHINE_ARCH} != "i386")
ALL_TARGET= openbsd
.else

View File

@ -1,5 +1,5 @@
--- Makefile.orig Fri Mar 5 09:15:38 1999
+++ Makefile Fri Mar 5 09:16:43 1999
--- Makefile.orig Tue Jan 26 15:35:18 1999
+++ Makefile Tue Mar 23 03:48:46 1999
@@ -34,6 +34,7 @@
@echo "make aix IBM AIX (tested: 4.2)"
@echo "make os2 IBM OS/2"
@ -8,21 +8,26 @@
@echo "make bsdos BSDI BSD/OS"
@echo "make bsdos-nas BSDI BSD/OS with NAS support"
@echo "make mint MiNT on Atari"
@@ -350,7 +351,7 @@
LIBS='-los2me -lsocket' \
mpg123.exe
-netbsd:
+openbsd netbsd:
$(MAKE) CC=cc LDFLAGS= \
OBJECTS='decode.o dct64.o audio_sun.o' \
CFLAGS='-Wall -ansi -pedantic -O3 -fomit-frame-pointer \
@@ -358,7 +359,7 @@
-DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \
@@ -364,6 +365,22 @@
CFLAGS='-Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
-funroll-all-loops -ffast-math -DROT_I386 \
-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \
+ mpg123-make
+
+openbsd:
+ $(MAKE) CC=cc LDFLAGS= \
+ OBJECTS='decode.o dct64.o audio_openbsd.o' \
+ CFLAGS='-Wall -ansi -pedantic -O3 -fomit-frame-pointer \
+ -funroll-all-loops -ffast-math \
+ -DREAL_IS_FLOAT -DUSE_MMAP -DOPENBSD' \
+ mpg123-make
+
+openbsd-i386:
+ $(MAKE) CC=cc LDFLAGS= \
+ OBJECTS='decode_i386.o dct64_i386.o getbits_.o audio_openbsd.o' \
+ CFLAGS='-Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
+ -funroll-all-loops -ffast-math -DROT_I386 \
+ -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOPENBSD' \
mpg123-make
-netbsd-i386:
+openbsd-i386 netbsd-i386:
$(MAKE) CC=cc LDFLAGS= \
OBJECTS='decode_i386.o dct64_i386.o getbits_.o audio_sun.o' \
CFLAGS='-Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
bsdos:

View File

@ -1,5 +1,5 @@
--- audio.h.orig Fri Mar 5 09:17:25 1999
+++ audio.h Fri Mar 5 09:18:01 1999
--- audio.h.orig Mon Jan 11 17:21:38 1999
+++ audio.h Tue Mar 23 01:58:01 1999
@@ -24,7 +24,7 @@
#define AUDIO_RATE_TOLERANCE 3