Menu
▾
▴
SF.net SVN: jazzplusplus:[999] trunk/jazz/src
|
From: <pst...@us...> - 2013-03-29 19:48:27
|
Revision: 999
http://sourceforge.net/p/jazzplusplus/code/999
Author: pstieber
Date: 2013-03-29 19:48:24 +0000 (Fri, 29 Mar 2013)
Log Message:
-----------
1. Prefixed data members with m.
2. Removed extra white space inside of parentheses.
3. Changed pointer spacing convention.
Modified Paths:
--------------
trunk/jazz/src/Audio.cpp
trunk/jazz/src/ControlEdit.cpp
trunk/jazz/src/Dialogs/TrackDialog.cpp
trunk/jazz/src/Harmony.cpp
trunk/jazz/src/HarmonyP.cpp
trunk/jazz/src/PianoWindow.cpp
trunk/jazz/src/Player.cpp
trunk/jazz/src/Random.cpp
trunk/jazz/src/Rhythm.cpp
trunk/jazz/src/SliderWindow.cpp
trunk/jazz/src/Song.cpp
trunk/jazz/src/Track.cpp
trunk/jazz/src/Track.h
trunk/jazz/src/TrackWindow.cpp
Modified: trunk/jazz/src/Audio.cpp
===================================================================
--- trunk/jazz/src/Audio.cpp 2013-03-29 19:45:22 UTC (rev 998)
+++ trunk/jazz/src/Audio.cpp 2013-03-29 19:48:24 UTC (rev 999)
@@ -475,7 +475,7 @@
}
// iterate the events and add sounding voices
- while (event_index < events->nEvents)
+ while (event_index < events->mEventCount)
{
JZEvent* pEvent = events->mppEvents[event_index];
if (pEvent->GetClock() >= last_clock)
@@ -1012,7 +1012,7 @@
// add a noteon
JZKeyOnEvent* pKeyOn = new JZKeyOnEvent(
frc,
- track->Channel - 1,
+ track->mChannel - 1,
key,
64,
(unsigned short)(toc - frc));
Modified: trunk/jazz/src/ControlEdit.cpp
===================================================================
--- trunk/jazz/src/ControlEdit.cpp 2013-03-29 19:45:22 UTC (rev 998)
+++ trunk/jazz/src/ControlEdit.cpp 2013-03-29 19:48:24 UTC (rev 999)
@@ -445,7 +445,7 @@
JZEvent * JZPitchEdit::NewEvent(long clock, int val)
{
- return new JZPitchEvent(clock, track->Channel - 1, val);
+ return new JZPitchEvent(clock, track->mChannel - 1, val);
}
// ------------------------------------------------------------------
@@ -490,7 +490,7 @@
JZEvent * JZControlEdit::NewEvent(long clock, int val)
{
- return new JZControlEvent(clock, track->Channel - 1, ctrl_num, val);
+ return new JZControlEvent(clock, track->mChannel - 1, ctrl_num, val);
}
// ------------------------------------------------------------------
@@ -813,7 +813,7 @@
JZEvent *JZChannelAftertouchEdit::NewEvent(long clock, int val)
{
- return new JZChnPressureEvent(clock, track->Channel - 1, val);
+ return new JZChnPressureEvent(clock, track->mChannel - 1, val);
}
void JZChannelAftertouchEdit::UpDate()
Modified: trunk/jazz/src/Dialogs/TrackDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/TrackDialog.cpp 2013-03-29 19:45:22 UTC (rev 998)
+++ trunk/jazz/src/Dialogs/TrackDialog.cpp 2013-03-29 19:48:24 UTC (rev 999)
@@ -177,10 +177,10 @@
ostringstream Oss;
- Oss << (int)mTrack.Channel;
+ Oss << (int)mTrack.mChannel;
mpChannelValue->SetLabel(Oss.str().c_str());
- mpChannelKnob->SetValue(mTrack.Channel);
+ mpChannelKnob->SetValue(mTrack.mChannel);
mpAudioModeCheckBox->SetValue(mTrack.GetAudioMode());
@@ -201,7 +201,7 @@
int Bank = (Selection & 0x0000ff00) >> 8;
mTrack.SetPatch(Patch);
mTrack.SetBank(Bank);
- mTrack.Channel = mpChannelKnob->GetValue();
+ mTrack.mChannel = mpChannelKnob->GetValue();
mTrack.SetAudioMode(mpAudioModeCheckBox->GetValue());
}
@@ -216,7 +216,7 @@
ostringstream Oss;
Oss << Value;
mpChannelValue->SetLabel(Oss.str().c_str());
- mTrack.Channel = Value;
+ mTrack.mChannel = Value;
// Test to determine if the track channel toggled in our out of drum mode.
if (mLastTrackChannelWasDrums != mTrack.IsDrumTrack())
Modified: trunk/jazz/src/Harmony.cpp
===================================================================
--- trunk/jazz/src/Harmony.cpp 2013-03-29 19:45:22 UTC (rev 998)
+++ trunk/jazz/src/Harmony.cpp 2013-03-29 19:48:24 UTC (rev 999)
@@ -725,7 +725,7 @@
if (mpHbWindow->mMarkPiano && gpTrackFrame->GetPianoWindow())
{
JZEventArray &buf = gpTrackFrame->GetPianoWindow()->mPasteBuffer;
- for (int i = 0; i < buf.nEvents; i++)
+ for (int i = 0; i < buf.mEventCount; i++)
{
JZKeyOnEvent* pKeyOn = buf.mppEvents[i]->IsKeyOn();
if (pKeyOn)
@@ -1734,8 +1734,8 @@
for (i = 0; i < 12; i++)
{
int x = w * i + 10;
- chord_chk[i] = new wxCheckBox(this, wxID_ANY, " ", wxPoint(x, y+1*h));//(wxFunction)ChordCheck,
- scale_chk[i] = new wxCheckBox(this, wxID_ANY, " ", wxPoint(x, y+2*h));//(wxFunction)ScaleCheck,
+ chord_chk[i] = new wxCheckBox(this, wxID_ANY, " ", wxPoint(x, y+1*h));//(wxFunction)ChordCheck,
+ scale_chk[i] = new wxCheckBox(this, wxID_ANY, " ", wxPoint(x, y+2*h));//(wxFunction)ScaleCheck,
if (notename[i])
{
new wxStaticText(this, wxID_ANY, notename[i], wxPoint(x, y + 3 * h));
Modified: trunk/jazz/src/HarmonyP.cpp
===================================================================
--- trunk/jazz/src/HarmonyP.cpp 2013-03-29 19:45:22 UTC (rev 998)
+++ trunk/jazz/src/HarmonyP.cpp 2013-03-29 19:48:24 UTC (rev 999)
@@ -447,11 +447,11 @@
ostream & operator << (ostream &os, JZHarmonyBrowserContext const &a)
{
- os << (int) a.scale_type << " ";
- os << a.scale_nr << " ";
- os << a.chord_nr << " ";
- os << a.seq_nr << " ";
- os << a.chord_key << " ";
+ os << (int) a.scale_type << ' ';
+ os << a.scale_nr << ' ';
+ os << a.chord_nr << ' ';
+ os << a.seq_nr << ' ';
+ os << a.chord_key << ' ';
os << a.chord << a.scale;
return os;
}
@@ -556,7 +556,7 @@
{
for (int i = 0; i < 12; i++)
if (c.Contains(i))
- cout << i << " ";
+ cout << i << ' ';
cout << endl;
}
Modified: trunk/jazz/src/PianoWindow.cpp
===================================================================
--- trunk/jazz/src/PianoWindow.cpp 2013-03-29 19:45:22 UTC (rev 998)
+++ trunk/jazz/src/PianoWindow.cpp 2013-03-29 19:48:24 UTC (rev 999)
@@ -146,8 +146,8 @@
mChannel(-1),
mpPianoWindow(pPianoWindow)
{
- mChannel = mpPianoWindow->GetTrack()->Channel ?
- mpPianoWindow->GetTrack()->Channel - 1 : 0;
+ mChannel = mpPianoWindow->GetTrack()->mChannel ?
+ mpPianoWindow->GetTrack()->mChannel - 1 : 0;
}
//-----------------------------------------------------------------------------
@@ -2319,7 +2319,7 @@
case MA_DIALOG:
- EventDialog(pEvent, this, mpTrack, Clock, mpTrack->Channel - 1, Pitch);
+ EventDialog(pEvent, this, mpTrack, Clock, mpTrack->mChannel - 1, Pitch);
Refresh();
break;
@@ -2422,8 +2422,8 @@
}
return
- (mpTrack->Channel == gpConfig->GetValue(C_DrumChannel)) ==
- (pTrack->Channel == gpConfig->GetValue(C_DrumChannel));
+ (mpTrack->mChannel == gpConfig->GetValue(C_DrumChannel)) ==
+ (pTrack->mChannel == gpConfig->GetValue(C_DrumChannel));
}
//=============================================================================
@@ -3143,7 +3143,7 @@
//-----------------------------------------------------------------------------
void JZPianoWindow::Paste(JZTrack* pTrack, int Clock, int Pitch)
{
- if (mPasteBuffer.nEvents == 0)
+ if (mPasteBuffer.mEventCount == 0)
{
int len = SnapClocks() - 4;
if (len < 2)
@@ -3190,9 +3190,9 @@
JZEvent *c = pEvent->Copy();
c->SetPitch(c->GetPitch() + DeltaPitch);
c->SetClock(c->GetClock() + DeltaClock);
- if (pTrack->ForceChannel && c->IsChannelEvent())
+ if (pTrack->mForceChannel && c->IsChannelEvent())
{
- c->IsChannelEvent()->SetChannel(pTrack->Channel - 1);
+ c->IsChannelEvent()->SetChannel(pTrack->mChannel - 1);
}
JZKeyOnEvent* pKeyOn = c->IsKeyOn();
if (pKeyOn)
@@ -3250,7 +3250,7 @@
//-----------------------------------------------------------------------------
int JZPianoWindow::Channel()
{
- return mpTrack->Channel ? mpTrack->Channel - 1 : 0;
+ return mpTrack->mChannel ? mpTrack->mChannel - 1 : 0;
}
//-----------------------------------------------------------------------------
Modified: trunk/jazz/src/Player.cpp
===================================================================
--- trunk/jazz/src/Player.cpp 2013-03-29 19:45:22 UTC (rev 998)
+++ trunk/jazz/src/Player.cpp 2013-03-29 19:48:24 UTC (rev 999)
@@ -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.mppEvents[0]->GetClock() < mOutClock)
+ if (mPlayBuffer.mEventCount && mPlayBuffer.mppEvents[0]->GetClock() < mOutClock)
{
FlushToDevice();
}
Modified: trunk/jazz/src/Random.cpp
===================================================================
--- trunk/jazz/src/Random.cpp 2013-03-29 19:45:22 UTC (rev 998)
+++ trunk/jazz/src/Random.cpp 2013-03-29 19:48:24 UTC (rev 999)
@@ -235,10 +235,10 @@
{
int i;
- os << a.n << " " << a.min << " " << a.max << endl;
+ os << a.n << ' ' << a.min << ' ' << a.max << endl;
for (i = 0; i < a.n; i++)
{
- os << a.mArray[i] << " ";
+ os << a.mArray[i] << ' ';
}
os << endl;
return os;
Modified: trunk/jazz/src/Rhythm.cpp
===================================================================
--- trunk/jazz/src/Rhythm.cpp 2013-03-29 19:45:22 UTC (rev 998)
+++ trunk/jazz/src/Rhythm.cpp 2013-03-29 19:48:24 UTC (rev 999)
@@ -54,8 +54,8 @@
void tRhyGroup::write(ostream& Os) const
{
- Os << listen << " ";
- Os << contrib << " ";
+ Os << listen << ' ';
+ Os << contrib << ' ';
}
void tRhyGroup::read(istream& Is, int version)
@@ -169,19 +169,19 @@
Os << length;
Os << veloc;
- Os << steps_per_count << " ";
- Os << count_per_bar << " ";
- Os << n_bars << " ";
- Os << mode << " ";
- Os << n_keys << " ";
+ Os << steps_per_count << ' ';
+ Os << count_per_bar << ' ';
+ Os << n_bars << ' ';
+ Os << mode << ' ';
+ Os << n_keys << ' ';
for (int i = 0; i < n_keys; i++)
{
- Os << keys[i] << " ";
+ Os << keys[i] << ' ';
}
Os << parm << endl;
WriteString(Os, mLabel.c_str()) << endl;
- Os << randomize << " ";
+ Os << randomize << ' ';
groups.write(Os);
}
@@ -267,9 +267,9 @@
}
-void JZRhythm::GenerateEvent(JZTrack *track, long clock, short vel, short len)
+void JZRhythm::GenerateEvent(JZTrack* pTrack, long clock, short vel, short len)
{
- int chan = track->Channel - 1;
+ int chan = pTrack->mChannel - 1;
// generate key events
if (mode == MODE_ALL_OF)
@@ -277,7 +277,7 @@
for (int ii = 0; ii < n_keys; ii++)
{
JZKeyOnEvent *k = new JZKeyOnEvent(clock, chan, keys[ii], vel, len);
- track->Put(k);
+ pTrack->Put(k);
}
}
else if (mode == MODE_ONE_OF)
@@ -286,14 +286,14 @@
if (ii < n_keys)
{
JZKeyOnEvent *k = new JZKeyOnEvent(clock, chan, keys[ii], vel, len);
- track->Put(k);
+ pTrack->Put(k);
}
}
else if (mode == MODE_CONTROL)
{
// generate controller
JZControlEvent* c = new JZControlEvent(clock, chan, parm - 1, vel);
- track->Put(c);
+ pTrack->Put(c);
}
else
{
@@ -303,9 +303,9 @@
#if 0
-void JZRhythm::Generate(JZTrack *track, long fr_clock, long to_clock, long ticks_per_bar)
+void JZRhythm::Generate(JZTrack* pTrack, long fr_clock, long to_clock, long ticks_per_bar)
{
- int chan = track->Channel - 1;
+ int chan = pTrack->Channel - 1;
long clock = fr_clock;
long clocks_per_step = ticks_per_bar / (steps_per_count * count_per_bar);
@@ -348,7 +348,7 @@
for (int j = 0; j < n_keys; j++)
{
JZKeyOnEvent *k = new JZKeyOnEvent(clock, chan, keys[j], vel, len - clocks_per_step/2);
- track->Put(k);
+ pTrack->Put(k);
}
}
}
@@ -357,13 +357,13 @@
else if (key == PASTE_KEY)
{
JZEventArray &src = gpTrackWindow->GetPianoWindow()->PasteBuffer;
- for (int ii = 0; ii < src.nEvents; ii++)
+ for (int ii = 0; ii < src.mEventCount; ii++)
{
JZKeyOnEvent* pKeyOn = src.Events[ii]->IsKeyOn();
if (pKeyOn)
{
JZKeyOnEvent *k = new JZKeyOnEvent(clock, chan, pKeyOn->Key, vel, len - clocks_per_step / 2);
- track->Put(k);
+ pTrack->Put(k);
}
}
}
@@ -372,13 +372,13 @@
else if (key == CONTROL_KEY)
{
JZControlEvent* c = new JZControlEvent(clock, chan, parm - 1, vel);
- track->Put(c);
+ pTrack->Put(c);
}
// generate note on events
else
{
JZKeyOnEvent *k = new JZKeyOnEvent(clock, chan, key, vel, len - clocks_per_step/2);
- track->Put(k);
+ pTrack->Put(k);
}
clock += len;
@@ -425,7 +425,7 @@
void JZRhythm::Generate(
- JZTrack* track,
+ JZTrack* pTrack,
const JZBarInfo& BarInfo,
JZRhythm* rhy[],
int n_rhy)
@@ -480,7 +480,7 @@
vel = rrg[i] * 126 / rrg.Max() + 1;
}
short len = (length.Random() + 1) * clocks_per_step;
- GenerateEvent(track, clock, vel, len - clocks_per_step/2);
+ GenerateEvent(pTrack, clock, vel, len - clocks_per_step/2);
clock += len;
}
else
@@ -930,7 +930,7 @@
JZCommandCopyToBuffer cmd(gpTrackFrame->GetPianoWindow()->GetFilter(), &events);
cmd.Execute(0); // no UNDO
- for (int ii = 0; ii < events.nEvents; ii++)
+ for (int ii = 0; ii < events.mEventCount; ii++)
{
JZKeyOnEvent* pKeyOn = events.mppEvents[ii]->IsKeyOn();
if (pKeyOn)
@@ -1072,7 +1072,7 @@
long fr_clock = pFilter->GetFromClock();
long to_clock = pFilter->GetToClock();
- JZTrack *track = mpSong->GetTrack(pFilter->GetFromTrack());
+ JZTrack* pTrack = mpSong->GetTrack(pFilter->GetFromTrack());
mpSong->NewUndoBuffer();
// remove selection
@@ -1096,19 +1096,19 @@
// for (int i = 0; i < n_instruments; i++)
// {
-// instruments[i]->Generate(track, fr_clock, to_clock, BarInfo.GetTicksPerBar());
+// instruments[i]->Generate(pTrack, fr_clock, to_clock, BarInfo.GetTicksPerBar());
// }
while (BarInfo.GetClock() < to_clock)
{
for (int i = 0; i < n_instruments; i++)
{
- instruments[i]->Generate(track, BarInfo, instruments, n_instruments);
+ instruments[i]->Generate(pTrack, BarInfo, instruments, n_instruments);
}
BarInfo.Next();
}
- track->Cleanup();
+ pTrack->Cleanup();
mpEventWindow->Refresh();
}
Modified: trunk/jazz/src/SliderWindow.cpp
===================================================================
--- trunk/jazz/src/SliderWindow.cpp 2013-03-29 19:45:22 UTC (rev 998)
+++ trunk/jazz/src/SliderWindow.cpp 2013-03-29 19:48:24 UTC (rev 999)
@@ -135,8 +135,8 @@
sliders[k]->SetSize((int)x0, (int)y0, (int)(x1 - x0), (int)(y1 - y0));
// sliders[k]->SetSize((int)x0, 0, (int)(x1 - x0), (int)(y0-y1));
cout
- << "slider " << k << " size:" << (int)x0 << " " << (int)y0
- << " " << (int)(x1 - x0) << " " << (int)(y1 - y0)
+ << "slider " << k << " size:" << (int)x0 << ' ' << (int)y0
+ << ' ' << (int)(x1 - x0) << ' ' << (int)(y1 - y0)
<< endl;
}
}
Modified: trunk/jazz/src/Song.cpp
===================================================================
--- trunk/jazz/src/Song.cpp 2013-03-29 19:45:22 UTC (rev 998)
+++ trunk/jazz/src/Song.cpp 2013-03-29 19:48:24 UTC (rev 999)
@@ -566,7 +566,7 @@
for (int TrackIndex = 0; TrackIndex < mTrackCount; ++TrackIndex)
{
JZTrack* pTrack = &mTracks[TrackIndex];
- for (int EventIndex = 0; EventIndex < pTrack->nEvents; ++EventIndex)
+ for (int EventIndex = 0; EventIndex < pTrack->mEventCount; ++EventIndex)
{
JZEvent* pEvent = pTrack->mppEvents[EventIndex];
pEvent->SetClock((int)(f * pEvent->GetClock() + 0.5));
Modified: trunk/jazz/src/Track.cpp
===================================================================
--- trunk/jazz/src/Track.cpp 2013-03-29 19:45:22 UTC (rev 998)
+++ trunk/jazz/src/Track.cpp 2013-03-29 19:48:24 UTC (rev 999)
@@ -211,20 +211,20 @@
{
for (int i = drumPitchIndex; i < numDrumParameters; i++)
{
- param[i] = 0;
+ mParam[i] = 0;
}
- param[drumParam2Index(par->mMsb.GetControlValue())] = par;
+ mParam[drumParam2Index(par->mMsb.GetControlValue())] = par;
}
JZNrpn* JZDrumInstrumentParameter::Get(int index)
{
assert((index >= drumPitchIndex) && (index < numDrumParameters));
- return(param[index]);
+ return(mParam[index]);
}
void JZDrumInstrumentParameter::Put(JZNrpn* par)
{
- param[par->mLsb.GetControlValue()] = par;
+ mParam[par->mLsb.GetControlValue()] = par;
}
JZDrumInstrumentParameter* JZDrumInstrumentParameter::Next()
@@ -240,7 +240,7 @@
JZDrumInstrumentParameter*
JZDrumInstrumentParameterList::GetElem(int pit)
{
- JZDrumInstrumentParameter* ptr = list;
+ JZDrumInstrumentParameter* ptr = mpList;
while (ptr)
{
if (ptr->mPitch == pit)
@@ -268,27 +268,27 @@
if (!ptr)
{
ptr = new JZDrumInstrumentParameter(par);
- ptr->mpNext = list;
- list = ptr;
+ ptr->mpNext = mpList;
+ mpList = ptr;
}
else
{
- ptr->param[drumParam2Index(par->mMsb.GetControlValue())] = par;
+ ptr->mParam[drumParam2Index(par->mMsb.GetControlValue())] = par;
}
}
void JZDrumInstrumentParameterList::DelParam(int pit, int index)
{
- if (list)
+ if (mpList)
{
JZDrumInstrumentParameter* elem = GetElem(pit);
if (elem)
{
if (elem->Get(index))
{
- delete elem->param[index];
+ delete elem->mParam[index];
}
- elem->param[index] = 0;
+ elem->mParam[index] = 0;
}
}
}
@@ -300,7 +300,7 @@
DelParam(pit, i);
}
- JZDrumInstrumentParameter* ptr = list;
+ JZDrumInstrumentParameter* ptr = mpList;
JZDrumInstrumentParameter* prev = 0;
while (ptr)
{
@@ -312,7 +312,7 @@
}
else
{
- list = ptr->mpNext;
+ mpList = ptr->mpNext;
}
delete ptr;
break;
@@ -324,7 +324,7 @@
JZDrumInstrumentParameter* JZDrumInstrumentParameterList::FirstElem()
{
- return list;
+ return mpList;
}
JZDrumInstrumentParameter* JZDrumInstrumentParameterList::NextElem(
@@ -350,20 +350,20 @@
void JZDrumInstrumentParameterList::Clear()
{
- JZDrumInstrumentParameter* ptr = list;
+ JZDrumInstrumentParameter* ptr = mpList;
while (ptr)
{
- list = ptr->mpNext;
+ mpList = ptr->mpNext;
delete ptr;
- ptr = list;
+ ptr = mpList;
}
}
JZSimpleEventArray::JZSimpleEventArray()
: wxObject(),
- nEvents(0),
- MaxEvents(0),
+ mEventCount(0),
+ mMaxEvents(0),
mppEvents(0)
{
}
@@ -378,42 +378,42 @@
void JZSimpleEventArray::Clear()
{
int i;
- for (i = 0; i < nEvents; i++)
+ for (i = 0; i < mEventCount; i++)
{
delete mppEvents[i];
}
- nEvents = 0;
+ mEventCount = 0;
}
void JZUndoBuffer::Clear()
{
int i;
- for (i = 0; i < nEvents; i++)
+ for (i = 0; i < mEventCount; i++)
{
if (bits(i))
{
delete mppEvents[i];
}
}
- nEvents = 0;
+ mEventCount = 0;
}
void JZSimpleEventArray::Resize()
{
int i;
- MaxEvents += 50;
- JZEvent** ppEvents = new JZEvent* [MaxEvents];
+ mMaxEvents += 50;
+ JZEvent** ppEvents = new JZEvent* [mMaxEvents];
// Copy the previuosly existing event pointers.
- for (i = 0; i < nEvents; ++i)
+ for (i = 0; i < mEventCount; ++i)
{
ppEvents[i] = mppEvents[i];
}
// Initialize the new event pointers to 0.
- for (; i < MaxEvents; ++i)
+ for (; i < mMaxEvents; ++i)
{
ppEvents[i] = 0;
}
@@ -430,8 +430,8 @@
void JZSimpleEventArray::RemoveEOT()
{
int j = 0;
- int newnEvents = nEvents;
- for (int i = 0; i < nEvents; ++i)
+ int newnEvents = mEventCount;
+ for (int i = 0; i < mEventCount; ++i)
{
if (mppEvents[i] != 0 && mppEvents[i]->IsEndOfTrack())
{
@@ -441,7 +441,7 @@
}
JZEvent* item;
- if (j <= MaxEvents)
+ if (j <= mMaxEvents)
{
item = mppEvents[j++];
}
@@ -451,7 +451,7 @@
}
mppEvents[i] = item;
}
- nEvents = newnEvents;
+ mEventCount = newnEvents;
}
void JZSimpleEventArray::Put(JZEvent* pEvent)
@@ -461,11 +461,11 @@
// Remove the old EOT if we are adding a new one.
RemoveEOT();
}
- if (nEvents >= MaxEvents)
+ if (mEventCount >= mMaxEvents)
{
Resize();
}
- mppEvents[nEvents++] = pEvent;
+ mppEvents[mEventCount++] = pEvent;
}
// Description:
@@ -477,12 +477,12 @@
delete [] mppEvents;
mppEvents = src.mppEvents;
- nEvents = src.nEvents;
- MaxEvents = src.MaxEvents;
+ mEventCount = src.mEventCount;
+ mMaxEvents = src.mMaxEvents;
src.mppEvents = 0;
- src.nEvents = 0;
- src.MaxEvents = 0;
+ src.mEventCount = 0;
+ src.mMaxEvents = 0;
}
@@ -513,13 +513,13 @@
mpReset(0),
mAudioMode(false)
{
- nEvents = 0;
+ mEventCount = 0;
- MaxEvents = 0;
+ mMaxEvents = 0;
mppEvents = 0;
- Channel = 0;
- Device = 0;
- ForceChannel = 0;
+ mChannel = 0;
+ mDevice = 0;
+ mForceChannel = 0;
State = tsPlay;
Clear();
@@ -565,8 +565,8 @@
// delete mpSpeed;
mpSpeed = 0;
- Channel = 1;
- Device = 0;
+ mChannel = 1;
+ mDevice = 0;
for (i = 0; i < mspModulationSysexParameters; i++)
{
@@ -639,7 +639,7 @@
delete [] mppEvents;
}
mppEvents = 0;
- MaxEvents = 0;
+ mMaxEvents = 0;
State = tsPlay;
mAudioMode = false;
@@ -665,7 +665,7 @@
void JZSimpleEventArray::Sort()
{
- qsort(mppEvents, nEvents, sizeof(JZEvent*), compare);
+ qsort(mppEvents, mEventCount, sizeof(JZEvent*), compare);
}
@@ -749,18 +749,18 @@
UseForRhythm = 0;
MtcOffset = 0;
- for (i = 0; i < nEvents; i++)
+ for (i = 0; i < mEventCount; i++)
{
if ((pEvent = mppEvents[i])->IsKilled())
{
if (!dont_delete_killed_events)
{
- for (int j = i; j < nEvents; j++)
+ for (int j = i; j < mEventCount; j++)
{
delete mppEvents[j];
}
}
- nEvents = i;
+ mEventCount = i;
break;
}
@@ -1094,7 +1094,7 @@
void JZEventArray::Length2Keyoff()
{
- int n = nEvents;
+ int n = mEventCount;
for (int i = 0; i < n; i++)
{
JZKeyOnEvent* pKeyOn;
@@ -1126,7 +1126,7 @@
void JZEventArray::Keyoff2Length()
{
int i;
- for (i = 1; i < nEvents; i++)
+ for (i = 1; i < mEventCount; i++)
{
JZKeyOffEvent* pKeyOff;
if ((pKeyOff = mppEvents[i]->IsKeyOff()) != 0)
@@ -1155,7 +1155,7 @@
}
// kill all KeyOn's with non matching KeyOff's
- for (i = 0; i < nEvents; i++)
+ for (i = 0; i < mEventCount; i++)
{
JZKeyOnEvent* k = mppEvents[i]->IsKeyOn();
if (k && k->Length <= 0)
@@ -1173,13 +1173,13 @@
// Searches forward from a KeyOn to find the matching KeyOff.
// This is compatible with Cubase.
int i;
- for (i = 0; i < nEvents; i++)
+ for (i = 0; i < mEventCount; i++)
{
JZKeyOnEvent* pKeyOn;
if ((pKeyOn = mppEvents[i]->IsKeyOn()) != 0 && pKeyOn->GetEventLength() == 0)
{
int j;
- for (j = i + 1; j < nEvents; j++)
+ for (j = i + 1; j < mEventCount; j++)
{
JZKeyOffEvent* pKeyOff = mppEvents[j]->IsKeyOff();
if (
@@ -1202,7 +1202,7 @@
// kill all KeyOn's with non matching KeyOff's
// and kill all remaining KeyOff's
- for (i = 0; i < nEvents; i++)
+ for (i = 0; i < mEventCount; i++)
{
JZKeyOnEvent* pKeyOn = mppEvents[i]->IsKeyOn();
if (pKeyOn && pKeyOn->GetEventLength() <= 0)
@@ -1319,11 +1319,11 @@
JZJazzMetaEvent JazzMeta;
JazzMeta.SetAudioMode(mAudioMode);
JazzMeta.SetTrackState(State);
- JazzMeta.SetTrackDevice(Device);
+ JazzMeta.SetTrackDevice(mDevice);
JazzMeta.SetIntroLength(gpSong->GetIntroLength());
JazzMeta.Write(Io);
- for (int i = 0; i < nEvents; i++)
+ for (int i = 0; i < mEventCount; i++)
{
pEvent = mppEvents[i];
WrittenBefore = 0;
@@ -1374,7 +1374,7 @@
void JZEventArray::Read(JZReadBase& Io)
{
JZEvent* pEvent;
- Channel = 0;
+ mChannel = 0;
unsigned char Msb, Lsb, Data;
bool SpecialEvent;
@@ -1393,7 +1393,7 @@
JZJazzMetaEvent* pJazzMetaEvent = pEvent->IsJazzMeta();
mAudioMode = pJazzMetaEvent->GetAudioMode();
State = (int)pJazzMetaEvent->GetTrackState();
- Device = (int)pJazzMetaEvent->GetTrackDevice();
+ mDevice = (int)pJazzMetaEvent->GetTrackDevice();
gpSong->SetIntroLength((int)pJazzMetaEvent->GetIntroLength());
delete pJazzMetaEvent;
continue;
@@ -1569,9 +1569,9 @@
{
Put(pEvent);
NeedToDelete = false;
- if (!Channel && pEvent->IsChannelEvent())
+ if (!mChannel && pEvent->IsChannelEvent())
{
- Channel = pEvent->IsChannelEvent()->GetChannel() + 1;
+ mChannel = pEvent->IsChannelEvent()->GetChannel() + 1;
}
}
if (pEvent->IsEndOfTrack())
@@ -1590,9 +1590,9 @@
} // while read
- if (!Channel)
+ if (!mChannel)
{
- Channel = 1;
+ mChannel = 1;
}
Keyoff2Length();
@@ -1601,21 +1601,21 @@
int JZEventArray::GetLastClock() const
{
- if (!nEvents)
+ if (!mEventCount)
{
return 0;
}
- return mppEvents[nEvents - 1]->GetClock();
+ return mppEvents[mEventCount - 1]->GetClock();
}
bool JZEventArray::IsEmpty() const
{
- return nEvents == 0;
+ return mEventCount == 0;
}
int JZEventArray::GetFirstClock()
{
- if (nEvents)
+ if (mEventCount)
{
return mppEvents[0]->GetClock();
}
@@ -1635,7 +1635,7 @@
JZNamedChoice PatchChoice;
JZNamedChoice DeviceChoice;
int PatchNr;
- int Device;
+ int mDevice;
int BankNr;
int ClearTrack;
int AudioMode;
@@ -1655,7 +1655,7 @@
"Patch",
t->IsDrumTrack() ? &gpConfig->GetDrumSet(0) : &gpConfig->GetVoiceName(0),
&PatchNr),
- DeviceChoice("Device", gpMidiPlayer->GetOutputDevices().AsNamedValue(), &Device)
+ DeviceChoice("Device", gpMidiPlayer->GetOutputDevices().AsNamedValue(), &mDevice)
{
TrackWin = w;
trk = t;
@@ -1695,8 +1695,8 @@
PatchNr = PatchNr & 0x000000ff;
trk->SetBank(BankNr);
trk->SetPatch(PatchNr);
- trk->SetDevice(Device);
- if (trk->ForceChannel)
+ trk->SetDevice(mDevice);
+ if (trk->mForceChannel)
{
JZChannelEvent* c;
JZSysExEvent* s;
@@ -1708,7 +1708,7 @@
if ((c = pEvent->IsChannelEvent()) != 0)
{
c = (JZChannelEvent*)pEvent->Copy();
- c->SetChannel(trk->Channel - 1);
+ c->SetChannel(trk->mChannel - 1);
trk->Kill(pEvent);
trk->Put(c);
}
@@ -1720,12 +1720,12 @@
{
if (gpSynth->IsXG())
{
- *pChannel = trk->Channel - 1;
+ *pChannel = trk->mChannel - 1;
}
else
{
*pChannel &= 0xf0;
- *pChannel |= sysex_channel(trk->Channel);
+ *pChannel |= sysex_channel(trk->mChannel);
}
s = (JZSysExEvent*) pEvent->Copy();
@@ -1738,47 +1738,47 @@
if (trk->VibRate)
{
- trk->VibRate->SetChannel(trk->Channel - 1);
+ trk->VibRate->SetChannel(trk->mChannel - 1);
}
if (trk->VibDepth)
{
- trk->VibDepth->SetChannel(trk->Channel - 1);
+ trk->VibDepth->SetChannel(trk->mChannel - 1);
}
if (trk->VibDelay)
{
- trk->VibDelay->SetChannel(trk->Channel - 1);
+ trk->VibDelay->SetChannel(trk->mChannel - 1);
}
if (trk->Cutoff)
{
- trk->Cutoff->SetChannel(trk->Channel - 1);
+ trk->Cutoff->SetChannel(trk->mChannel - 1);
}
if (trk->Resonance)
{
- trk->Resonance->SetChannel(trk->Channel - 1);
+ trk->Resonance->SetChannel(trk->mChannel - 1);
}
if (trk->EnvAttack)
{
- trk->EnvAttack->SetChannel(trk->Channel - 1);
+ trk->EnvAttack->SetChannel(trk->mChannel - 1);
}
if (trk->EnvDecay)
{
- trk->EnvDecay->SetChannel(trk->Channel - 1);
+ trk->EnvDecay->SetChannel(trk->mChannel - 1);
}
if (trk->EnvRelease)
{
- trk->EnvRelease->SetChannel(trk->Channel - 1);
+ trk->EnvRelease->SetChannel(trk->mChannel - 1);
}
if (trk->BendPitchSens)
{
- trk->BendPitchSens->SetChannel(trk->Channel - 1);
+ trk->BendPitchSens->SetChannel(trk->mChannel - 1);
}
if (trk->mpBank)
{
- trk->mpBank->Channel = trk->Channel - 1;
+ trk->mpBank->mChannel = trk->mChannel - 1;
}
if (trk->mpPatch)
{
- trk->mpPatch->Channel = trk->Channel - 1;
+ trk->mpPatch->mChannel = trk->mChannel - 1;
}
if (!trk->DrumParams.IsEmpty())
{
@@ -1789,7 +1789,7 @@
{
if (dpar->Get(index))
{
- dpar->Get(index)->SetChannel(trk->Channel - 1);
+ dpar->Get(index)->SetChannel(trk->mChannel - 1);
}
}
dpar = trk->DrumParams.NextElem(dpar);
@@ -1804,7 +1804,7 @@
void JZTrackDlg::EditForm(wxPanel* panel)
{
PatchNr = trk->GetPatch() + (trk->GetBank() << 8);
- Device = trk->GetDevice();
+ mDevice = trk->GetDevice();
TrackName = copystring(trk->GetName());
Add(wxMakeFormString(
"Trackname:",
@@ -1829,14 +1829,14 @@
}
Add(wxMakeFormShort(
"Channel",
- &trk->Channel,
+ &trk->mChannel,
wxFORM_DEFAULT,
new wxList(wxMakeConstraintRange(1.0, 16.0), 0)));
AudioMode = trk->GetAudioMode();
Add(wxMakeFormNewLine());
Add(wxMakeFormBool("Audio Track", &AudioMode));
Add(wxMakeFormNewLine());
- Add(wxMakeFormBool("Force channel number onto all events on track", &trk->ForceChannel));
+ Add(wxMakeFormBool("Force channel number onto all events on track", &trk->mForceChannel));
ClearTrack = 0;
Add(wxMakeFormNewLine());
Add(wxMakeFormBool("Clear track (NB! erase all events, name etc...)", &ClearTrack));
@@ -1894,7 +1894,7 @@
mUndoCount(0),
mpDialog(0)
{
- ForceChannel = 1;
+ mForceChannel = 1;
}
//-----------------------------------------------------------------------------
@@ -1908,16 +1908,16 @@
//-----------------------------------------------------------------------------
bool JZTrack::IsDrumTrack()
{
- return Channel == gpConfig->GetValue(C_DrumChannel);
+ return mChannel == gpConfig->GetValue(C_DrumChannel);
}
void JZTrack::Merge(JZEventArray* t)
{
- for (int i = 0; i < t->nEvents; i++)
+ for (int i = 0; i < t->mEventCount; i++)
{
Put(t->mppEvents[i]);
}
- t->nEvents = 0;
+ t->mEventCount = 0;
}
//-----------------------------------------------------------------------------
@@ -1946,12 +1946,12 @@
while (pEvent)
{
JZEvent* c = pEvent->Copy();
- if (ForceChannel)
+ if (mForceChannel)
{
JZChannelEvent* pChannelEvent = c->IsChannelEvent();
if (pChannelEvent)
{
- pChannelEvent->SetChannel(Channel - 1);
+ pChannelEvent->SetChannel(mChannel - 1);
}
}
Put(c);
@@ -1977,7 +1977,7 @@
if (mUndoCount > 0)
{
JZUndoBuffer* undo = &mUndoBuffers[mUndoIndex];
- for (int i = undo->nEvents - 1; i >= 0; i--)
+ for (int i = undo->mEventCount - 1; i >= 0; i--)
{
JZEvent* pEvent = undo->mppEvents[i];
if (undo->bits(i))
@@ -2007,7 +2007,7 @@
mUndoIndex = (mUndoIndex + 1) % MaxUndo;
JZUndoBuffer* undo = &mUndoBuffers[mUndoIndex];
- for (int i = 0; i < undo->nEvents; i++)
+ for (int i = 0; i < undo->mEventCount; i++)
{
JZEvent* pEvent = undo->mppEvents[i];
if (undo->bits(i))
@@ -2131,7 +2131,7 @@
}
if (Value > 0)
{
- JZEvent* pEvent = new JZControlEvent(0, Channel - 1, 0x07, Value - 1);
+ JZEvent* pEvent = new JZControlEvent(0, mChannel - 1, 0x07, Value - 1);
Put(pEvent);
gpMidiPlayer->OutNow(this, pEvent);
}
@@ -2148,7 +2148,7 @@
JZEvent* pEvent = new JZControlEvent(
0,
- Channel - 1,
+ mChannel - 1,
0x07,
mpVolume->GetControlValue());
Put(pEvent);
@@ -2171,7 +2171,7 @@
JZEvent* pEvent = new JZControlEvent(
0,
- Channel - 1,
+ mChannel - 1,
0x07,
mpVolume->GetControlValue());
@@ -2204,7 +2204,7 @@
}
if (Value > 0)
{
- JZEvent* pEvent = new JZControlEvent(0, Channel - 1, 0x0a, Value - 1);
+ JZEvent* pEvent = new JZControlEvent(0, mChannel - 1, 0x0a, Value - 1);
Put(pEvent);
gpMidiPlayer->OutNow(this, pEvent);
}
@@ -2230,7 +2230,7 @@
}
if (Value > 0)
{
- JZEvent* pEvent = new JZControlEvent(0, Channel - 1, 0x5B, Value - 1);
+ JZEvent* pEvent = new JZControlEvent(0, mChannel - 1, 0x5B, Value - 1);
Put(pEvent);
gpMidiPlayer->OutNow(this, pEvent);
}
@@ -2256,7 +2256,7 @@
}
if (Value > 0)
{
- JZEvent* pEvent = new JZControlEvent(0, Channel - 1, 0x5D, Value - 1);
+ JZEvent* pEvent = new JZControlEvent(0, mChannel - 1, 0x5D, Value - 1);
Put(pEvent);
gpMidiPlayer->OutNow(this, pEvent);
}
@@ -2319,7 +2319,7 @@
Value);)
mpBank = new JZControlEvent(
0,
- Channel - 1,
+ mChannel - 1,
gpConfig->GetValue(C_BankControlNumber),
Value);
gpMidiPlayer->OutNow(this, mpBank);
@@ -2333,7 +2333,7 @@
DEBUG(fprintf(stderr, "Double command bank select (Bank %d).\n",Value);)
mpBank = new JZControlEvent(
0,
- Channel - 1,
+ mChannel - 1,
gpConfig->GetValue(C_BankControlNumber),
gpConfig->BankEntry(Value).Command[0]);
gpMidiPlayer->OutNow(this, mpBank);
@@ -2345,7 +2345,7 @@
mpBank->Value);)
mpBank2 = new JZControlEvent(
0,
- Channel - 1,
+ mChannel - 1,
gpConfig->GetValue(C_BankControlNumber2),
gpConfig->BankEntry(Value).Command[1]);
@@ -2381,7 +2381,7 @@
}
if (PatchNr > 0)
{
- mpPatch = new JZProgramEvent(0, Channel - 1, PatchNr - 1);
+ mpPatch = new JZProgramEvent(0, mChannel - 1, PatchNr - 1);
gpMidiPlayer->OutNow(this, mpPatch);
mChanged = true;
}
@@ -2408,7 +2408,7 @@
if (Value > 0)
{
- VibRate = new JZNrpn(0, Channel - 1, 0x01, 0x08, Value - 1);
+ VibRate = new JZNrpn(0, mChannel - 1, 0x01, 0x08, Value - 1);
gpMidiPlayer->OutNow(this, VibRate);
mChanged = true;
}
@@ -2434,7 +2434,7 @@
}
if (Value > 0)
{
- VibDepth = new JZNrpn(0, Channel - 1, 0x01, 0x09, Value - 1);
+ VibDepth = new JZNrpn(0, mChannel - 1, 0x01, 0x09, Value - 1);
gpMidiPlayer->OutNow(this, VibDepth);
mChanged = true;
}
@@ -2461,7 +2461,7 @@
if (Value > 0)
{
- VibDelay = new JZNrpn(0, Channel - 1, 0x01, 0x0a, Value - 1);
+ VibDelay = new JZNrpn(0, mChannel - 1, 0x01, 0x0a, Value - 1);
gpMidiPlayer->OutNow(this, VibDelay);
mChanged = true;
}
@@ -2488,7 +2488,7 @@
if (Value > 0)
{
- Cutoff = new JZNrpn(0, Channel - 1, 0x01, 0x20, Value - 1);
+ Cutoff = new JZNrpn(0, mChannel - 1, 0x01, 0x20, Value - 1);
gpMidiPlayer->OutNow(this, Cutoff);
mChanged = true;
}
@@ -2515,7 +2515,7 @@
if (Value > 0)
{
- Resonance = new JZNrpn(0, Channel - 1, 0x01, 0x21, Value - 1);
+ Resonance = new JZNrpn(0, mChannel - 1, 0x01, 0x21, Value - 1);
gpMidiPlayer->OutNow(this, Resonance);
mChanged = true;
}
@@ -2542,7 +2542,7 @@
if (Value > 0)
{
- EnvAttack = new JZNrpn(0, Channel - 1, 0x01, 0x63, Value - 1);
+ EnvAttack = new JZNrpn(0, mChannel - 1, 0x01, 0x63, Value - 1);
gpMidiPlayer->OutNow(this, EnvAttack);
mChanged = true;
}
@@ -2569,7 +2569,7 @@
if (Value > 0)
{
- EnvDecay = new JZNrpn(0, Channel - 1, 0x01, 0x64, Value - 1);
+ EnvDecay = new JZNrpn(0, mChannel - 1, 0x01, 0x64, Value - 1);
gpMidiPlayer->OutNow(this, EnvDecay);
mChanged = true;
}
@@ -2596,7 +2596,7 @@
if (Value > 0)
{
- EnvRelease = new JZNrpn(0, Channel - 1, 0x01, 0x66, Value - 1);
+ EnvRelease = new JZNrpn(0, mChannel - 1, 0x01, 0x66, Value - 1);
gpMidiPlayer->OutNow(this, EnvRelease);
mChanged = true;
}
@@ -2623,7 +2623,7 @@
if (Value > 0)
{
DrumParams.PutParam(
- new JZNrpn(0, Channel - 1, drumIndex2Param(index), pitch, Value - 1));
+ new JZNrpn(0, mChannel - 1, drumIndex2Param(index), pitch, Value - 1));
gpMidiPlayer->OutNow(this, DrumParams.GetParam(pitch, index));
mChanged = true;
}
@@ -2650,7 +2650,7 @@
if (Value > 0)
{
- BendPitchSens = new JZRpn(0, Channel - 1, 0x00, 0x00, Value - 1);
+ BendPitchSens = new JZRpn(0, mChannel - 1, 0x00, 0x00, Value - 1);
gpMidiPlayer->OutNow(this, BendPitchSens);
mChanged = true;
}
@@ -2679,7 +2679,7 @@
}
if (Value > 0)
{
- JZEvent* pEvent = gpSynth->ModSX(msp, 0, Channel, Value - 1);
+ JZEvent* pEvent = gpSynth->ModSX(msp, 0, mChannel, Value - 1);
if (pEvent)
{
Put(pEvent);
@@ -2711,7 +2711,7 @@
}
if (Value > 0)
{
- JZEvent* pEvent = gpSynth->BendSX(bsp, 0, Channel, Value - 1);
+ JZEvent* pEvent = gpSynth->BendSX(bsp, 0, mChannel, Value - 1);
if (pEvent)
{
Put(pEvent);
@@ -2743,7 +2743,7 @@
}
if (Value > 0)
{
- JZEvent* pEvent = gpSynth->CafSX(csp, 0, Channel, Value - 1);
+ JZEvent* pEvent = gpSynth->CafSX(csp, 0, mChannel, Value - 1);
if (pEvent)
{
Put(pEvent);
@@ -2775,7 +2775,7 @@
}
if (Value > 0)
{
- JZEvent* pEvent = gpSynth->PafSX(psp, 0, Channel, Value - 1);
+ JZEvent* pEvent = gpSynth->PafSX(psp, 0, mChannel, Value - 1);
if (pEvent)
{
Put(pEvent);
@@ -2807,7 +2807,7 @@
}
if (Value > 0)
{
- JZEvent* pEvent = gpSynth->CC1SX(csp, 0, Channel, Value - 1);
+ JZEvent* pEvent = gpSynth->CC1SX(csp, 0, mChannel, Value - 1);
if (pEvent)
{
Put(pEvent);
@@ -2837,7 +2837,7 @@
Kill(CC2Settings[csp]);
if (Value > 0)
{
- JZEvent* pEvent = gpSynth->CC2SX(csp, 0, Channel, Value - 1);
+ JZEvent* pEvent = gpSynth->CC2SX(csp, 0, mChannel, Value - 1);
if (pEvent)
{
Put(pEvent);
@@ -2869,7 +2869,7 @@
}
if (Value > 0)
{
- JZEvent* pEvent = gpSynth->ControllerNumberSX(1, 0, Channel, Value - 1);
+ JZEvent* pEvent = gpSynth->ControllerNumberSX(1, 0, mChannel, Value - 1);
if (pEvent)
{
Put(pEvent);
@@ -2901,7 +2901,7 @@
}
if (Value > 0)
{
- JZEvent* pEvent = gpSynth->ControllerNumberSX(2, 0, Channel, Value - 1);
+ JZEvent* pEvent = gpSynth->ControllerNumberSX(2, 0, mChannel, Value - 1);
if (pEvent)
{
Put(pEvent);
@@ -3121,7 +3121,7 @@
if (rsrv)
{
- JZEvent* pEvent = gpSynth->PartialReserveSX(0, Channel, rsrv);
+ JZEvent* pEvent = gpSynth->PartialReserveSX(0, mChannel, rsrv);
if (pEvent)
{
Put(pEvent);
@@ -3253,10 +3253,10 @@
switch (param)
{
case mspRxChannel:
- pEvent = gpSynth->RxChannelSX(0, Channel, Value - 1);
+ pEvent = gpSynth->RxChannelSX(0, mChannel, Value - 1);
break;
case mspUseForRhythm:
- pEvent = gpSynth->UseForRhythmSX(0, Channel, Value - 1);
+ pEvent = gpSynth->UseForRhythmSX(0, mChannel, Value - 1);
break;
}
@@ -3377,7 +3377,7 @@
// ------------------------- Channel ---------------------------
-void JZTrack::SetChannel(int NewChannel)
+void JZTrack::SetChannel(int Channel)
{
- Channel = NewChannel;
+ mChannel = Channel;
}
Modified: trunk/jazz/src/Track.h
===================================================================
--- trunk/jazz/src/Track.h 2013-03-29 19:45:22 UTC (rev 998)
+++ trunk/jazz/src/Track.h 2013-03-29 19:48:24 UTC (rev 999)
@@ -292,16 +292,16 @@
public:
- JZDrumInstrumentParameter( JZNrpn *par );
- JZNrpn *Get( int index );
- void Put( JZNrpn *par );
- JZDrumInstrumentParameter *Next();
+ JZDrumInstrumentParameter(JZNrpn* par);
+ JZNrpn* Get(int index);
+ void Put( JZNrpn* par);
+ JZDrumInstrumentParameter* Next();
int Pitch();
private:
int mPitch;
- JZNrpn* param[numDrumParameters];
+ JZNrpn* mParam[numDrumParameters];
JZDrumInstrumentParameter* mpNext;
};
@@ -312,25 +312,25 @@
public:
JZDrumInstrumentParameterList()
- : list(0)
+ : mpList(0)
{
}
- JZDrumInstrumentParameter *GetElem( int pit );
- JZNrpn *GetParam( int pit, int index );
- void PutParam( JZNrpn *par );
- void DelParam( int pit, int index );
+ JZDrumInstrumentParameter* GetElem(int pit);
+ JZNrpn* GetParam(int pit, int index);
+ void PutParam(JZNrpn* par);
+ void DelParam(int pit, int index);
JZDrumInstrumentParameter *FirstElem();
- JZDrumInstrumentParameter *NextElem( JZDrumInstrumentParameter *cur );
+ JZDrumInstrumentParameter *NextElem(JZDrumInstrumentParameter *cur );
void DelElem( int pit );
void Clear();
bool IsEmpty() const
{
- return list == 0;
+ return mpList == 0;
}
private:
- JZDrumInstrumentParameter* list;
+ JZDrumInstrumentParameter* mpList;
};
enum tMtcType
@@ -370,10 +370,10 @@
public:
// Actual number of events in **mppEvents.
- int nEvents;
+ int mEventCount;
// Memory allocated in **mppEvents
- int MaxEvents;
+ int mMaxEvents;
JZEvent** mppEvents;
@@ -410,7 +410,7 @@
void Put(JZEvent* pEvent, int killed)
{
- bits.set(nEvents, killed);
+ bits.set(mEventCount, killed);
JZSimpleEventArray::Put(pEvent);
}
@@ -483,9 +483,9 @@
JZDrumInstrumentParameterList DrumParams;
- int Channel; // 1..16, set from first ChannelEvent, 0 = multichannel/nochannel
- int Device; // 0 for tSeq2/Mpu401
- int ForceChannel;
+ int mChannel; // 1..16, set from first ChannelEvent, 0 = multichannel/nochannel
+ int mDevice; // 0 for tSeq2/Mpu401
+ int mForceChannel;
virtual void Clear();
void Cleanup(bool dont_delete_killed_events = 0);
@@ -585,19 +585,19 @@
void SetState(int NewState);
void ToggleState(int Direction); // +1 = next, -1 = prev
- int GetChannel()
+ int GetChannel()
{
- return Channel;
+ return mChannel;
}
void SetChannel(int NewChannel);
int GetDevice() const
{
- return Device;
+ return mDevice;
}
- void SetDevice(int d)
+ void SetDevice(int Device)
{
- Device = d;
+ mDevice = Device;
}
int GetPatch();
@@ -740,7 +740,7 @@
{
mpTrack = pTrack;
mStart = 0;
- mStop = mpTrack->nEvents;
+ mStop = mpTrack->mEventCount;
mActual = mStart;
}
@@ -782,7 +782,7 @@
JZEvent* Range(int FromClock, unsigned ToClock)
{
mStart = mActual = 0;
- mStop = mpTrack->nEvents;
+ mStop = mpTrack->mEventCount;
if (!GreaterEqual(FromClock))
{
Modified: trunk/jazz/src/TrackWindow.cpp
===================================================================
--- trunk/jazz/src/TrackWindow.cpp 2013-03-29 19:45:22 UTC (rev 998)
+++ trunk/jazz/src/TrackWindow.cpp 2013-03-29 19:48:24 UTC (rev 999)
@@ -832,7 +832,7 @@
Value = i + 1;
break;
case eNmMidiChannel:
- Value = pTrack->Channel;
+ Value = pTrack->mChannel;
break;
default:
Value = 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
