head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.168 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.166 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.164 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.162 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.160 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.158 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.156 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.154 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.3.0.152 pkgsrc-2024Q1-base:1.3 pkgsrc-2023Q4:1.3.0.150 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.148 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.146 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.144 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.142 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.140 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.138 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.136 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.134 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.132 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.130 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.128 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.126 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.124 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.120 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.100 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.122 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.118 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.116 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.114 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.112 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.110 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.108 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.106 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.104 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.102 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.98 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.96 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.94 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.92 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.90 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.88 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.86 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.84 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.82 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.80 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.78 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.76 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.74 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.72 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.70 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.68 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.66 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.64 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.62 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.60 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.58 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.56 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.54 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.52 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.50 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.48 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.46 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.44 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.42 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.40 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.38 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.36 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.34 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.32 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.30 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.28 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.26 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.24 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.22 pkgsrc-2008Q1:1.3.0.20 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.18 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.16 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.14 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.12 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.10 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.8 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.6 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.4 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.2 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.2.0.12 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.10 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.8 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.6 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.4 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.2 pkgsrc-2004Q2-base:1.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.3 date 2005.12.11.23.44.40; author joerg; state Exp; branches; next 1.2; 1.2 date 2004.05.10.02.19.33; author kristerw; state Exp; branches; next 1.1; 1.1 date 2004.05.02.22.59.16; author xtraeme; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2004.05.02.22.59.16; author xtraeme; state Exp; branches; next ; desc @@ 1.3 log @Add FreeBSD and DragonFly casts for scandir. Fix lvalue casts to unbreak GCC 3.4+. @ text @$NetBSD$ --- src/pipe.cpp.orig 2003-12-08 12:20:33.000000000 +0000 +++ src/pipe.cpp @@@@ -26,6 +26,7 @@@@ Boston, MA 02111-1307, USA. #include #include +#include #include #include #include @@@@ -61,7 +62,7 @@@@ Pipe::Pipe(int size) { end=start=buffer; blocking = true; _thread_init(); - unlock(); + //unlock(); } Pipe::~Pipe() { @@@@ -118,9 +119,9 @@@@ int Pipe::read_float_intl(int samples, f } /* --- */ - (char*)start += currentBlockSize; + start = (char*)start + currentBlockSize; len -= currentBlockSize; - (char*)pp += currentBlockSize; + pp = (float *)((char*)pp + currentBlockSize); length -= currentBlockSize; if ((end!=buffer) && (start==bufferEnd)) start = buffer; @@@@ -146,8 +147,8 @@@@ int Pipe::read_float_intl(int samples, f } /* --- */ - (char*)pp += len; - (char*)start += len; + pp = (float *)((char*)pp + len); + start = (char*)start + len; length -= len; if ((end!=buffer) && (start==bufferEnd)) start = buffer; @@@@ -224,9 +225,9 @@@@ int Pipe::read_float_bidi(int samples, f } /* --- */ - (char*)start += currentBlockSize; + start = (char*)start + currentBlockSize; len -= currentBlockSize; - (char*)pp += currentBlockSize; + pp = (float **)((char*)pp + currentBlockSize); length -= currentBlockSize; if ((end!=buffer) && (start==bufferEnd)) start = buffer; @@@@ -253,8 +254,8 @@@@ int Pipe::read_float_bidi(int samples, f } /* --- */ - (char*)pp += len; - (char*)start += len; + pp = (float **)((char*)pp + len); + start = (char*)start + len; length -= len; if ((end!=buffer) && (start==bufferEnd)) start = buffer; @@@@ -309,9 +310,9 @@@@ int Pipe::mix16stereo(int samples, int32 pp[c] += (int32_t) ((IN_DATATYPE*)start)[c]; /* --- */ - (char*)start += currentBlockSize; + start = (char*)start + currentBlockSize; len -= currentBlockSize; - (char*)pp += currentBlockSize; + pp = (int32_t *)((char*)pp + currentBlockSize); length -= currentBlockSize; if ((end!=buffer) && (start==bufferEnd)) start = buffer; @@@@ -324,8 +325,8 @@@@ int Pipe::mix16stereo(int samples, int32 pp[c] += (int) ((IN_DATATYPE*)start)[c]; /* --- */ - (char*)pp += len; - (char*)start += len; + pp = (int32_t *)((char*)pp + len); + start = (char*)start + len; length -= len; if ((end!=buffer) && (start==bufferEnd)) start = buffer; @@@@ -372,17 +373,17 @@@@ int Pipe::read(int length, void *data) { /* fill */ memcpy(data, start, currentBlockSize); - (char*)start += currentBlockSize; + start = (char*)start + currentBlockSize; len -= currentBlockSize; - (char*)data += currentBlockSize; + data = (char*)data + currentBlockSize; length -= currentBlockSize; if ((end!=buffer) && (start==bufferEnd)) start = buffer; if (len) { /* short circuit */ memcpy(data, start, len); - (char*)data += len; - (char*)start += len; + data = (char*)data + len; + start = (char*)start + len; length -= len; if ((end!=buffer) && (start==bufferEnd)) start = buffer; @@@@ -418,19 +419,19 @@@@ int Pipe::write(int length, void *data) currentBlockSize=MIN(currentBlockSize, len); ::memcpy(end, data, currentBlockSize); - (char*)end += currentBlockSize; + end = (char*)end + currentBlockSize; len -= currentBlockSize; - (char*)data += currentBlockSize; + data = (char*)data + currentBlockSize; length -= currentBlockSize; if ((start!=buffer) && (end==bufferEnd)) end = buffer; if (len) { // short circuit ::memcpy(end, data, len); - (char*)data += len; - (char*)end += len; + data = (char*)data + len; + end = (char*)end + len; length -= len; if ((start!=buffer) && (end==bufferEnd)) @ 1.2 log @Add a missing #include to make this package build on NetBSD 1.6. @ text @d3 3 a5 3 --- src/pipe.cpp.orig Mon Dec 8 13:20:33 2003 +++ src/pipe.cpp Mon May 10 04:10:31 2004 @@@@ -26,6 +26,7 @@@@ d13 1 a13 1 @@@@ -61,7 +62,7 @@@@ d22 115 @ 1.1 log @Initial revision @ text @d3 11 a13 3 --- src/pipe.cpp.orig 2004-05-03 00:42:40.000000000 +0200 +++ src/pipe.cpp 2004-05-03 00:43:56.000000000 +0200 @@@@ -61,7 +61,7 @@@@ @ 1.1.1.1 log @Initial import of muse-0.9 from pkgsrc-wip. MuSE is an application for the mixing, encoding, and network streaming of sound. MuSE can simultaniously mix up to 6 encoded audio bitstreams (from files or network) plus a soundcard input signal. The resulting stream can be played locally on the sound card and/or encoded as an mp3 bitstream sent to a broadcast server. MuSE offers an intuitive interface to be operated realtime and can run in "slick" mode from commandline. @ text @@