diff options
author | James FitzGibbon <jfitz@FreeBSD.org> | 1997-03-26 02:10:33 +0000 |
---|---|---|
committer | James FitzGibbon <jfitz@FreeBSD.org> | 1997-03-26 02:10:33 +0000 |
commit | 8646749b0103cdda81260ddc0e7cb0d53f351178 (patch) | |
tree | 035e4f800a7ce3530bbdf27a2510435445584cd7 /audio | |
parent | Enable xprompt. (diff) |
Import of splay v0.2, a command line MPEG and WAV player.
Reviewed by: James FitzGibbon <jfitz@FreeBSD.ORG>
Submitted by: junker@jazz.snu.ac.kr
Notes
Notes:
svn path=/head/; revision=6019
Diffstat (limited to 'audio')
-rw-r--r-- | audio/splay/Makefile | 22 | ||||
-rw-r--r-- | audio/splay/distinfo | 1 | ||||
-rw-r--r-- | audio/splay/files/patch-aa | 258 | ||||
-rw-r--r-- | audio/splay/pkg-comment | 1 | ||||
-rw-r--r-- | audio/splay/pkg-descr | 20 | ||||
-rw-r--r-- | audio/splay/pkg-plist | 2 |
6 files changed, 304 insertions, 0 deletions
diff --git a/audio/splay/Makefile b/audio/splay/Makefile new file mode 100644 index 000000000000..fc5534760709 --- /dev/null +++ b/audio/splay/Makefile @@ -0,0 +1,22 @@ +# New ports collection makefile for: splay +# Version required: 0.2 +# Date created: Mar 20 1997 +# Whom: junker@jazz.snu.ac.kr +# +# $Id$ +# + +DISTNAME= splay-0.2 +PKGNAME= splay-0.2 +CATEGORIES= audio + +MASTER_SITES= ${MASTER_SITE_SUNSITE} +MASTER_SITE_SUBDIR = apps/sound + +MAINTAINER= junker@jazz.snu.ac.kr + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/splay ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/randomplay.sh ${PREFIX}/bin + +.include <bsd.port.mk> diff --git a/audio/splay/distinfo b/audio/splay/distinfo new file mode 100644 index 000000000000..e24be81fb9ac --- /dev/null +++ b/audio/splay/distinfo @@ -0,0 +1 @@ +MD5 (splay-0.2.tar.gz) = 0fe98624ee1882f5173b8a59b62c7ea3 diff --git a/audio/splay/files/patch-aa b/audio/splay/files/patch-aa new file mode 100644 index 000000000000..9a1244a523fa --- /dev/null +++ b/audio/splay/files/patch-aa @@ -0,0 +1,258 @@ +diff -c -r ../splay-0.2-orig/Makefile ./Makefile +*** ../splay-0.2-orig/Makefile Sat Mar 15 00:00:00 1997 +--- ./Makefile Wed Mar 19 19:19:58 1997 +*************** +*** 1,4 **** +! CC = gcc + #CC = pgcc + AR = ar + +--- 1,4 ---- +! CC = cc + #CC = pgcc + AR = ar + +*************** +*** 7,14 **** + WFLAGS = -Wstrict-prototypes -Wall + OFLAGS = -O2 -m486 + #OFLAGS = -O6 -mpentium +! TFLAGS = -D_REENTRANT -DPTHREADEDMPEG +! TLIBFLAGS = -lpthread + CFLAGS = $(OFLAGS) $(WFLAGS) $(IFLAGS) $(DEBUG) $(TFLAGS) + OBJECTS = splay.o + LIBRARY = -lm $(TLIBFLAGS) \ +--- 7,14 ---- + WFLAGS = -Wstrict-prototypes -Wall + OFLAGS = -O2 -m486 + #OFLAGS = -O6 -mpentium +! TFLAGS = #-D_REENTRANT -DPTHREADEDMPEG +! TLIBFLAGS = #-lpthread + CFLAGS = $(OFLAGS) $(WFLAGS) $(IFLAGS) $(DEBUG) $(TFLAGS) + OBJECTS = splay.o + LIBRARY = -lm $(TLIBFLAGS) \ +diff -c -r ../splay-0.2-orig/bbitstream/Makefile ./bbitstream/Makefile +*** ../splay-0.2-orig/bbitstream/Makefile Sat Mar 15 00:00:00 1997 +--- ./bbitstream/Makefile Wed Mar 19 19:17:17 1997 +*************** +*** 1,7 **** +! CC = gcc + #CC = pgcc + AR = ar + RM = \rm -f + + OBJLIB = bbitstream.a + OBJECTS = input.o output.o +--- 1,8 ---- +! CC = cc + #CC = pgcc + AR = ar + RM = \rm -f ++ RANLIB = ranlib + + OBJLIB = bbitstream.a + OBJECTS = input.o output.o +*************** +*** 21,27 **** + + $(OBJLIB): $(OBJECTS) + $(RM) $(OBJLIB) +! $(AR) rcs $(OBJLIB) $(OBJECTS) + + .cc.o : + $(CC) -c $(CFLAGS) -o $*.o $< +--- 22,29 ---- + + $(OBJLIB): $(OBJECTS) + $(RM) $(OBJLIB) +! $(AR) rc $(OBJLIB) $(OBJECTS) +! $(RANLIB) $(OBJLIB) + + .cc.o : + $(CC) -c $(CFLAGS) -o $*.o $< +diff -c -r ../splay-0.2-orig/sound/Makefile ./sound/Makefile +*** ../splay-0.2-orig/sound/Makefile Sat Mar 15 00:00:00 1997 +--- ./sound/Makefile Wed Mar 19 19:18:57 1997 +*************** +*** 1,7 **** +! CC = gcc + #CC = pgcc + AR = ar + RM = \rm -f + + OBJLIB = mpegsound.a + OBJECTS = rawplayer.o wavetoraw.o \ +--- 1,8 ---- +! CC = cc + #CC = pgcc + AR = ar + RM = \rm -f ++ RANLIB = ranlib + + OBJLIB = mpegsound.a + OBJECTS = rawplayer.o wavetoraw.o \ +*************** +*** 15,29 **** + DEBUG = -g + IFLAGS = -I../bbitstream/ + AFLAGS = -malign-loops=2 -malign-jumps=2 -malign-functions=2 +! TFLAGS = -D_REENTRANT -DPTHREADEDMPEG +! TLIBFLAGS = -lpthread + OFLAGS = -O3 -fomit-frame-pointer -fno-strength-reduce -m486 $(AFLAG) + #OFLAGS = -O6 -mpentium + WFLAGS = -Wstrict-prototypes -Wall + CFLAGS = $(DEBUG) $(IFLAGS) $(OFLAGS) $(WFLAGS) $(TFLAGS) + LIBS = $(OBJLIB) -lm $(TLIBFLAGS) ../bbitstream/bbitstream.a + +! all: $(OBJLIB) test + + clean: + $(RM) *.a test *.o *~ +--- 16,30 ---- + DEBUG = -g + IFLAGS = -I../bbitstream/ + AFLAGS = -malign-loops=2 -malign-jumps=2 -malign-functions=2 +! TFLAGS = #-D_REENTRANT -DPTHREADEDMPEG +! TLIBFLAGS = #-lpthread + OFLAGS = -O3 -fomit-frame-pointer -fno-strength-reduce -m486 $(AFLAG) + #OFLAGS = -O6 -mpentium + WFLAGS = -Wstrict-prototypes -Wall + CFLAGS = $(DEBUG) $(IFLAGS) $(OFLAGS) $(WFLAGS) $(TFLAGS) + LIBS = $(OBJLIB) -lm $(TLIBFLAGS) ../bbitstream/bbitstream.a + +! all: $(OBJLIB) #test + + clean: + $(RM) *.a test *.o *~ +*************** +*** 36,42 **** + + $(OBJLIB): $(OBJECTS) + $(RM) $(OBJLIB) +! $(AR) rcs $(OBJLIB) $(OBJECTS) + + .cc.o: + $(CC) -c $(CFLAGS) -o $*.o $< +--- 37,44 ---- + + $(OBJLIB): $(OBJECTS) + $(RM) $(OBJLIB) +! $(AR) rc $(OBJLIB) $(OBJECTS) +! $(RANLIB) $(OBJLIB) + + .cc.o: + $(CC) -c $(CFLAGS) -o $*.o $< +*************** +*** 54,57 **** + + bitwindow.o : mpegsound.h bitwindow.cc + huffman.o : mpegsound.h huffman.cc +! huffmantable.o : mpegsound.h huffmantable.cc +--- 56,59 ---- + + bitwindow.o : mpegsound.h bitwindow.cc + huffman.o : mpegsound.h huffman.cc +! huffmantable.o : mpegsound.h huffmantable.cc +diff -c -r ../splay-0.2-orig/sound/mpegsound.h ./sound/mpegsound.h +*** ../splay-0.2-orig/sound/mpegsound.h Sat Mar 15 00:00:00 1997 +--- ./sound/mpegsound.h Wed Mar 19 20:02:22 1997 +*************** +*** 11,17 **** + /* Inlcude default library packages */ + /************************************/ + #include <stdio.h> +! #include <malloc.h> + #include <unistd.h> + + #ifdef PTHREADEDMPEG +--- 11,17 ---- + /* Inlcude default library packages */ + /************************************/ + #include <stdio.h> +! #include <stdlib.h> + #include <unistd.h> + + #ifdef PTHREADEDMPEG +diff -c -r ../splay-0.2-orig/sound/rawplayer.cc ./sound/rawplayer.cc +*** ../splay-0.2-orig/sound/rawplayer.cc Sat Mar 15 00:00:00 1997 +--- ./sound/rawplayer.cc Wed Mar 19 19:16:56 1997 +*************** +*** 8,14 **** + + #include <fcntl.h> + #include <sys/ioctl.h> +! #include <sys/soundcard.h> + + #include "mpegsound.h" + +--- 8,14 ---- + + #include <fcntl.h> + #include <sys/ioctl.h> +! #include <machine/soundcard.h> + + #include "mpegsound.h" + +diff -c -r ../splay-0.2-orig/sound/test.cc ./sound/test.cc +*** ../splay-0.2-orig/sound/test.cc Sat Mar 15 00:00:00 1997 +--- ./sound/test.cc Wed Mar 19 19:18:03 1997 +*************** +*** 2,8 **** + + #include <stdio.h> + #include <string.h> +! #include <getopt.h> + #include <unistd.h> + + #include "mpegsound.h" +--- 2,8 ---- + + #include <stdio.h> + #include <string.h> +! //#include <getopt.h> + #include <unistd.h> + + #include "mpegsound.h" +diff -c -r ../splay-0.2-orig/sound/wavetoraw.cc ./sound/wavetoraw.cc +*** ../splay-0.2-orig/sound/wavetoraw.cc Sat Mar 15 00:00:00 1997 +--- ./sound/wavetoraw.cc Wed Mar 19 20:02:48 1997 +*************** +*** 5,11 **** + // Wavetoraw.cc + // Server which strips wave header. + +! #include <malloc.h> + + #include "mpegsound.h" + +--- 5,11 ---- + // Wavetoraw.cc + // Server which strips wave header. + +! #include <stdlib.h> + + #include "mpegsound.h" + +diff -c -r ../splay-0.2-orig/splay.cc ./splay.cc +*** ../splay-0.2-orig/splay.cc Sat Mar 15 00:00:00 1997 +--- ./splay.cc Wed Mar 19 19:20:52 1997 +*************** +*** 42,47 **** +--- 42,48 ---- + return; + } + ++ #ifdef PTHREADEDMPEG + void playingthread(Mpegfileplayer *player) + { + if(player->geterrorcode()>0)error(player->geterrorcode()); +*************** +*** 52,57 **** +--- 53,59 ---- + if(player->geterrorcode()>0)error(player->geterrorcode()); + } + } ++ #endif + + void playing(Fileplayer *player) + { diff --git a/audio/splay/pkg-comment b/audio/splay/pkg-comment new file mode 100644 index 000000000000..9e382a133878 --- /dev/null +++ b/audio/splay/pkg-comment @@ -0,0 +1 @@ +An audio player/decoder that decodes MPEG Layer I,II,II and WAV files. diff --git a/audio/splay/pkg-descr b/audio/splay/pkg-descr new file mode 100644 index 000000000000..8d6cbbe91cef --- /dev/null +++ b/audio/splay/pkg-descr @@ -0,0 +1,20 @@ +The splay program uses the MPEG/Wave Sound library to play sound files in +several formats, notably the MPEG audio and Wave format. This early version +has only limited functionally and a simplistic user interface. For the moment, +only Intel pc's running Linux are supported. + +This program have NO WARRANTY. + +Now, threaded playing and 'Force to mono' are implemented. +And implemented poor shuffle play. + +Bug report + jwj95@eve.kaist.ac.kr + jwj95@nownuri.net + +THANKS FOR this document + Tommy Thorn + +-- +From FreeBSD porter: + * This version of splay was not compiled with pthread library. diff --git a/audio/splay/pkg-plist b/audio/splay/pkg-plist new file mode 100644 index 000000000000..f4379cd6a3d4 --- /dev/null +++ b/audio/splay/pkg-plist @@ -0,0 +1,2 @@ +bin/splay +bin/randomplay.sh |