Menu
▾
▴
SF.net SVN: jazzplusplus:[842] trunk/jazz/src
|
From: <pst...@us...> - 2011-07-26 21:15:24
|
Revision: 842
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=842&view=rev
Author: pstieber
Date: 2011-07-26 21:15:16 +0000 (Tue, 26 Jul 2011)
Log Message:
-----------
1. Changed JZSimpleEventArray::Events to JZSimpleEventArray::mppEvents.
2. Changed JZSampleVoice::data to JZSampleVoice::mpData.
3. Changed JZFloatSample::data to JZFloatSample::mpData.
4. Updated some local variable names.
Modified Paths:
--------------
trunk/jazz/src/Audio.cpp
trunk/jazz/src/Harmony.cpp
trunk/jazz/src/Player.cpp
trunk/jazz/src/Rhythm.cpp
trunk/jazz/src/Sample.cpp
trunk/jazz/src/Sample.h
trunk/jazz/src/SampleCommand.cpp
trunk/jazz/src/Song.cpp
trunk/jazz/src/Track.cpp
trunk/jazz/src/Track.h
Modified: trunk/jazz/src/Audio.cpp
===================================================================
--- trunk/jazz/src/Audio.cpp 2011-07-26 18:23:24 UTC (rev 841)
+++ trunk/jazz/src/Audio.cpp 2011-07-26 21:15:16 UTC (rev 842)
@@ -78,7 +78,7 @@
clock = c;
first = 1;
length = spl->length;
- data = spl->data;
+ mpData = spl->mpData;
prev = 0;
}
@@ -105,7 +105,7 @@
{
// output starts somewhere in the middle of a sample
long data_offs = set.Ticks2Samples(buffer_clock - clock);
- data += data_offs;
+ mpData += data_offs;
length -= data_offs;
if (length <= 0)
return;
@@ -123,7 +123,7 @@
b += offset;
while (count--)
{
- *b++ += *data++;
+ *b++ += *mpData++;
}
}
@@ -145,7 +145,7 @@
if (fr_smpl > 0 && fr_smpl < length)
{
- data += fr_smpl;
+ mpData += fr_smpl;
length -= fr_smpl;
}
first = false;
@@ -165,7 +165,7 @@
length -= count;
while (count--)
{
- *b++ += *data++;
+ *b++ += *mpData++;
}
}
@@ -176,12 +176,12 @@
private:
JZSampleSet& set;
- long clock;
+ long clock;
JZSample* spl;
- short* data;
- int first;
- long length;
- short prev;
+ short* mpData;
+ int first;
+ long length;
+ short prev;
};
//*****************************************************************************
@@ -477,7 +477,7 @@
// iterate the events and add sounding voices
while (event_index < events->nEvents)
{
- JZEvent* pEvent = events->Events[event_index];
+ JZEvent* pEvent = events->mppEvents[event_index];
if (pEvent->GetClock() >= last_clock)
{
break;
@@ -1089,7 +1089,7 @@
{
int bi = i / bufsize;
int di = i % bufsize;
- slow.write((char*)&buf.buffers[bi]->data[di], sizeof(short));
+ slow.write((char*)&buf.buffers[bi]->mpData[di], sizeof(short));
}
#endif
}
Modified: trunk/jazz/src/Harmony.cpp
===================================================================
--- trunk/jazz/src/Harmony.cpp 2011-07-26 18:23:24 UTC (rev 841)
+++ trunk/jazz/src/Harmony.cpp 2011-07-26 21:15:16 UTC (rev 842)
@@ -727,7 +727,7 @@
JZEventArray &buf = gpTrackFrame->GetPianoWindow()->mPasteBuffer;
for (int i = 0; i < buf.nEvents; i++)
{
- JZKeyOnEvent* pKeyOn = buf.Events[i]->IsKeyOn();
+ JZKeyOnEvent* pKeyOn = buf.mppEvents[i]->IsKeyOn();
if (pKeyOn)
{
piano += pKeyOn->GetKey();
Modified: trunk/jazz/src/Player.cpp
===================================================================
--- trunk/jazz/src/Player.cpp 2011-07-26 18:23:24 UTC (rev 841)
+++ trunk/jazz/src/Player.cpp 2011-07-26 21:15:16 UTC (rev 842)
@@ -251,7 +251,7 @@
// send them to driver
// else
// tell the driver that there is nothing to do at the moment
- if (mPlayBuffer.nEvents && mPlayBuffer.Events[0]->GetClock() < mOutClock)
+ if (mPlayBuffer.nEvents && mPlayBuffer.mppEvents[0]->GetClock() < mOutClock)
{
FlushToDevice();
}
Modified: trunk/jazz/src/Rhythm.cpp
===================================================================
--- trunk/jazz/src/Rhythm.cpp 2011-07-26 18:23:24 UTC (rev 841)
+++ trunk/jazz/src/Rhythm.cpp 2011-07-26 21:15:16 UTC (rev 842)
@@ -943,7 +943,7 @@
for (int ii = 0; ii < events.nEvents; ii++)
{
- JZKeyOnEvent* pKeyOn = events.Events[ii]->IsKeyOn();
+ JZKeyOnEvent* pKeyOn = events.mppEvents[ii]->IsKeyOn();
if (pKeyOn)
{
pRhythm->keys[pRhythm->n_keys++] = pKeyOn->GetKey();
Modified: trunk/jazz/src/Sample.cpp
===================================================================
--- trunk/jazz/src/Sample.cpp 2011-07-26 18:23:24 UTC (rev 841)
+++ trunk/jazz/src/Sample.cpp 2011-07-26 21:15:16 UTC (rev 842)
@@ -43,7 +43,7 @@
mLabel(),
mFileName()
{
- data = 0;
+ mpData = 0;
length = 0;
external_flag = 1; // auto reload when file changes on disk
external_time = 0;
@@ -56,7 +56,7 @@
JZSample::~JZSample()
{
- delete [] data;
+ delete [] mpData;
}
void JZSample::SetLabel(const std::string& Label)
@@ -87,19 +87,19 @@
void JZSample::FreeData()
{
- delete [] data;
- data = 0;
+ delete [] mpData;
+ mpData = 0;
length = 0;
dirty = 1;
}
void JZSample::MakeData(int new_length, int zero)
{
- delete [] data;
+ delete [] mpData;
length = new_length;
- data = new short[length];
+ mpData = new short[length];
if (zero)
- memset(data, 0, length * sizeof(short));
+ memset(mpData, 0, length * sizeof(short));
}
@@ -108,7 +108,7 @@
MakeData(fs.GetLength());
for (int i = 0; i < length; i++)
{
- data[i] = (short)fs[i];
+ mpData[i] = (short)fs[i];
}
}
@@ -119,7 +119,7 @@
AssureLength(offs + len);
for (int i = 0; i < len; i++)
{
- data[offs + i] = (short)fs[i];
+ mpData[offs + i] = (short)fs[i];
}
}
@@ -147,17 +147,17 @@
while (i < ofs1)
{
- data[offs + i] = (short)(fi.XToY(i) * fs[i] + fo.XToY(i) * data[offs + i]);
+ mpData[offs + i] = (short)(fi.XToY(i) * fs[i] + fo.XToY(i) * mpData[offs + i]);
i++;
}
while (i < ofs2)
{
- data[offs + i] = (short)fs[i];
+ mpData[offs + i] = (short)fs[i];
i++;
}
while (i < ofs3)
{
- data[offs + i] = (short)(fo.XToY(i-ofs2) * fs[i] + fi.XToY(i-ofs2) * data[offs + i]);
+ mpData[offs + i] = (short)(fo.XToY(i-ofs2) * fs[i] + fi.XToY(i-ofs2) * mpData[offs + i]);
i++;
}
}
@@ -301,20 +301,20 @@
// load the file
length = bytes / 2;
- delete [] data;
- data = new short [length];
- is.read((char *)data, length * 2);
+ delete [] mpData;
+ mpData = new short [length];
+ is.read((char *)mpData, length * 2);
// convert 8 -> 16 bit
if (bits == 8)
{
int i;
- char *tmp = (char *)data;
+ char *tmp = (char *)mpData;
length = bytes;
- data = new short [length];
+ mpData = new short [length];
for (i = 0; i < length; ++i)
{
- data[i] = ((short) ((signed char)tmp[i] ^ (signed char)0x80)) << 8;
+ mpData[i] = ((short) ((signed char)tmp[i] ^ (signed char)0x80)) << 8;
}
delete [] tmp;
}
@@ -322,15 +322,15 @@
// convert mono -> stereo
if (channels == 1 && set.GetChannelCount() == 2)
{
- short *old = data;
+ short *old = mpData;
length = length * 2;
- data = new short [length];
+ mpData = new short [length];
int i = 0;
int j = 0;
while (i < length)
{
- data[i++] = old[j];
- data[i++] = old[j++];
+ mpData[i++] = old[j];
+ mpData[i++] = old[j++];
}
delete [] old;
channels = 2;
@@ -338,15 +338,15 @@
// convert stereo -> mono
else if (channels == 2 && set.GetChannelCount() == 1)
{
- short *old = data;
+ short *old = mpData;
length = length / 2;
- data = new short [length];
+ mpData = new short [length];
int i = 0;
int j = 0;
while (i < length)
{
int val = ((int)old[j] + old[j+1]) / 2;
- data[i++] = (short)val;
+ mpData[i++] = (short)val;
j += 2;
}
delete [] old;
@@ -378,8 +378,8 @@
}
for (int i = 0; i < length-1; i += 2)
{
- data[i] = (short)((int)data[i] * ch1 >> 7);
- data[i+1] = (short)((int)data[i+1] * ch2 >> 7);
+ mpData[i] = (short)((int)mpData[i] * ch1 >> 7);
+ mpData[i+1] = (short)((int)mpData[i+1] * ch2 >> 7);
}
}
@@ -400,8 +400,8 @@
external_time = buf.st_mtime;
ifstream is(mFileName.c_str(), ios::binary | ios::in);
- data = new short [length];
- is.read((char *)data, length * 2);
+ mpData = new short [length];
+ is.read((char *)mpData, length * 2);
return 0;
}
@@ -451,7 +451,7 @@
to_smpl = (to_smpl < 0) ? length : to_smpl;
int count = to_smpl - fr_smpl;
dst.MakeData(count);
- memcpy(dst.data, data + fr_smpl, count * sizeof(short));
+ memcpy(dst.mpData, mpData + fr_smpl, count * sizeof(short));
}
@@ -463,14 +463,14 @@
short *new_data = new short [new_length];
int fr_offs = fr_smpl * sizeof(short);
- memcpy(new_data, data, fr_offs);
+ memcpy(new_data, mpData, fr_offs);
memcpy(
new_data + fr_smpl,
- data + to_smpl,
+ mpData + to_smpl,
(length - to_smpl) * sizeof(short));
- delete [] data;
- data = new_data;
+ delete [] mpData;
+ mpData = new_data;
length = new_length;
}
@@ -488,12 +488,12 @@
int bytes1 = pos * sizeof(short);
int bytes2 = len * sizeof(short);
int bytes3 = (length - pos) * sizeof(short);
- memcpy(new_data, data, bytes1);
+ memcpy(new_data, mpData, bytes1);
memset(new_data + pos, 0, bytes2);
- memcpy(new_data + pos + len, data + pos, bytes3);
+ memcpy(new_data + pos + len, mpData + pos, bytes3);
- delete [] data;
- data = new_data;
+ delete [] mpData;
+ mpData = new_data;
length = new_length;
}
@@ -502,13 +502,13 @@
{
AssureLength(offs + len);
while (len-- > 0)
- data[offs++] = 0;
+ mpData[offs++] = 0;
}
void JZSample::PasteIns(JZSample &src, int offs)
{
InsertSilence(offs, src.length);
- memcpy(data + offs, src.data, src.length * sizeof(short));
+ memcpy(mpData + offs, src.mpData, src.length * sizeof(short));
}
@@ -518,7 +518,7 @@
JZFloatSample fs(*this);
for (int i = 0; i < src.length; i++)
{
- fs[offs + i] += src.data[i];
+ fs[offs + i] += src.mpData[i];
}
fs.RescaleToShort();
Set(fs);
@@ -531,9 +531,9 @@
to = length - 1;
while (to > fr)
{
- short tmp = data[fr];
- data[fr] = data[to];
- data[to] = tmp;
+ short tmp = mpData[fr];
+ mpData[fr] = mpData[to];
+ mpData[to] = tmp;
to--;
fr++;
}
@@ -546,7 +546,7 @@
int step = set.GetChannelCount();
while (i < length)
{
- data[i] = -data[i];
+ mpData[i] = -mpData[i];
i += step;
}
}
@@ -583,7 +583,7 @@
int peak = 0;
for (int i = 0; i < length; i++)
{
- int d = abs(data[i]);
+ int d = abs(mpData[i]);
if (d > peak)
peak = d;
}
@@ -597,7 +597,7 @@
{
float f = maxval / peak;
for (int i = 0; i < length; i++)
- data[i] = (short)(f * data[i]);
+ mpData[i] = (short)(f * mpData[i]);
}
}
@@ -632,12 +632,12 @@
int k = i * channels;
for (int c = 0; c < channels; c++)
{
- JZMapper Map(0, 1, data[j + c], data[j + channels + c]);
+ JZMapper Map(0, 1, mpData[j + c], mpData[j + channels + c]);
new_data[k + c] = (short)Map.XToY(rem);
}
}
- delete data;
- data = new_data;
+ delete mpData;
+ mpData = new_data;
length = new_length;
}
@@ -688,7 +688,7 @@
for (i = fr; i < to; i += channels)
{
for (int c = 0; c < channels; c++)
- data[i + c] = filters[c].Loop(data[i + c]);
+ mpData[i + c] = filters[c].Loop(mpData[i + c]);
}
delete [] filters;
}
@@ -729,7 +729,7 @@
ofstream os(mFileName.c_str(), ios::out | ios::binary | ios::trunc);
os.write((char *)&wh, sizeof(wh));
- os.write((char *)data, length * sizeof(short));
+ os.write((char *)mpData, length * sizeof(short));
return os.bad();
}
@@ -742,9 +742,9 @@
{
current = 0;
length = spl.length;
- data = new float [length];
+ mpData = new float [length];
for (int i = 0; i < length; i++)
- data[i] = (float)spl.data[i];
+ mpData[i] = (float)spl.mpData[i];
channels = spl->GetChannelCount();
sampling_rate = spl->GetSamplingRate();
}
@@ -753,9 +753,9 @@
{
current = 0;
length = to - fr;
- data = new float [length];
+ mpData = new float [length];
for (int i = 0; i < length; i++)
- data[i] = (float)spl.data[i + fr];
+ mpData[i] = (float)spl.mpData[i + fr];
channels = spl->GetChannelCount();
sampling_rate = spl->GetSamplingRate();
}
@@ -766,14 +766,14 @@
channels = ch;
sampling_rate = sr;
length = 1000;
- data = new float [length];
- memset(data, 0, length * sizeof(float));
+ mpData = new float [length];
+ memset(mpData, 0, length * sizeof(float));
}
JZFloatSample::~JZFloatSample()
{
- delete [] data;
+ delete [] mpData;
}
@@ -786,7 +786,7 @@
float peak = 0;
for (int i = fr; i < to; i++)
{
- float d = fabs(data[i]);
+ float d = fabs(mpData[i]);
if (d > peak)
peak = d;
}
@@ -805,7 +805,7 @@
{
float f = maxval / peak;
for (int i = fr; i < to; i++)
- data[i] *= f;
+ mpData[i] *= f;
}
}
@@ -821,20 +821,20 @@
{
float f = 32767.0 / peak;
for (int i = fr; i < to; i++)
- data[i] *= f;
+ mpData[i] *= f;
}
}
void JZFloatSample::Initialize(int size)
{
- delete [] data;
+ delete [] mpData;
length = 0;
if (size > 0)
{
length = size;
- data = new float [length];
- memset(data, 0, length * sizeof(float));
+ mpData = new float [length];
+ memset(mpData, 0, length * sizeof(float));
}
}
@@ -843,13 +843,13 @@
{
AssureLength(offs + src.length);
for (int i = 0; i < src.length; i++)
- data[offs + i] += src.data[i];
+ mpData[offs + i] += src.mpData[i];
}
void JZFloatSample::RemoveTrailingSilence(float peak)
{
int len1 = length - channels; // last value
- while (len1 > 0 && fabs(data[len1]) < peak)
+ while (len1 > 0 && fabs(mpData[len1]) < peak)
len1 -= channels;
length = len1 + channels;
}
@@ -859,7 +859,7 @@
{
AssureLength(offs + src.length);
for (int i = 0; i < src.length; i++)
- data[offs + i] += src.data[i];
+ mpData[offs + i] += src.mpData[i];
}
@@ -873,12 +873,12 @@
float wmax, xmax = 0;
for (j = 0; j < length; j++)
{
- if ((wmax = (float)fabs(data[j])) > xmax)
+ if ((wmax = (float)fabs(mpData[j])) > xmax)
xmax = wmax;
}
for (j = 0; j < length; j++)
{
- data[j] /= xmax;
+ mpData[j] /= xmax;
}
}
@@ -888,7 +888,7 @@
channels = 1;
Initialize(size);
for (int i = 0; i < length; i++)
- data[i] = -cos(2.0*M_PI * (float)i/(float)(length)) * 0.5 + 0.5;
+ mpData[i] = -cos(2.0*M_PI * (float)i/(float)(length)) * 0.5 + 0.5;
Normalize();
}
@@ -900,7 +900,7 @@
channels = 1;
Initialize(size);
for (int i = 0; i < length; i++)
- data[i] = 0.54 - 0.46*cos(2.0*M_PI * (float)i/(float)(length));
+ mpData[i] = 0.54 - 0.46*cos(2.0*M_PI * (float)i/(float)(length));
Normalize();
}
@@ -918,13 +918,13 @@
amp1 = amp2;
amp2 = pvals[k+1];
j = i + 1;
- data[i] = amp1;
+ mpData[i] = amp1;
c = (float) pow((amp2/amp1),(1./ pvals[k]));
i = (j - 1) + pvals[k];
for (l = j; l < i; l++)
{
if (l < size)
- data[l] = data[l-1] * c;
+ mpData[l] = mpData[l-1] * c;
}
}
Normalize();
@@ -936,7 +936,7 @@
channels = 1;
Initialize(size);
CMixCmd cmix(sampling_rate);
- cmix.setline(pvals, nargs, size, data);
+ cmix.setline(pvals, nargs, size, mpData);
Normalize();
}
#endif
@@ -973,12 +973,12 @@
int bytes1 = pos * sizeof(float);
int bytes2 = len * sizeof(float);
int bytes3 = (length - pos) * sizeof(float);
- memcpy(new_data, data, bytes1);
+ memcpy(new_data, mpData, bytes1);
memset(new_data + pos, 0, bytes2);
- memcpy(new_data + pos + len, data + pos, bytes3);
+ memcpy(new_data + pos + len, mpData + pos, bytes3);
- delete [] data;
- data = new_data;
+ delete [] mpData;
+ mpData = new_data;
length = new_length;
}
@@ -1020,7 +1020,7 @@
if (current >= length)
AssureLength(length * 2);
for (int i = 0; i < channels; i++)
- data[current++] += p[i];
+ mpData[current++] += p[i];
return 1;
}
@@ -1028,7 +1028,7 @@
int JZFloatSample::GetIn(float *p)
{
for (int i = 0; i < channels; i++)
- p[i] = data[current++];
+ p[i] = mpData[current++];
return current < length;
}
@@ -1047,7 +1047,7 @@
return 0;
for (int c = 0; c < channels; c++)
{
- JZMapper Map(0, 1, data[i + c], data[i + channels + c]);
+ JZMapper Map(0, 1, mpData[i + c], mpData[i + channels + c]);
p[c] = Map.XToY(rem);
}
return 1;
@@ -1059,9 +1059,9 @@
// convert this sample to mono
if (channels != 2) // only stereo so far
return;
- float *dst = data;
+ float *dst = mpData;
for (int i = 0; i < length - 1; i += 2)
- *dst++ = (data[i] + data[i+1]) / 2.0;
+ *dst++ = (mpData[i] + mpData[i+1]) / 2.0;
length = length / 2;
channels = 1;
}
@@ -1078,7 +1078,7 @@
int k = i - delay;
for (int j = 0; k >= 0 && j < num_echos; j++)
{
- data[i] += data[k] * a;
+ mpData[i] += mpData[k] * a;
a *= ampl;
k -= delay;
}
@@ -1106,7 +1106,7 @@
int k = i - delay;
for (int j = 0; k >= 0 && j < num_echos; j++)
{
- data[i] += data[k] * a;
+ mpData[i] += mpData[k] * a;
a *= ampl;
k -= delays[j];
}
@@ -1142,10 +1142,10 @@
{
float ipan = ipans[j];
float opan = opans[j];
- float val = a * ( ipan * data[k] + (1.0 - ipan) * data[k+1] );
- data[i] += opan * val;
- data[i+1] += (1.0 - opan) * val;
- //data[i] += data[k] * a;
+ float val = a * ( ipan * mpData[k] + (1.0 - ipan) * mpData[k+1] );
+ mpData[i] += opan * val;
+ mpData[i+1] += (1.0 - opan) * val;
+ //mpData[i] += mpData[k] * a;
a *= ampl;
k -= delays[j];
}
Modified: trunk/jazz/src/Sample.h
===================================================================
--- trunk/jazz/src/Sample.h 2011-07-26 18:23:24 UTC (rev 841)
+++ trunk/jazz/src/Sample.h 2011-07-26 21:15:16 UTC (rev 842)
@@ -115,7 +115,7 @@
void RescaleToShort(int fr = -1, int to = -1);
float &operator[](int i)
{
- return data[i];
+ return mpData[i];
}
void Initialize(int size = 0);
void PasteMix(JZFloatSample &src, int offs = 0);
@@ -168,9 +168,9 @@
return sampling_rate;
}
- float *GetData()
+ float* GetData()
{
- return data;
+ return mpData;
}
int GetLength() const
@@ -179,23 +179,23 @@
}
protected:
- float* data;
+ float* mpData;
int length;
int channels;
int sampling_rate;
// CMIX-IO position
- int current;
+ int current;
};
//*****************************************************************************
// This class contains the data for one sample. For fastest playback access
// samples are stored as signed shorts.
-// data[0] == 1st value for left channel
-// data[1] == 1st value for right channel
-// data[n] == 1st value for n-th channel
-// data[n+1] == 2nd value for left channel
+// mpData[0] == 1st value for left channel
+// mpData[1] == 1st value for right channel
+// mpData[n] == 1st value for n-th channel
+// mpData[n+1] == 2nd value for left channel
// ...
// All length values mean the number of shorts and should be multiples of
// set.GetChannelCount(). Offsets should start on channel boundaries, that is
@@ -293,12 +293,12 @@
// Try to swap this sample into memory.
volatile short dummy;
for (int i = 0; i < length; i++)
- dummy = data[i];
+ dummy = mpData[i];
}
short *GetData()
{
- return data;
+ return mpData;
}
@@ -386,7 +386,7 @@
int speed);
int length; // number of shorts
- short* data; // signed shorts
+ short* mpData; // signed shorts
JZSampleSet& set;
std::string mLabel;
Modified: trunk/jazz/src/SampleCommand.cpp
===================================================================
--- trunk/jazz/src/SampleCommand.cpp 2011-07-26 18:23:24 UTC (rev 841)
+++ trunk/jazz/src/SampleCommand.cpp 2011-07-26 21:15:16 UTC (rev 842)
@@ -77,15 +77,15 @@
return; // no data
float i_fact = (float)arr.Size() / (float)n;
- short *data = spl.data;
+ short* pData = spl.mpData;
for (long i = 0; i < n-1; i += 2)
{
float x = (float)i * i_fact;
float p = arr[x];
if (p < 0)
- data[fr+i] = (short)((float)data[fr+i] * (100 + p) / 100);
+ pData[fr+i] = (short)((float)pData[fr+i] * (100 + p) / 100);
else
- data[fr+i+1] = (short)((float)data[fr+i+1] * (100 - p) / 100);
+ pData[fr+i+1] = (short)((float)pData[fr+i+1] * (100 - p) / 100);
}
}
@@ -102,7 +102,7 @@
long channels = spl.GetChannelCount();
float N = spl.length / channels - 2;
- short *data = spl.data;
+ short* pData = spl.mpData;
JZFloatSample out(channels, spl.GetSamplingRate());
out.SetNote(0, 0);
@@ -120,7 +120,7 @@
long i = (long)ofs * channels;
for (long c = 0; c < channels; c++)
{
- JZMapper Mapper(0, 1, data[i + c], data[i + channels + c]);
+ JZMapper Mapper(0, 1, pData[i + c], pData[i + channels + c]);
p[c] = Mapper.XToY(rem);
}
out.AddOut(p);
@@ -261,7 +261,7 @@
flt.Init(filter_type, SR, f, band_width);
}
int j = 0;
- short *data = spl.GetData();
+ short* pData = spl.GetData();
for (long i = channel; i < N; i += channels)
{
if (j-- == 0)
@@ -271,7 +271,7 @@
flt.ReInit(f, band_width);
j = 100;
}
- out[i] = flt.Loop(data[i]);
+ out[i] = flt.Loop(pData[i]);
}
}
Modified: trunk/jazz/src/Song.cpp
===================================================================
--- trunk/jazz/src/Song.cpp 2011-07-26 18:23:24 UTC (rev 841)
+++ trunk/jazz/src/Song.cpp 2011-07-26 21:15:16 UTC (rev 842)
@@ -568,7 +568,7 @@
JZTrack* pTrack = &mTracks[TrackIndex];
for (int EventIndex = 0; EventIndex < pTrack->nEvents; ++EventIndex)
{
- JZEvent* pEvent = pTrack->Events[EventIndex];
+ JZEvent* pEvent = pTrack->mppEvents[EventIndex];
pEvent->SetClock((int)(f * pEvent->GetClock() + 0.5));
JZKeyOnEvent* pKeyOn = pEvent->IsKeyOn();
if (pKeyOn)
Modified: trunk/jazz/src/Track.cpp
===================================================================
--- trunk/jazz/src/Track.cpp 2011-07-26 18:23:24 UTC (rev 841)
+++ trunk/jazz/src/Track.cpp 2011-07-26 21:15:16 UTC (rev 842)
@@ -415,15 +415,15 @@
: wxObject(),
nEvents(0),
MaxEvents(0),
- Events(0)
+ mppEvents(0)
{
}
JZSimpleEventArray::~JZSimpleEventArray()
{
Clear();
- delete [] Events;
- Events = 0;
+ delete [] mppEvents;
+ mppEvents = 0;
}
void JZSimpleEventArray::Clear()
@@ -431,7 +431,7 @@
int i;
for (i = 0; i < nEvents; i++)
{
- delete Events[i];
+ delete mppEvents[i];
}
nEvents = 0;
}
@@ -444,7 +444,7 @@
{
if (bits(i))
{
- delete Events[i];
+ delete mppEvents[i];
}
}
nEvents = 0;
@@ -460,7 +460,7 @@
// Copy the previuosly existing event pointers.
for (i = 0; i < nEvents; ++i)
{
- ppEvents[i] = Events[i];
+ ppEvents[i] = mppEvents[i];
}
// Initialize the new event pointers to 0.
@@ -470,10 +470,10 @@
}
// Delete the old event pointers
- delete [] Events;
+ delete [] mppEvents;
// Set the data member to the new storage location.
- Events = ppEvents;
+ mppEvents = ppEvents;
}
// Remove any end of track (EOT) events from the track. There can only be
@@ -484,9 +484,9 @@
int newnEvents = nEvents;
for (int i = 0; i < nEvents; ++i)
{
- if (Events[i] != 0 && Events[i]->IsEndOfTrack())
+ if (mppEvents[i] != 0 && mppEvents[i]->IsEndOfTrack())
{
- delete Events[i];
+ delete mppEvents[i];
++j;
--newnEvents;
}
@@ -494,13 +494,13 @@
JZEvent* item;
if (j <= MaxEvents)
{
- item = Events[j++];
+ item = mppEvents[j++];
}
else
{
item = 0;
}
- Events[i] = item;
+ mppEvents[i] = item;
}
nEvents = newnEvents;
}
@@ -516,7 +516,7 @@
{
Resize();
}
- Events[nEvents++] = pEvent;
+ mppEvents[nEvents++] = pEvent;
}
// Description:
@@ -525,13 +525,13 @@
{
Clear();
- delete [] Events;
+ delete [] mppEvents;
- Events = src.Events;
+ mppEvents = src.mppEvents;
nEvents = src.nEvents;
MaxEvents = src.MaxEvents;
- src.Events = 0;
+ src.mppEvents = 0;
src.nEvents = 0;
src.MaxEvents = 0;
}
@@ -567,7 +567,7 @@
nEvents = 0;
MaxEvents = 0;
- Events = 0;
+ mppEvents = 0;
Channel = 0;
Device = 0;
ForceChannel = 0;
@@ -685,11 +685,11 @@
DrumParams.Clear();
- if (Events)
+ if (mppEvents)
{
- delete [] Events;
+ delete [] mppEvents;
}
- Events = 0;
+ mppEvents = 0;
MaxEvents = 0;
State = tsPlay;
@@ -716,7 +716,7 @@
void JZSimpleEventArray::Sort()
{
- qsort(Events, nEvents, sizeof(JZEvent *), compare);
+ qsort(mppEvents, nEvents, sizeof(JZEvent *), compare);
}
@@ -802,13 +802,13 @@
for (i = 0; i < nEvents; i++)
{
- if ((pEvent = Events[i])->IsKilled())
+ if ((pEvent = mppEvents[i])->IsKilled())
{
if (!dont_delete_killed_events)
{
for (int j = i; j < nEvents; j++)
{
- delete Events[j];
+ delete mppEvents[j];
}
}
nEvents = i;
@@ -1149,7 +1149,7 @@
for (int i = 0; i < n; i++)
{
JZKeyOnEvent* pKeyOn;
- if ((pKeyOn = Events[i]->IsKeyOn()) != 0 && pKeyOn->GetEventLength() != 0)
+ if ((pKeyOn = mppEvents[i]->IsKeyOn()) != 0 && pKeyOn->GetEventLength() != 0)
{
// JZEvent* pKeyOff = new JZKeyOffEvent(
// pKeyOn->GetClock() + pKeyOn->GetEventLength(),
@@ -1180,10 +1180,10 @@
for (i = 1; i < nEvents; i++)
{
JZKeyOffEvent* pKeyOff;
- if ((pKeyOff = Events[i]->IsKeyOff()) != 0)
+ if ((pKeyOff = mppEvents[i]->IsKeyOff()) != 0)
{
- JZEvent** ppEvent = &Events[i - 1];
- while (ppEvent >= Events)
+ JZEvent** ppEvent = &mppEvents[i - 1];
+ while (ppEvent >= mppEvents)
{
JZKeyOnEvent* pKeyOn = (*ppEvent)->IsKeyOn();
if (
@@ -1208,7 +1208,7 @@
// kill all KeyOn's with non matching KeyOff's
for (i = 0; i < nEvents; i++)
{
- JZKeyOnEvent *k = Events[i]->IsKeyOn();
+ JZKeyOnEvent *k = mppEvents[i]->IsKeyOn();
if (k && k->Length <= 0)
{
k->Kill();
@@ -1227,12 +1227,12 @@
for (i = 0; i < nEvents; i++)
{
JZKeyOnEvent* pKeyOn;
- if ((pKeyOn = Events[i]->IsKeyOn()) != 0 && pKeyOn->GetEventLength() == 0)
+ if ((pKeyOn = mppEvents[i]->IsKeyOn()) != 0 && pKeyOn->GetEventLength() == 0)
{
int j;
for (j = i + 1; j < nEvents; j++)
{
- JZKeyOffEvent* pKeyOff = Events[j]->IsKeyOff();
+ JZKeyOffEvent* pKeyOff = mppEvents[j]->IsKeyOff();
if (
pKeyOff &&
!pKeyOff->IsKilled() &&
@@ -1255,12 +1255,12 @@
// and kill all remaining KeyOff's
for (i = 0; i < nEvents; i++)
{
- JZKeyOnEvent* pKeyOn = Events[i]->IsKeyOn();
+ JZKeyOnEvent* pKeyOn = mppEvents[i]->IsKeyOn();
if (pKeyOn && pKeyOn->GetEventLength() <= 0)
{
pKeyOn->Kill();
}
- JZKeyOffEvent* pKeyOff = Events[i]->IsKeyOff();
+ JZKeyOffEvent* pKeyOff = mppEvents[i]->IsKeyOff();
if (pKeyOff)
{
pKeyOff->Kill();
@@ -1376,7 +1376,7 @@
for (int i = 0; i < nEvents; i++)
{
- pEvent = Events[i];
+ pEvent = mppEvents[i];
WrittenBefore = 0;
if (pEvent->IsControl())
{
@@ -1656,7 +1656,7 @@
{
return 0;
}
- return Events[nEvents - 1]->GetClock();
+ return mppEvents[nEvents - 1]->GetClock();
}
bool JZEventArray::IsEmpty() const
@@ -1668,7 +1668,7 @@
{
if (nEvents)
{
- return Events[0]->GetClock();
+ return mppEvents[0]->GetClock();
}
return LAST_CLOCK;
}
@@ -1966,7 +1966,7 @@
{
for (int i = 0; i < t->nEvents; i++)
{
- Put(t->Events[i]);
+ Put(t->mppEvents[i]);
}
t->nEvents = 0;
}
@@ -1991,7 +1991,7 @@
}
}
- // Merge Recorded Events
+ // Merge Recorded mppEvents
JZEventIterator Copy(&Other);
JZEvent* pEvent = Copy.Range(FromClock, ToClock);
while (pEvent)
@@ -2030,7 +2030,7 @@
JZUndoBuffer *undo = &mUndoBuffers[mUndoIndex];
for (int i = undo->nEvents - 1; i >= 0; i--)
{
- JZEvent* pEvent = undo->Events[i];
+ JZEvent* pEvent = undo->mppEvents[i];
if (undo->bits(i))
{
undo->bits.set(i, 0);
@@ -2060,7 +2060,7 @@
JZUndoBuffer *undo = &mUndoBuffers[mUndoIndex];
for (int i = 0; i < undo->nEvents; i++)
{
- JZEvent* pEvent = undo->Events[i];
+ JZEvent* pEvent = undo->mppEvents[i];
if (undo->bits(i))
{
undo->bits.set(i, 0);
Modified: trunk/jazz/src/Track.h
===================================================================
--- trunk/jazz/src/Track.h 2011-07-26 18:23:24 UTC (rev 841)
+++ trunk/jazz/src/Track.h 2011-07-26 21:15:16 UTC (rev 842)
@@ -393,15 +393,15 @@
{
public:
- // Actual number of events in **Events.
+ // Actual number of events in **mppEvents.
int nEvents;
- // Memory allocated in **Events
+ // Memory allocated in **mppEvents
int MaxEvents;
- JZEvent** Events;
+ JZEvent** mppEvents;
- // Resize **Events
+ // Resize **mppEvents
void Resize();
virtual void Clear();
@@ -776,7 +776,7 @@
while (Lo < Hi)
{
mActual = (Hi + Lo) / 2;
- TestClock = mpTrack->Events[mActual]->GetClock();
+ TestClock = mpTrack->mppEvents[mActual]->GetClock();
if (TestClock < Clock)
{
Lo = mActual + 1;
@@ -788,11 +788,11 @@
}
if (mActual < mStop - 1 && TestClock < Clock)
{
- TestClock = mpTrack->Events[++mActual]->GetClock();
+ TestClock = mpTrack->mppEvents[++mActual]->GetClock();
}
if (mActual < mStop && TestClock >= Clock)
{
- return mpTrack->Events[mActual];
+ return mpTrack->mppEvents[mActual];
}
return 0;
}
@@ -818,7 +818,7 @@
mStop = mActual;
}
mActual = mStart;
- return (mActual < mStop ? mpTrack->Events[mActual] : 0);
+ return (mActual < mStop ? mpTrack->mppEvents[mActual] : 0);
}
JZEvent* Next()
@@ -827,7 +827,7 @@
{
++mActual;
}
- return (mActual < mStop ? mpTrack->Events[mActual] : 0);
+ return (mActual < mStop ? mpTrack->mppEvents[mActual] : 0);
}
int EventsLeft()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
