head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.48 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.46 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.44 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.42 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.3.0.40 pkgsrc-2009Q4-base:1.3 pkgsrc-2008Q4:1.3.0.38 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.36 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.34 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.32 pkgsrc-2008Q2-base:1.3 pkgsrc-2008Q1:1.3.0.30 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.28 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.26 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.24 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.22 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.20 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.18 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.16 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.14 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.12 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.10 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.8 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.6 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.4 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.2 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.2.0.4 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.2 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.1.1.1.0.10 pkgsrc-2003Q4-base:1.1.1.1 netbsd-1-6-1:1.1.1.1.0.6 netbsd-1-6-1-base:1.1.1.1 netbsd-1-6:1.1.1.1.0.8 netbsd-1-6-RELEASE-base:1.1.1.1 pkgviews:1.1.1.1.0.4 pkgviews-base:1.1.1.1 buildlink2:1.1.1.1.0.2 buildlink2-base:1.1.1.1 netbsd-1-5-PATCH003:1.1.1.1 netbsd-1-5-PATCH001:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.3 date 2004.06.24.22.54.27; author ben; state dead; branches; next 1.2; 1.2 date 2003.12.13.17.59.57; author ben; state Exp; branches; next 1.1; 1.1 date 2001.03.19.19.35.52; author wiz; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2001.03.19.19.35.52; author wiz; state Exp; branches; next ; desc @@ 1.3 log @Removing package because gmodplay is no longer maintained. For a modplug-based player, see audio/xmms-modplug. @ text @$NetBSD: patch-ae,v 1.2 2003/12/13 17:59:57 ben Exp $ --- common/modplay.cpp.orig 1998-10-05 01:29:52.000000000 -0700 +++ common/modplay.cpp @@@@ -16,6 +16,7 @@@@ #include #include #include +#include #include "stdafx.h" #include "sndfile.h" @@@@ -88,9 +89,9 @@@@ ResetPlayer(PlayerInfo * Player) } else { int val = Player->stereo?1:0; - ioctl(Player->dsp.fd, SNDCTL_DSP_POST); + ioctl(Player->dsp.fd, SNDCTL_DSP_POST, NULL); ioctl(Player->dsp.fd, SNDCTL_DSP_STEREO, &val); - ioctl(Player->dsp.fd, SNDCTL_DSP_RESET); + ioctl(Player->dsp.fd, SNDCTL_DSP_RESET, NULL); } bufsize = (TIMELEN * Player->dsp.sample_rate) / 1000; @@@@ -127,8 +128,8 @@@@ PausePlayer(PlayerInfo * Player) Player->paused = true; /* FIXME: Useless when doing a close(dsp)?? if (!Player->stopped) { - ioctl(Player->dsp.fd, SNDCTL_DSP_SYNC); - ioctl(Player->dsp.fd, SNDCTL_DSP_RESET); + ioctl(Player->dsp.fd, SNDCTL_DSP_SYNC, NULL); + ioctl(Player->dsp.fd, SNDCTL_DSP_RESET, NULL); } */ if (Player->buffer) { @@@@ -143,8 +144,8 @@@@ StopPlayer(PlayerInfo * Player) { if (Player->stopped) return 0; - ioctl(Player->dsp.fd, SNDCTL_DSP_SYNC); - ioctl(Player->dsp.fd, SNDCTL_DSP_RESET); + ioctl(Player->dsp.fd, SNDCTL_DSP_SYNC, NULL); + ioctl(Player->dsp.fd, SNDCTL_DSP_RESET, NULL); if (Player->buffer) { delete Player->buffer; Player->buffer = NULL; @@@@ -330,6 +331,14 @@@@ Help() printf(" -n, --nospectrum don't display spectrum\n"); printf(" -x disable X11 interface\n"); printf(" -v, --version output version information and exit\n"); + printf(" -s, --surround surround sound on\n"); + printf(" -o, --oversamp oversampling on\n"); + printf(" -r, --reverb reverb on\n"); + printf(" -b, --megabass megabass on\n"); + printf(" -g, --volramp gain control on\n"); + printf(" -f, --filter noise reduction on\n"); + printf(" -w, --rawdump dump to output.raw\n"); + } void @@@@ -370,11 +379,55 @@@@ ParseArgs(PlayerInfo * Player, int Count Player->updatespectro = false; continue; } + if (strcmp(Args[i], "-s") == 0 || + strcmp(Args[i], "--surround") == 0) + { + Player->surround = true; + continue; + } + if (strcmp(Args[i], "-o") == 0 || + strcmp(Args[i], "--oversamp") == 0) + { + Player->oversamp = true; + continue; + } + if (strcmp(Args[i], "-r") == 0 || + strcmp(Args[i], "--reverb") == 0) + { + Player->reverb = true; + continue; + } + if (strcmp(Args[i], "-b") == 0 || + strcmp(Args[i], "--megabass") == 0) + { + Player->megabass = true; + continue; + } + if (strcmp(Args[i], "-g") == 0 || + strcmp(Args[i], "--gain") == 0) + { + Player->nr = true; + continue; + } + if (strcmp(Args[i], "-f") == 0 || + strcmp(Args[i], "--filter") == 0) + { + Player->volramp = true; + continue; + } if (strcmp(Args[i], "-d") == 0 || strcmp(Args[i], "--device") == 0) { /* FIXME: Test if Args[i+1] starts with - */ Player->dsp.name = Args[1+i++]; continue; } + if (strcmp(Args[i], "-w") == 0 || + strcmp(Args[i], "--rawdump") == 0) + { + Player->dsp.rawdump = true; + Player->dsp.name = (char *)malloc(11); + strcpy(Player->dsp.name, "output.raw"); + continue; + } if (strcmp(Args[i], "--") == 0) { more_params = false; continue; @@@@ -413,18 +466,19 @@@@ main(int argc, char **argv) Player->dsp.name = NULL; Player->dsp.fd = -1; + Player->dsp.rawdump = false; Player->stereo = true; Player->updatespectro = true; Player->repeat = false; Player->paused = false; Player->stopped = true; - Player->surround = true; - Player->oversamp = true; - Player->reverb = true; - Player->megabass = true; - Player->nr = false; - Player->volramp = true; + Player->surround = false; + Player->oversamp = false; + Player->reverb = false; + Player->megabass = false; + Player->nr = true; + Player->volramp = false; if ((Player->playlist = CreatePlayList("default")) == NULL) { @ 1.2 log @Remove now unnecessary sys/soundcard.h -> soundcard.h change. @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Initial revision @ text @d3 3 a5 5 --- common/modplay.cpp.orig Mon Oct 5 01:29:52 1998 +++ common/modplay.cpp Sun Jan 28 14:01:34 2001 @@@@ -14,8 +14,9 @@@@ #include #include d7 1 a7 2 -#include +#include d13 1 a13 1 @@@@ -88,9 +89,9 @@@@ d25 1 a25 1 @@@@ -127,8 +128,8 @@@@ d36 1 a36 1 @@@@ -143,8 +144,8 @@@@ d47 1 a47 1 @@@@ -330,6 +331,14 @@@@ d62 1 a62 1 @@@@ -370,11 +379,55 @@@@ d118 1 a118 1 @@@@ -413,18 +466,19 @@@@ @ 1.1.1.1 log @Initial import of gmodplay, based on a package provided by Ben Collver in pkg/12071: Module player for IT, XM, S3M, MOD, MTM, STM, FAR, ULT, 669, AMS, DBM, MDL and OKT modules (on little endian machines only, for now :( ), based on modplug source code. @ text @@