summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorben <ben@pkgsrc.org>2004-01-01 14:03:08 +0000
committerben <ben@pkgsrc.org>2004-01-01 14:03:08 +0000
commitfebefec70fcaeb7a691a32339bbea2ac3f09b1b9 (patch)
tree74c086d3ab2fc931be21405b5168d9d06250fecb /audio
parent8d1bb24b5787a6b468811b9fee6e4c8f444f73ce (diff)
downloadpkgsrc-febefec70fcaeb7a691a32339bbea2ac3f09b1b9.tar.gz
Make xmms-meta-csound work with csound-bath as well as csound-dev.
Diffstat (limited to 'audio')
-rw-r--r--audio/xmms-meta-csound/Makefile6
-rwxr-xr-xaudio/xmms-meta-csound/files/csound.sh22
2 files changed, 20 insertions, 8 deletions
diff --git a/audio/xmms-meta-csound/Makefile b/audio/xmms-meta-csound/Makefile
index d0d91b6188d..c8340773b05 100644
--- a/audio/xmms-meta-csound/Makefile
+++ b/audio/xmms-meta-csound/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/12/24 09:53:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/01 14:03:08 ben Exp $
#
-DISTNAME= xmms-meta-csound-0.1
+DISTNAME= xmms-meta-csound-0.2
WRKSRC= ${WRKDIR}
CATEGORIES= audio
MASTER_SITES= # empty
@@ -11,7 +11,7 @@ MAINTAINER= ben@NetBSD.org
HOMEPAGE= # empty
COMMENT= XMMS meta input script for csound
-DEPENDS+= csound-dev-[0-9]*:../../audio/csound-dev
+DEPENDS+= csound-[bd]*-[0-9]*:../../audio/csound-dev
DEPENDS+= sox-[0-9]*:../../audio/sox
USE_BUILDLINK2= yes
diff --git a/audio/xmms-meta-csound/files/csound.sh b/audio/xmms-meta-csound/files/csound.sh
index 4dcebf244a6..99595056357 100755
--- a/audio/xmms-meta-csound/files/csound.sh
+++ b/audio/xmms-meta-csound/files/csound.sh
@@ -27,14 +27,26 @@ play)
fi
exit 1
fi
+ if [ -f XXXPREFIXXXX/bin/csound32 ]
+ then
+ player=XXXPREFIXXXX/bin/csound32
+ fi
+ if [ -f XXXPREFIXXXX/bin/csound ]
+ then
+ player=XXXPREFIXXXX/bin/csound
+ fi
+ if [ -z "$player" ]
+ then
+ echo "Could not find csound."
+ exit 1
+ fi
if [ $channels -eq 1 ]
then
- XXXPREFIXXXX/bin/csound32 -d -ostdout -h -s -r 44100 -k 4410 \
- "$i" 2>/dev/null | XXXPREFIXXXX/bin/sox -t raw \
- -r 44100 -s -w -c 1 - -t raw -r 44100 -s -w -c 2 -
+ $player -d -ostdout -h -s -r 44100 -k 4410 "$i" 2>/dev/null |\
+ XXXPREFIXXXX/bin/sox -t raw -r 44100 -s -w -c 1 - \
+ -t raw -r 44100 -s -w -c 2 -
else
- XXXPREFIXXXX/bin/csound32 -d -ostdout -h -s -r 44100 -k 4410 \
- "$i" 2>/dev/null
+ $player -d -ostdout -h -s -r 44100 -k 4410 "$i" 2>/dev/null
fi
if [ ! -z "$tempfile" ]
then