From f6c57ac8a8f5840658ef939d45290cd862aff5a5 Mon Sep 17 00:00:00 2001 From: darkeye Date: Sun, 15 Feb 2004 12:25:14 +0000 Subject: [PATCH] removed _X and _Y symbols from aflibConverter files, which caused a naming collision on Solaris --- darkice/trunk/AUTHORS | 1 + darkice/trunk/ChangeLog | 3 ++ darkice/trunk/man/darkice.1 | 5 ++- darkice/trunk/src/aflibConverter.cc | 50 ++++++++++++++--------------- darkice/trunk/src/aflibConverter.h | 4 +-- 5 files changed, 35 insertions(+), 28 deletions(-) diff --git a/darkice/trunk/AUTHORS b/darkice/trunk/AUTHORS index 015cfcb..06013b1 100644 --- a/darkice/trunk/AUTHORS +++ b/darkice/trunk/AUTHORS @@ -19,4 +19,5 @@ with contributions by: John Hay Christian Forster John Deeny + Robert Lunnon diff --git a/darkice/trunk/ChangeLog b/darkice/trunk/ChangeLog index 55fde6a..0189962 100644 --- a/darkice/trunk/ChangeLog +++ b/darkice/trunk/ChangeLog @@ -5,6 +5,9 @@ DarkIce next release o added fix to enable downsampling from stereo to mono of mp3 streams when streaming to an icecast2 server. thanks to John Deeny + o removed _X and _Y symbols from aflibConverter files, which caused + a naming collision on Solaris. thanks to Robert Lunnon, + 07-01-2004: DarkIce 0.13.2 released diff --git a/darkice/trunk/man/darkice.1 b/darkice/trunk/man/darkice.1 index c65d13b..3c0d5db 100644 --- a/darkice/trunk/man/darkice.1 +++ b/darkice/trunk/man/darkice.1 @@ -1,4 +1,4 @@ -.TH darkice 1 "January 7, 2004" "DarkIce" "DarkIce live audio streamer" +.TH darkice 1 "February 15, 2004" "DarkIce" "DarkIce live audio streamer" .SH NAME darkice \- an icecast / shoutcast live audio streamer .SH SYNOPSIS @@ -85,6 +85,9 @@ Developed with contributions by Atsuhiko Yamanaka Ricardo Galli John Hay + Christian Forster + John Deeny + Robert Lunnon .SH LINKS Project homepage: diff --git a/darkice/trunk/src/aflibConverter.cc b/darkice/trunk/src/aflibConverter.cc index 5a2eb12..27ca8e4 100644 --- a/darkice/trunk/src/aflibConverter.cc +++ b/darkice/trunk/src/aflibConverter.cc @@ -123,8 +123,8 @@ aflibConverter::aflibConverter( largeFilter = high_quality; linearInterp = linear_interpolation; - _X = NULL; - _Y = NULL; + _I = NULL; + _J = NULL; _vol = 1.0; } @@ -140,19 +140,19 @@ aflibConverter::deleteMemory() int i; // Delete memory for the input and output arrays - if (_X != NULL) + if (_I != NULL) { for (i = 0; i < _nChans; i++) { - delete [] _X[i]; - _X[i] = NULL; - delete [] _Y[i]; - _Y[i] = NULL; + delete [] _I[i]; + _I[i] = NULL; + delete [] _J[i]; + _J[i] = NULL; } - delete [] _X; - _X = NULL; - delete [] _Y; - _Y = NULL; + delete [] _I; + _I = NULL; + delete [] _J; + _J = NULL; } } @@ -180,15 +180,15 @@ aflibConverter::initialize( _vol = volume; // Allocate all new memory - _X = new short * [_nChans]; - _Y = new short * [_nChans]; + _I = new short * [_nChans]; + _J = new short * [_nChans]; for (i = 0; i < _nChans; i++) { // Add extra to allow of offset of input data (Xoff in main routine) - _X[i] = new short[IBUFFSIZE + 256]; - _Y[i] = new short[(int)(((double)IBUFFSIZE)*_factor)]; - memset(_X[i], 0, sizeof(short) * (IBUFFSIZE + 256)); + _I[i] = new short[IBUFFSIZE + 256]; + _J[i] = new short[(int)(((double)IBUFFSIZE)*_factor)]; + memset(_I[i], 0, sizeof(short) * (IBUFFSIZE + 256)); } } @@ -467,7 +467,7 @@ aflibConverter::resampleFast( /* number of output samples returned */ do { if (!last) /* If haven't read last sample yet */ { - last = readData(inCount, inArray, _X, + last = readData(inCount, inArray, _I, IBUFFSIZE, (int)Xread,first_pass); first_pass = FALSE; if (last && (last-Xoff= 1) { /* SrcUp() is faster if we can use it */ - Nout=SrcUp(_X[c],_Y[c],_factor, + Nout=SrcUp(_I[c],_J[c],_factor, &Time2,Nx,maxOutput,Nwing,LpScl,Imp,ImpD,interpFilt); } else { - Nout=SrcUD(_X[c],_Y[c],_factor, + Nout=SrcUD(_I[c],_J[c],_factor, &Time2,Nx,maxOutput,Nwing,LpScl,Imp,ImpD,interpFilt); } } @@ -642,7 +642,7 @@ aflibConverter::resampleWithFilter( /* number of output samples returned */ { for (i = 0; i < Nout; i++) { - outArray[c * outCount + i + Ycount - Nout] = _Y[c][i]; + outArray[c * outCount + i + Ycount - Nout] = _J[c][i]; } } @@ -651,7 +651,7 @@ aflibConverter::resampleWithFilter( /* number of output samples returned */ for (c = 0; c < _nChans; c++) { for (i=0; i