head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.14 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.12 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.10 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.8 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.3.0.6 pkgsrc-2009Q4-base:1.3 pkgsrc-2008Q4:1.3.0.4 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.2 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.2.0.50 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.48 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.46 pkgsrc-2008Q1:1.2.0.44 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.42 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.40 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.38 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.36 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.34 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.32 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.30 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.28 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.26 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.24 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.22 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.20 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.18 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.16 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.14 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.12 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.10 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.2.0.6 netbsd-1-6-1-base:1.2 netbsd-1-6:1.2.0.8 netbsd-1-6-RELEASE-base:1.2 pkgviews:1.2.0.4 pkgviews-base:1.2 buildlink2:1.2.0.2 buildlink2-base:1.2 netbsd-1-5-PATCH003:1.2 netbsd-1-5-PATCH001:1.2 netbsd-1-5-RELEASE:1.1.1.1 netbsd-1-4-PATCH003:1.1.1.1 netbsd-1-4-PATCH002:1.1.1.1 comdex-fall-1999:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.3 date 2008.09.16.16.07.31; author wiz; state dead; branches; next 1.2; 1.2 date 2000.10.18.11.22.44; author rh; state Exp; branches; next 1.1; 1.1 date 99.09.17.00.48.27; author hubertf; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 99.09.17.00.48.27; author hubertf; state Exp; branches; next ; desc @@ 1.3 log @Remove remaining qt1 and qt2 packages, as announced on pkgsrc-users on Sep 7 2008. No complaints received. @ text @$NetBSD: patch-ac,v 1.2 2000/10/18 11:22:44 rh Exp $ --- QtAMP.cpp.orig Fri Jul 31 22:29:58 1998 +++ QtAMP.cpp Tue Oct 17 17:48:13 2000 @@@@ -24,10 +24,12 @@@@ #include #include +#ifndef OS_NetBSD #include +#include +#endif #include #include -#include #include #include #include @@@@ -89,7 +91,11 @@@@ if ((mixer = open("/dev/mixer", O_RDWR)) < 0) die("Error opening /dev/mixer, exiting\n"); ioctl(mixer, SOUND_MIXER_READ_PCM, &v); -#endif OS_Linux +#endif + +#ifdef OS_NetBSD + audioSetMixer(); +#endif /* where mine resource file is located */ char home[500]; @@@@ -428,6 +434,13 @@@@ int x = (tv*256 + tvl); ioctl(mixer, SOUND_MIXER_WRITE_PCM, &x); #endif + +#ifdef OS_NetBSD + if (tvr == 0) + audioSetVolume(vr); + else + audioSetBalance(vr, tvr); +#endif } void QtAMP::bal_slider_moved(int bal) @@@@ -437,6 +450,10 @@@@ sprintf(volum,"Balance: %d",tvr); vol_slider_moved(vr); playLabel->setText( volum ); + +#ifdef OS_NetBSD + audioSetBalance(vr, tvr); +#endif } void QtAMP::bal_slider_released() @@@@ -1077,12 +1094,24 @@@@ int x = (tv*256 + tvl); ioctl(mixer, SOUND_MIXER_WRITE_PCM, &x); #endif + +#ifdef OS_NetBSD + int vr = 0; + audioSetVolume(vr); +#endif } if (mute == 0) { #ifdef OS_Linux int x = (7*256 + 7); ioctl(mixer, SOUND_MIXER_WRITE_PCM, &x); +#endif + +#ifdef OS_NetBSD + if (tvr == 0) + audioSetVolume(vr); + else + audioSetBalance(vr, tvr); #endif } mute=!mute; @ 1.2 log @Update xamp to 0.8.10 (from PR 11250 by Rui-Xiang Guo , the maintainer of this package). Changes are bugfixes, and use of the native NetBSD sound API instead of OSS emulation. @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Initial revision @ text @d3 3 a5 3 --- QtAMP.cpp Wed Feb 11 17:53:35 1998 +++ QtAMP.cpp Wed Jul 29 22:21:08 1998 @@@@ -24,10 +24,9 @@@@ d9 4 a12 1 -#include a15 1 +#include d19 1 a19 6 @@@@ -84,11 +84,11 @@@@ splash->show(); // init mixer -#ifdef OS_Linux +#if defined(OS_Linux) || defined(OS_NetBSD) d25 4 d32 1 a32 15 @@@@ -262,7 +262,7 @@@@ QtAMP::~QtAMP() { -#ifdef OS_Linux +#if defined(OS_Linux) || defined(OS_NetBSD) close(mixer); #endif real_quit(); @@@@ -348,7 +348,7 @@@@ sprintf(volum,"Volume: %d",vr); playLabel->setText( volum ); // printf("%d %d\n",tvr,tv); -#ifdef OS_Linux +#if defined(OS_Linux) || defined(OS_NetBSD) d36 22 a57 6 @@@@ -884,14 +884,14 @@@@ { if (mute == 1) { -#ifdef OS_Linux +#if defined(OS_Linux) || defined(OS_NetBSD) d61 5 d69 1 a69 2 -#ifdef OS_Linux +#if defined(OS_Linux) || defined(OS_NetBSD) d72 7 d80 2 @ 1.1.1.1 log @A version of amp (stands for `Audio Mpeg Player') plus a Qt GUI Submitted in PR 8424 by Rui-Xiang Guo @ text @@