head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.158 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.156 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.154 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.152 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.150 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.148 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.146 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.144 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.3.0.142 pkgsrc-2024Q1-base:1.3 pkgsrc-2023Q4:1.3.0.140 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.138 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.136 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.134 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.132 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.130 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.128 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.126 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.124 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.122 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.120 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.118 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.116 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.114 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.110 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.90 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.112 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.108 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.106 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.104 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.102 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.100 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.98 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.96 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.94 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.92 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.88 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.86 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.84 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.82 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.80 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.78 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.76 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.74 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.72 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.70 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.68 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.66 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.64 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.62 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.60 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.58 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.56 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.54 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.52 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.50 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.48 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.46 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.44 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.42 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.40 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.38 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.36 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.34 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.32 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.30 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.28 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.26 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.24 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.22 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.20 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.18 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.16 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.14 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.12 pkgsrc-2008Q1:1.3.0.10 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.8 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.6 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.4 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.2 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.2.0.16 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.14 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.12 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.10 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.8 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.6 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.4 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.2 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.1.1.1.0.18 pkgsrc-2004Q4-base:1.1.1.1 pkgsrc-2004Q3:1.1.1.1.0.16 pkgsrc-2004Q3-base:1.1.1.1 pkgsrc-2004Q2:1.1.1.1.0.14 pkgsrc-2004Q2-base:1.1.1.1 pkgsrc-2004Q1:1.1.1.1.0.12 pkgsrc-2004Q1-base:1.1.1.1 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 2007.02.16.14.54.16; author joerg; state Exp; branches; next 1.2; 1.2 date 2005.03.02.17.50.18; author rxg; state Exp; branches; next 1.1; 1.1 date 2001.02.10.14.18.35; author hubertf; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2001.02.10.14.18.35; author hubertf; state Exp; branches; next ; desc @@ 1.3 log @Fix build on DragonFly. @ text @$NetBSD$ --- cmp3volume.c.orig 2001-07-01 04:38:08.000000000 +0000 +++ cmp3volume.c @@@@ -3,8 +3,8 @@@@ */ #include "cmp3funcs.h" -#if defined(__FreeBSD__) -#include +#if defined(__NetBSD__) +#include #else #include #endif @@@@ -16,6 +16,63 @@@@ static int mixernum, * Initialize volume control * Returns: nothing ****************************************************************************/ +#if defined(__NetBSD__) + +int device_id; +mixer_ctrl_t *m, *values; + +extern void initvol() +{ + int i, ndev; + char *mixer_device; + mixer_devinfo_t dinfo, *infos; + + mixer_device = getenv("MIXERDEVICE"); + if (mixer_device == NULL) + mixer_device = "/dev/mixer0"; + + if ((mixernum=open(mixer_device, O_RDWR)) < 0) { + fprintf(stderr, "open mixer device: %s", strerror(errno)); + enditall(SIGSEGV); + } + + for (ndev = 0; ; ndev++) { + dinfo.index = ndev; + if (ioctl(mixernum, AUDIO_MIXER_DEVINFO, &dinfo) < 0) + break; + } + infos = calloc(ndev, sizeof *infos); + values = calloc(ndev, sizeof *values); + + for (i = 0; i < ndev; i++) { + infos[i].index = i; + ioctl(mixernum, AUDIO_MIXER_DEVINFO, &infos[i]); + } + + for (i = 0; i < ndev; i++) { + if (infos[i].type == AUDIO_MIXER_VALUE) { + values[i].dev = i; + values[i].type = infos[i].type; + } + if (strcmp(infos[i].label.name, AudioNdac) == 0) { + device_id = i; + break; + } + } + + values[device_id].un.value.num_channels = 2; + + m = &values[device_id]; + ioctl(mixernum, AUDIO_MIXER_READ, m); + vol = m->un.value.level[0] * 100 / AUDIO_MAX_GAIN; + mvprintw(3,COLS/2-1,"-"); + mvprintw(LINES-7,COLS/2-1,"-"); + mvprintw((LINES-8)-(vol*(LINES-12)/100),COLS/2-1,"*"); + return; +} + +#else + extern void initvol() { if ((mixernum=open("/dev/mixer", O_RDWR)) < 0) { @@@@ -30,6 +87,8 @@@@ extern void initvol() return; } +#endif + extern void endvol() { close(mixernum); @@@@ -61,6 +120,23 @@@@ extern void volclean() * Although I hate users in general, we should probably do it. * Returns: nothing ****************************************************************************/ +#if defined(__NetBSD__) + +extern void volup() +{ + mvprintw((LINES-8)-(vol*(LINES-12)/100),COLS/2-1," "); + vol += 3; + if (vol > 100) + vol = 100; + m = &values[device_id]; + ioctl(mixernum, AUDIO_MIXER_WRITE, m); + m->un.value.level[0] = m->un.value.level[1] = vol * AUDIO_MAX_GAIN / 100; + mvprintw((LINES-8)-(vol*(LINES-12)/100), COLS/2-1, "*"); + return; +} + +#else + extern void volup() { int i; @@@@ -75,10 +151,29 @@@@ extern void volup() return; } +#endif + /**************************************************************************** * It's too loud junior, turn it down! * Returns: nothing ****************************************************************************/ +#if defined(__NetBSD__) + +extern void voldown() +{ + mvprintw((LINES-8)-(vol*(LINES-12)/100),COLS/2-1," "); + vol -= 3; + if (vol < 0) + vol = 0; + m = &values[device_id]; + ioctl(mixernum, AUDIO_MIXER_WRITE, m); + m->un.value.level[0] = m->un.value.level[1] = vol * AUDIO_MAX_GAIN / 100; + mvprintw((LINES-8)-(vol*(LINES-12)/100), COLS/2-1, "*"); + return; +} + +#else + extern void voldown() { int i; @@@@ -93,4 +188,6 @@@@ extern void voldown() return; } +#endif + /* EOF */ @ 1.2 log @ Upgrade to 2.0pre6, oked by reed & wiz. @ text @d3 1 a3 1 --- cmp3volume.c.orig 2001-07-01 12:38:08.000000000 +0800 d5 3 a7 1 @@@@ -5,6 +5,8 @@@@ d9 3 a11 3 #if defined(__FreeBSD__) #include +#elif defined(__NetBSD__) d16 1 a16 1 @@@@ -16,6 +18,63 @@@@ static int mixernum, d80 1 a80 1 @@@@ -30,6 +89,8 @@@@ extern void initvol() d89 1 a89 1 @@@@ -61,6 +122,23 @@@@ extern void volclean() d113 1 a113 1 @@@@ -75,10 +153,29 @@@@ extern void volup() d143 1 a143 1 @@@@ -93,4 +190,6 @@@@ extern void voldown() @ 1.1 log @Initial revision @ text @d3 3 a5 5 --- cmp3volume.c.orig Fri Feb 9 15:54:18 2001 +++ cmp3volume.c Fri Feb 9 23:45:24 2001 @@@@ -3,7 +3,11 @@@@ */ d7 3 a9 2 -#include +#if defined(__NetBSD__) d11 4 a14 7 +#else +#include +#endif static int mixernum, /* ID number for the mixer */ vol; /* Current volume level */ @@@@ -12,6 +16,63 @@@@ d78 1 a78 1 @@@@ -26,6 +87,8 @@@@ d87 1 a87 1 @@@@ -57,6 +120,23 @@@@ d111 1 a111 1 @@@@ -71,10 +151,29 @@@@ d141 1 a141 1 @@@@ -89,4 +188,6 @@@@ a147 1 \ No newline at end of file @ 1.1.1.1 log @Add cmp3-2.0.p5: ncurses based frontend to mpg123 A simple yet featureful ncurses frontend to mpg123. Includes playlist support, volume control and tools to help with file management. Submitted by Rui-Xiang Guo in PR 12168 @ text @@