Menu
▾
▴
SF.net SVN: jazzplusplus:[1004] trunk/jazz/src
|
From: <pst...@us...> - 2013-04-06 17:42:27
|
Revision: 1004
http://sourceforge.net/p/jazzplusplus/code/1004
Author: pstieber
Date: 2013-04-06 17:42:24 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
Updated data member names.
Modified Paths:
--------------
trunk/jazz/src/Events.h
trunk/jazz/src/Player.cpp
trunk/jazz/src/Track.cpp
trunk/jazz/src/Track.h
trunk/jazz/src/mswin/WindowsPlayer.cpp
Modified: trunk/jazz/src/Events.h
===================================================================
--- trunk/jazz/src/Events.h 2013-04-06 17:41:36 UTC (rev 1003)
+++ trunk/jazz/src/Events.h 2013-04-06 17:42:24 UTC (rev 1004)
@@ -1348,18 +1348,6 @@
JZTrackNameEvent(int Clock, unsigned char* pData, unsigned short Length)
: JZMetaEvent(Clock, StatTrackName, pData, Length)
{
-// SN++ Diese Restriktion ist viel zu hart. Es genuegt, den Namen im Mixerdialog
-// zu begrenzen!!!
-/*
-#ifdef wx_motif
- // clip to 16 chars
- if (Length > 16)
- {
- mpData[16] = 0;
- Length = 16;
- }
-#endif
-*/
}
virtual JZTrackNameEvent* IsTrackName()
Modified: trunk/jazz/src/Player.cpp
===================================================================
--- trunk/jazz/src/Player.cpp 2013-04-06 17:41:36 UTC (rev 1003)
+++ trunk/jazz/src/Player.cpp 2013-04-06 17:42:24 UTC (rev 1004)
@@ -290,13 +290,13 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZPlayer::OutNow(JZTrack *t, JZParam *r)
+void JZPlayer::OutNow(JZTrack* pTrack, JZParam *r)
{
- OutNow(t, &r->mMsb);
- OutNow(t, &r->mLsb);
- OutNow(t, &r->mDataMsb);
- OutNow(t, &r->mResetMsb);
- OutNow(t, &r->mResetLsb);
+ OutNow(pTrack, &r->mMsb);
+ OutNow(pTrack, &r->mLsb);
+ OutNow(pTrack, &r->mDataMsb);
+ OutNow(pTrack, &r->mResetMsb);
+ OutNow(pTrack, &r->mResetLsb);
}
//-----------------------------------------------------------------------------
@@ -326,230 +326,230 @@
mpAudioBuffer->Clear();
}
- JZTrack *t;
+ JZTrack* pTrack;
- if ( !Continue )
+ if (!Continue)
{
if (
gpConfig->GetValue(C_SendSynthReset) == 2 ||
((Clock == 0) && (gpConfig->GetValue(C_SendSynthReset) == 1)))
{
// fixme: we should have different synths for each device
- t = mpSong->GetTrack(0);
+ pTrack = mpSong->GetTrack(0);
JZEvent* mpResetEvent = gpSynth->CreateResetEvent();
- OutNow(t, mpResetEvent);
+ OutNow(pTrack, mpResetEvent);
delete mpResetEvent;
}
// Send Volume, Pan, Chorus, etc
for (i = 0; i < mpSong->GetTrackCount(); ++i)
{
- t = mpSong->GetTrack(i);
- if (t->mpBank)
+ pTrack = mpSong->GetTrack(i);
+ if (pTrack->mpBank)
{
- OutNow(t, t->mpBank);
+ OutNow(pTrack, pTrack->mpBank);
}
- if (t->mpBank2)
+ if (pTrack->mpBank2)
{
- OutNow(t, t->mpBank2);
+ OutNow(pTrack, pTrack->mpBank2);
}
- if (t->mpPatch)
+ if (pTrack->mpPatch)
{
- OutNow(t, t->mpPatch);
+ OutNow(pTrack, pTrack->mpPatch);
}
- if (t->mpVolume)
+ if (pTrack->mpVolume)
{
- OutNow(t, t->mpVolume);
+ OutNow(pTrack, pTrack->mpVolume);
}
- if (t->mpPan)
+ if (pTrack->mpPan)
{
- OutNow(t, t->mpPan);
+ OutNow(pTrack, pTrack->mpPan);
}
- if (t->mpReverb)
+ if (pTrack->mpReverb)
{
- OutNow(t, t->mpReverb);
+ OutNow(pTrack, pTrack->mpReverb);
}
- if (t->mpChorus)
+ if (pTrack->mpChorus)
{
- OutNow(t, t->mpChorus);
+ OutNow(pTrack, pTrack->mpChorus);
}
- if (t->VibRate)
+ if (pTrack->mpVibRate)
{
- OutNow(t, t->VibRate);
+ OutNow(pTrack, pTrack->mpVibRate);
}
- if (t->VibDepth)
+ if (pTrack->mpVibDepth)
{
- OutNow(t, t->VibDepth);
+ OutNow(pTrack, pTrack->mpVibDepth);
}
- if (t->VibDelay)
+ if (pTrack->mpVibDelay)
{
- OutNow(t, t->VibDelay);
+ OutNow(pTrack, pTrack->mpVibDelay);
}
- if (t->Cutoff)
+ if (pTrack->mpCutoff)
{
- OutNow(t, t->Cutoff);
+ OutNow(pTrack, pTrack->mpCutoff);
}
- if (t->Resonance)
+ if (pTrack->mpResonance)
{
- OutNow(t, t->Resonance);
+ OutNow(pTrack, pTrack->mpResonance);
}
- if (t->EnvAttack)
+ if (pTrack->mpEnvAttack)
{
- OutNow(t, t->EnvAttack);
+ OutNow(pTrack, pTrack->mpEnvAttack);
}
- if (t->EnvDecay)
+ if (pTrack->mpEnvDecay)
{
- OutNow(t, t->EnvDecay);
+ OutNow(pTrack, pTrack->mpEnvDecay);
}
- if (t->EnvRelease)
+ if (pTrack->mpEnvRelease)
{
- OutNow(t, t->EnvRelease);
+ OutNow(pTrack, pTrack->mpEnvRelease);
}
int j;
- if (!t->DrumParams.IsEmpty())
+ if (!pTrack->mDrumParams.IsEmpty())
{
- JZDrumInstrumentParameter *dpar = t->DrumParams.FirstElem();
+ JZDrumInstrumentParameter *dpar = pTrack->mDrumParams.FirstElem();
while (dpar)
{
- for (j = drumPitchIndex; j < numDrumParameters; j++)
+ for (j = drumPitchIndex; j < numDrumParameters; ++j)
{
if (dpar->Get(j))
{
- OutNow(t, dpar->Get(j));
+ OutNow(pTrack, dpar->Get(j));
}
}
- dpar = t->DrumParams.NextElem( dpar );
+ dpar = pTrack->mDrumParams.NextElem( dpar );
}
}
- if (t->BendPitchSens)
+ if (pTrack->mpBendPitchSens)
{
- OutNow(t, t->BendPitchSens);
+ OutNow(pTrack, pTrack->mpBendPitchSens);
}
- for (j = mspModPitchControl; j < mspModulationSysexParameters; j++)
+ for (j = mspModPitchControl; j < mspModulationSysexParameters; ++j)
{
- if (t->mpModulationSettings[j])
+ if (pTrack->mpModulationSettings[j])
{
- OutNow(t, t->mpModulationSettings[j]);
+ OutNow(pTrack, pTrack->mpModulationSettings[j]);
}
}
- for (j = bspBendPitchControl; j < bspBenderSysexParameters; j++)
+ for (j = bspBendPitchControl; j < bspBenderSysexParameters; ++j)
{
- if (t->BenderSettings[j])
+ if (pTrack->mpBenderSettings[j])
{
- OutNow(t, t->BenderSettings[j]);
+ OutNow(pTrack, pTrack->mpBenderSettings[j]);
}
}
- for (j = cspCAfPitchControl; j < cspCAfSysexParameters; j++)
+ for (j = cspCAfPitchControl; j < cspCAfSysexParameters; ++j)
{
- if (t->CAfSettings[j])
+ if (pTrack->mpCAfSettings[j])
{
- OutNow(t, t->CAfSettings[j]);
+ OutNow(pTrack, pTrack->mpCAfSettings[j]);
}
}
- for (j = pspPAfPitchControl; j < pspPAfSysexParameters; j++)
+ for (j = pspPAfPitchControl; j < pspPAfSysexParameters; ++j)
{
- if (t->PAfSettings[j])
+ if (pTrack->mpPAfSettings[j])
{
- OutNow(t, t->PAfSettings[j]);
+ OutNow(pTrack, pTrack->mpPAfSettings[j]);
}
}
- for (j = cspCC1PitchControl; j < cspCC1SysexParameters; j++)
+ for (j = cspCC1PitchControl; j < cspCC1SysexParameters; ++j)
{
- if (t->CC1Settings[j])
+ if (pTrack->mpCC1Settings[j])
{
- OutNow(t, t->CC1Settings[j]);
+ OutNow(pTrack, pTrack->mpCC1Settings[j]);
}
}
- for (j = cspCC2PitchControl; j < cspCC2SysexParameters; j++)
+ for (j = cspCC2PitchControl; j < cspCC2SysexParameters; ++j)
{
- if (t->CC2Settings[j])
+ if (pTrack->mpCC2Settings[j])
{
- OutNow(t, t->CC2Settings[j]);
+ OutNow(pTrack, pTrack->mpCC2Settings[j]);
}
}
- if (t->mpCC1ControllerNr)
+ if (pTrack->mpCC1ControllerNr)
{
- OutNow(t, t->mpCC1ControllerNr);
+ OutNow(pTrack, pTrack->mpCC1ControllerNr);
}
- if (t->CC2ControllerNr)
+ if (pTrack->mpCC2ControllerNr)
{
- OutNow(t, t->CC2ControllerNr);
+ OutNow(pTrack, pTrack->mpCC2ControllerNr);
}
if (gpConfig->GetValue(C_UseReverbMacro))
{
- if (t->ReverbType)
+ if (pTrack->mpReverbType)
{
- OutNow(t, t->ReverbType);
+ OutNow(pTrack, pTrack->mpReverbType);
}
}
else
{
- for (j = 0; j < rspReverbSysexParameters; j++)
+ for (j = 0; j < rspReverbSysexParameters; ++j)
{
- if (t->ReverbSettings[j])
+ if (pTrack->mpReverbSettings[j])
{
- OutNow(t, t->ReverbSettings[j]);
+ OutNow(pTrack, pTrack->mpReverbSettings[j]);
}
}
}
if (gpConfig->GetValue(C_UseChorusMacro))
{
- if (t->ChorusType)
+ if (pTrack->mpChorusType)
{
- OutNow(t, t->ChorusType);
+ OutNow(pTrack, pTrack->mpChorusType);
}
}
else
{
- for (j = 0; j < cspChorusSysexParameters; j++)
+ for (j = 0; j < cspChorusSysexParameters; ++j)
{
- if (t->ChorusSettings[j])
+ if (pTrack->mpChorusSettings[j])
{
- OutNow(t, t->ChorusSettings[j]);
+ OutNow(pTrack, pTrack->mpChorusSettings[j]);
}
}
}
- if (t->EqualizerType)
+ if (pTrack->mpEqualizerType)
{
- OutNow(t, t->EqualizerType);
+ OutNow(pTrack, pTrack->mpEqualizerType);
}
- if (t->PartialReserve)
+ if (pTrack->mpPartialReserve)
{
- OutNow(t, t->PartialReserve);
+ OutNow(pTrack, pTrack->mpPartialReserve);
}
- if (t->MasterVol)
+ if (pTrack->mpMasterVol)
{
- OutNow(t, t->MasterVol);
+ OutNow(pTrack, pTrack->mpMasterVol);
}
- if (t->MasterPan)
+ if (pTrack->mpMasterPan)
{
- OutNow(t, t->MasterPan);
+ OutNow(pTrack, pTrack->mpMasterPan);
}
- if (t->RxChannel)
+ if (pTrack->mpRxChannel)
{
- OutNow(t, t->RxChannel);
+ OutNow(pTrack, pTrack->mpRxChannel);
}
- if (t->UseForRhythm && *gpSynth->GetSysexValPtr(t->UseForRhythm))
+ if (pTrack->mpUseForRhythm && *gpSynth->GetSysexValPtr(pTrack->mpUseForRhythm ))
{
- OutNow(t, t->UseForRhythm);
+ OutNow(pTrack, pTrack->mpUseForRhythm );
}
} // for
} // if !Continue
- t = mpSong->GetTrack(0);
- JZEvent* pEvent = t->GetCurrentTempo(Clock);
+ pTrack = mpSong->GetTrack(0);
+ JZEvent* pEvent = pTrack->GetCurrentTempo(Clock);
if (pEvent)
{
OutNow(pEvent);
@@ -614,7 +614,7 @@
int ii;
JZKeyOffEvent pKeyOff(0, 0, 0);
- for (ii = 0; ii < mpSong->GetTrackCount(); ii++)
+ for (ii = 0; ii < mpSong->GetTrackCount(); ++ii)
{
JZTrack *Track = mpSong->GetTrack(ii);
if (Track)
@@ -650,9 +650,9 @@
JZControlEvent CtrlRes(0, 0, 0x79, 0);
JZDeviceList &devs = gpMidiPlayer->GetOutputDevices();
- for (unsigned dev = 0; dev < devs.GetCount(); dev++)
+ for (unsigned dev = 0; dev < devs.GetCount(); ++dev)
{
- for (int c = 0; c < 16; c++)
+ for (int c = 0; c < 16; ++c)
{
NoteOff.SetChannel(c);
NoteOff.SetDevice(dev);
@@ -777,7 +777,7 @@
return written;
}
printf("W: ");
- for (i = 0; i < written; i++)
+ for (i = 0; i < written; ++i)
{
printf("%02x ", (unsigned char)buf[i]);
}
@@ -785,7 +785,7 @@
if (written != size)
{
printf("L: ");
- for (i = written; i < size; i++)
+ for (i = written; i < size; ++i)
{
printf("%02x ", (unsigned char)buf[i]);
}
@@ -808,7 +808,7 @@
{
CMD+1, 0x34, /* timing byte always */
CMD+1, 0x8e, /* conductor off */
- CMD+1, 0x8c, /* don't send measures while recording */
+ CMD+1, 0x8c, /* don'pTrack send measures while recording */
CMD+1, 0xe7, DAT+1, 60, /* clock-to-host every 15'th tick (60/4) */
CMD+1, 0x95, /* send clock to host instead */
CMD+1, 0x87, /* pitch+controller enabled */
@@ -827,7 +827,7 @@
CMD+1, 0x39, /* real time to host */
CMD+1, 0x34, /* timing byte always */
CMD+1, 0x8e, /* conductor off */
- CMD+1, 0x8c, /* don't send measures while recording */
+ CMD+1, 0x8c, /* don'pTrack send measures while recording */
CMD+1, 0xe7, DAT+1, 60, /* clock-to-host every 15'th tick (60/4) */
CMD+1, 0x95, /* send clock to host instead */
CMD+1, 0x87, /* pitch+controller enabled */
@@ -849,7 +849,7 @@
clock_to_host_counter = 0;
ActiveTrack = 0;
- for (int i = 0; i < ACTIVE_TRACKS; i++)
+ for (int i = 0; i < ACTIVE_TRACKS; ++i)
{
TrackClock[i] = ExtClock;
TrackRunningStatus[i] = 0;
@@ -1042,7 +1042,7 @@
PlyBytes.Put(ActiveTrack);
PlyBytes.Put(Time);
}
- for (i = 1; i < midi.mByteCount; i++)
+ for (i = 1; i < midi.mByteCount; ++i)
PlyBytes.Put(midi.mBuffer[i]);
TrackClock[ActiveTrack] = pEvent->GetClock();
@@ -1088,7 +1088,7 @@
while (OverFlow)
{
OverFlow = 0;
- for (int i = 0; i < ACTIVE_TRACKS; i++)
+ for (int i = 0; i < ACTIVE_TRACKS; ++i)
{
if ((BreakOver - TrackClock[i]) >= 240)
{
@@ -1117,7 +1117,7 @@
buf[n++] = CMD+1;
buf[n++] = 0xd7;
buf[n++] = DAT + midi.mByteCount;
- for (i = 0; i < midi.mByteCount; i++)
+ for (i = 0; i < midi.mByteCount; ++i)
{
buf[n++] = midi.mBuffer[i];
}
@@ -1149,7 +1149,7 @@
sysex[n++] = 0xdf;
sysex[n++] = DAT + s->Length + 1;
sysex[n++] = StatSysEx;
- for (i = 0; i < s->Length; i++)
+ for (i = 0; i < s->Length; ++i)
{
sysex[n++] = s->Data[i];
}
@@ -1165,7 +1165,7 @@
common[n++] = 0xdf;
common[n++] = DAT + s->Length + 1;
common[n++] = StatSongPtr;
- for (i = 0; i < s->Length; i++)
+ for (i = 0; i < s->Length; ++i)
{
common[n++] = s->Data[i];
}
@@ -1212,8 +1212,10 @@
sysex[n++] = 0xdf;
sysex[n++] = DAT + s->Length + 1;
sysex[n++] = StatSysEx;
- for (int i = 0; i < s->Length; i++)
+ for (int i = 0; i < s->Length; ++i)
+ {
sysex[n++] = s->Data[i];
+ }
write_noack_mpu(sysex, n);
delete[] sysex;
}
@@ -1241,7 +1243,7 @@
{
// CLOCK_TO_HOST received
playclock += CLOCK_TO_HOST_TICKS;
- clock_to_host_counter++;
+ ++clock_to_host_counter;
#ifdef SLOW_MACHINE
// Update screen every 4 beats (120 ticks/beat).
if ((clock_to_host_counter % 32) == 0)
@@ -1276,7 +1278,7 @@
else if (c == 0xf2 || receiving_song_ptr)
{
// Song pointer received
- receiving_song_ptr++;
+ ++receiving_song_ptr;
int ExtClock;
@@ -1325,7 +1327,9 @@
{
c = recbuf[i++];
if (c == 0xf8)
+ {
RecBytes.Clock += 240;
+ }
else if (c < 0xf0)
{
// timing byte
@@ -1614,7 +1618,7 @@
wxString *devs = new wxString[nrsynths];
ninp = 0;
- for (i = 0; i < nrsynths; i++)
+ for (i = 0; i < nrsynths; ++i)
{
si.device = i;
if (ioctl(seqfd, SNDCTL_SYNTH_INFO, &si) == -1)
@@ -1625,7 +1629,7 @@
// if (si.synth_type == SYNTH_TYPE_MIDI || si.synth_type == SYNTH_TYPE_SAMPLE)
{
devs[ninp] = si.name;
- ninp++;
+ ++ninp;
}
}
@@ -1836,7 +1840,7 @@
char buf[N];
buf[0] = (char)0xf0;
i = 1;
- for (j = 0; j < sx->GetDataLength(); j++)
+ for (j = 0; j < sx->GetDataLength(); ++j)
{
if (i == N)
{
Modified: trunk/jazz/src/Track.cpp
===================================================================
--- trunk/jazz/src/Track.cpp 2013-04-06 17:41:36 UTC (rev 1003)
+++ trunk/jazz/src/Track.cpp 2013-04-06 17:42:24 UTC (rev 1004)
@@ -103,94 +103,94 @@
JZMtcTime::JZMtcTime(JZMtcOffsetEvent* pMtcOffset)
{
const unsigned char* pData = pMtcOffset->GetData();
- type = (tMtcType) ((pData[0] & 0x60) >> 5);
- if (type < Mtc24)
+ mType = (tMtcType) ((pData[0] & 0x60) >> 5);
+ if (mType < Mtc24)
{
- type = Mtc24;
+ mType = Mtc24;
}
- if (type > Mtc30Ndf)
+ if (mType > Mtc30Ndf)
{
- type = Mtc30Ndf;
+ mType = Mtc30Ndf;
}
- hour = pData[0] & 0x1f;
- min = pData[1];
- sec = pData[2];
+ mHours = pData[0] & 0x1f;
+ mMinutes = pData[1];
+ mSeconds = pData[2];
fm = pData[3];
}
-JZMtcTime::JZMtcTime(int millisec, tMtcType t)
+JZMtcTime::JZMtcTime(int millisec, tMtcType Type)
{
- type = t;
- if (type < Mtc24)
+ mType = Type;
+ if (mType < Mtc24)
{
- type = Mtc24;
+ mType = Mtc24;
}
- if (type > Mtc30Ndf)
+ if (mType > Mtc30Ndf)
{
- type = Mtc30Ndf;
+ mType = Mtc30Ndf;
}
- sec = millisec / 1000;
+ mSeconds = millisec / 1000;
int msec = millisec % 1000;
- min = sec / 60;
- sec = sec % 60;
- hour = min / 60;
- min = min % 60;
- double frametime = 1000.0 / gFramesPerSecond[type];
+ mMinutes = mSeconds / 60;
+ mSeconds = mSeconds % 60;
+ mHours = mMinutes / 60;
+ mMinutes = mMinutes % 60;
+ double frametime = 1000.0 / gFramesPerSecond[mType];
fm = (int) ((double) msec / frametime);
}
-JZMtcTime::JZMtcTime(char* str, tMtcType t)
- : hour(0),
- min(0),
- sec(0),
+JZMtcTime::JZMtcTime(char* str, tMtcType Type)
+ : mHours(0),
+ mMinutes(0),
+ mSeconds(0),
fm(0)
{
- type = t;
- if (type < Mtc24)
+ mType = Type;
+ if (mType < Mtc24)
{
- type = Mtc24;
+ mType = Mtc24;
}
- if (type > Mtc30Ndf)
+ if (mType > Mtc30Ndf)
{
- type = Mtc30Ndf;
+ mType = Mtc30Ndf;
}
- sscanf(str, "%d:%d:%d.%d", &hour, &min, &sec, &fm);
- if (fm >= gFramesPerSecond[type])
+ sscanf(str, "%d:%d:%d.%d", &mHours, &mMinutes, &mSeconds, &fm);
+ if (fm >= gFramesPerSecond[mType])
{
- fm = (int) gFramesPerSecond[type] - 1;
+ fm = (int) gFramesPerSecond[mType] - 1;
}
}
-JZMtcTime::JZMtcTime(unsigned h, unsigned m, unsigned s, unsigned f, unsigned t)
+JZMtcTime::JZMtcTime(unsigned Hours, unsigned Minutes, unsigned Seconds, unsigned f, unsigned Type)
{
- hour = h;
- min = m;
- sec = s;
+ mHours = Hours;
+ mMinutes = Minutes;
+ mSeconds = Seconds;
fm = f;
- type = (tMtcType) t;
- if (type < Mtc24)
+ mType = (tMtcType) Type;
+ if (mType < Mtc24)
{
- type = Mtc24;
+ mType = Mtc24;
}
- if (type > Mtc30Ndf)
+ if (mType > Mtc30Ndf)
{
- type = Mtc30Ndf;
+ mType = Mtc30Ndf;
}
}
void JZMtcTime::ToString(string& String)
{
ostringstream Oss;
- Oss << hour << ':' << min << ':' << sec << '.' << fm;
+ Oss << mHours << ':' << mMinutes << ':' << mSeconds << '.' << fm;
String = Oss.str();
}
JZMtcOffsetEvent* JZMtcTime::ToOffset()
{
unsigned char* mess = new unsigned char[5];
- mess[0] = (unsigned char) hour | ((unsigned char) type << 5);
- mess[1] = (unsigned char) min;
- mess[2] = (unsigned char) sec;
+ mess[0] = (unsigned char) mHours | ((unsigned char) mType << 5);
+ mess[1] = (unsigned char) mMinutes;
+ mess[2] = (unsigned char) mSeconds;
mess[3] = (unsigned char) fm;
mess[4] = 0x00;
JZMtcOffsetEvent* s = new JZMtcOffsetEvent(0, mess, 5);
@@ -200,8 +200,8 @@
int JZMtcTime::ToMillisec()
{
- int msec = (((((hour * 60L) + min) * 60L) + sec) * 1000L) +
- ((fm * 1000L) / (int) gFramesPerSecond[type]);
+ int msec = (((((mHours * 60) + mMinutes) * 60) + mSeconds) * 1000) +
+ ((fm * 1000) / (int) gFramesPerSecond[mType]);
return msec;
}
@@ -575,64 +575,64 @@
for (i = 0; i < bspBenderSysexParameters; i++)
{
- BenderSettings[i] = 0;
+ mpBenderSettings[i] = 0;
}
for (i = 0; i < cspCAfSysexParameters; i++)
{
- CAfSettings[i] = 0;
+ mpCAfSettings[i] = 0;
}
for (i = 0; i < pspPAfSysexParameters; i++)
{
- PAfSettings[i] = 0;
+ mpPAfSettings[i] = 0;
}
for (i = 0; i < cspCC1SysexParameters; i++)
{
- CC1Settings[i] = 0;
+ mpCC1Settings[i] = 0;
}
for (i = 0; i < cspCC2SysexParameters; i++)
{
- CC2Settings[i] = 0;
+ mpCC2Settings[i] = 0;
}
mpCC1ControllerNr = 0;
- CC2ControllerNr = 0;
+ mpCC2ControllerNr = 0;
- ReverbType = 0;
- ChorusType = 0;
- EqualizerType = 0;
+ mpReverbType = 0;
+ mpChorusType = 0;
+ mpEqualizerType = 0;
for (i = 0; i < rspReverbSysexParameters; i++)
{
- ReverbSettings[i] = 0;
+ mpReverbSettings[i] = 0;
}
for (i = 0; i < cspChorusSysexParameters; i++)
{
- ChorusSettings[i] = 0;
+ mpChorusSettings[i] = 0;
}
- PartialReserve = 0;
- MasterVol = 0;
- MasterPan = 0;
- RxChannel = 0;
- UseForRhythm = 0;
- MtcOffset = 0;
+ mpPartialReserve = 0;
+ mpMasterVol = 0;
+ mpMasterPan = 0;
+ mpRxChannel = 0;
+ mpUseForRhythm = 0;
+ mpMtcOffset = 0;
- VibRate = 0;
- VibDepth = 0;
- VibDelay = 0;
- Cutoff = 0;
- Resonance = 0;
- EnvAttack = 0;
- EnvDecay = 0;
- EnvRelease = 0;
- BendPitchSens = 0;
+ mpVibRate = 0;
+ mpVibDepth = 0;
+ mpVibDelay = 0;
+ mpCutoff = 0;
+ mpResonance = 0;
+ mpEnvAttack = 0;
+ mpEnvDecay = 0;
+ mpEnvRelease = 0;
+ mpBendPitchSens = 0;
- DrumParams.Clear();
+ mDrumParams.Clear();
if (mppEvents)
{
@@ -702,52 +702,52 @@
for (i = bspBendPitchControl; i < bspBenderSysexParameters; i++)
{
- BenderSettings[i] = 0;
+ mpBenderSettings[i] = 0;
}
for (i = 0; i < cspCAfSysexParameters; i++)
{
- CAfSettings[i] = 0;
+ mpCAfSettings[i] = 0;
}
for (i = 0; i < pspPAfSysexParameters; i++)
{
- PAfSettings[i] = 0;
+ mpPAfSettings[i] = 0;
}
for (i = 0; i < cspCC1SysexParameters; i++)
{
- CC1Settings[i] = 0;
+ mpCC1Settings[i] = 0;
}
for (i = 0; i < cspCC2SysexParameters; i++)
{
- CC2Settings[i] = 0;
+ mpCC2Settings[i] = 0;
}
mpCC1ControllerNr = 0;
- CC2ControllerNr = 0;
+ mpCC2ControllerNr = 0;
- ReverbType = 0;
- ChorusType = 0;
- EqualizerType = 0;
+ mpReverbType = 0;
+ mpChorusType = 0;
+ mpEqualizerType = 0;
for (i = 0; i < rspReverbSysexParameters; i++)
{
- ReverbSettings[i] = 0;
+ mpReverbSettings[i] = 0;
}
for (i = 0; i < cspChorusSysexParameters; i++)
{
- ChorusSettings[i] = 0;
+ mpChorusSettings[i] = 0;
}
- PartialReserve = 0;
- MasterVol = 0;
- MasterPan = 0;
- RxChannel = 0;
- UseForRhythm = 0;
- MtcOffset = 0;
+ mpPartialReserve = 0;
+ mpMasterVol = 0;
+ mpMasterPan = 0;
+ mpRxChannel = 0;
+ mpUseForRhythm = 0;
+ mpMtcOffset = 0;
for (i = 0; i < mEventCount; i++)
{
@@ -783,9 +783,9 @@
{
mpSpeed = pEvent->IsSetTempo();
}
- if (!MtcOffset)
+ if (!mpMtcOffset)
{
- MtcOffset = pEvent->IsMtcOffset();
+ mpMtcOffset = pEvent->IsMtcOffset();
}
if ((pControl = pEvent->IsControl()) != 0)
{
@@ -827,7 +827,7 @@
{
case SX_GM_MasterVol:
// GS has its own; SC-55 doesn't recognize GM Mastervol
- MasterVol = s;
+ mpMasterVol = s;
break;
default:
break;
@@ -839,10 +839,10 @@
switch (SysExId)
{
case SX_GS_MasterVol:
- MasterVol = s;
+ mpMasterVol = s;
break;
case SX_GS_MasterPan:
- MasterPan = s;
+ mpMasterPan = s;
break;
case SX_GS_BendPitch:
case SX_GS_BendTvf:
@@ -855,7 +855,7 @@
case SX_GS_BendLfo2Pitch:
case SX_GS_BendLfo2Tvf:
case SX_GS_BendLfo2Tva:
- BenderSettings[SysExId - SX_GS_BendPitch] = s;
+ mpBenderSettings[SysExId - SX_GS_BendPitch] = s;
break;
case SX_GS_ModPitch:
@@ -883,7 +883,7 @@
case SX_GS_CafLfo2Pitch:
case SX_GS_CafLfo2Tvf:
case SX_GS_CafLfo2Tva:
- CAfSettings[SysExId - SX_GS_CafPitch] = s;
+ mpCAfSettings[SysExId - SX_GS_CafPitch] = s;
break;
case SX_GS_PafPitch:
@@ -897,7 +897,7 @@
case SX_GS_PafLfo2Pitch:
case SX_GS_PafLfo2Tvf:
case SX_GS_PafLfo2Tva:
- PAfSettings[SysExId - SX_GS_PafPitch] = s;
+ mpPAfSettings[SysExId - SX_GS_PafPitch] = s;
break;
case SX_GS_CC1Pitch:
@@ -911,7 +911,7 @@
case SX_GS_CC1Lfo2Pitch:
case SX_GS_CC1Lfo2Tvf:
case SX_GS_CC1Lfo2Tva:
- CC1Settings[SysExId - SX_GS_CC1Pitch] = s;
+ mpCC1Settings[SysExId - SX_GS_CC1Pitch] = s;
break;
case SX_GS_CC2Pitch:
@@ -925,11 +925,11 @@
case SX_GS_CC2Lfo2Pitch:
case SX_GS_CC2Lfo2Tvf:
case SX_GS_CC2Lfo2Tva:
- CC2Settings[SysExId - SX_GS_CC2Pitch] = s;
+ mpCC2Settings[SysExId - SX_GS_CC2Pitch] = s;
break;
case SX_GS_ReverbMacro:
- ReverbType = s;
+ mpReverbType = s;
break;
case SX_GS_RevCharacter:
@@ -938,11 +938,11 @@
case SX_GS_RevTime:
case SX_GS_RevDelayFeedback:
case SX_GS_RevSendChorus:
- ReverbSettings[SysExId - SX_GS_RevCharacter] = s;
+ mpReverbSettings[SysExId - SX_GS_RevCharacter] = s;
break;
case SX_GS_ChorusMacro:
- ChorusType = s;
+ mpChorusType = s;
break;
case SX_GS_ChoPreLpf:
@@ -952,7 +952,7 @@
case SX_GS_ChoRate:
case SX_GS_ChoDepth:
case SX_GS_ChoSendReverb:
- ChorusSettings[SysExId - SX_GS_ChoPreLpf] = s;
+ mpChorusSettings[SysExId - SX_GS_ChoPreLpf] = s;
break;
case SX_GS_CC1CtrlNo:
@@ -960,19 +960,19 @@
break;
case SX_GS_CC2CtrlNo:
- CC2ControllerNr = s;
+ mpCC2ControllerNr = s;
break;
case SX_GS_PartialReserve:
- PartialReserve = s;
+ mpPartialReserve = s;
break;
case SX_GS_RxChannel:
- RxChannel = s;
+ mpRxChannel = s;
break;
case SX_GS_UseForRhythm:
- UseForRhythm = s;
+ mpUseForRhythm = s;
break;
default:
@@ -986,13 +986,13 @@
case SX_XG_BendPitch:
case SX_XG_BendTvf:
case SX_XG_BendAmpl:
- BenderSettings[SysExId - SX_XG_BendPitch] = s;
+ mpBenderSettings[SysExId - SX_XG_BendPitch] = s;
break;
case SX_XG_BendLfoPitch:
case SX_XG_BendLfoTvf:
case SX_XG_BendLfoTva:
- BenderSettings[SysExId + 1 - SX_XG_BendPitch] = s;
+ mpBenderSettings[SysExId + 1 - SX_XG_BendPitch] = s;
break;
case SX_XG_ModPitch:
@@ -1010,61 +1010,61 @@
case SX_XG_CafPitch:
case SX_XG_CafTvf:
case SX_XG_CafAmpl:
- CAfSettings[SysExId - SX_XG_CafPitch] = s;
+ mpCAfSettings[SysExId - SX_XG_CafPitch] = s;
break;
case SX_XG_CafLfoPitch:
case SX_XG_CafLfoTvf:
case SX_XG_CafLfoTva:
- CAfSettings[SysExId + 1 - SX_XG_CafPitch] = s;
+ mpCAfSettings[SysExId + 1 - SX_XG_CafPitch] = s;
break;
case SX_XG_PafPitch:
case SX_XG_PafTvf:
case SX_XG_PafAmpl:
- PAfSettings[SysExId - SX_XG_PafPitch] = s;
+ mpPAfSettings[SysExId - SX_XG_PafPitch] = s;
break;
case SX_XG_PafLfoPitch:
case SX_XG_PafLfoTvf:
case SX_XG_PafLfoTva:
- PAfSettings[SysExId + 1 - SX_XG_PafPitch] = s;
+ mpPAfSettings[SysExId + 1 - SX_XG_PafPitch] = s;
break;
case SX_XG_CC1Pitch:
case SX_XG_CC1Tvf:
case SX_XG_CC1Ampl:
- CC1Settings[SysExId - SX_XG_CC1Pitch] = s;
+ mpCC1Settings[SysExId - SX_XG_CC1Pitch] = s;
break;
case SX_XG_CC1LfoPitch:
case SX_XG_CC1LfoTvf:
case SX_XG_CC1LfoTva:
- CC1Settings[SysExId + 1 - SX_XG_CC1Pitch] = s;
+ mpCC1Settings[SysExId + 1 - SX_XG_CC1Pitch] = s;
break;
case SX_XG_CC2Pitch:
case SX_XG_CC2Tvf:
case SX_XG_CC2Ampl:
- CC2Settings[SysExId - SX_XG_CC2Pitch] = s;
+ mpCC2Settings[SysExId - SX_XG_CC2Pitch] = s;
break;
case SX_XG_CC2LfoPitch:
case SX_XG_CC2LfoTvf:
case SX_XG_CC2LfoTva:
- CC2Settings[SysExId + 1 - SX_XG_CC2Pitch] = s;
+ mpCC2Settings[SysExId + 1 - SX_XG_CC2Pitch] = s;
break;
case SX_XG_ReverbMacro:
- ReverbType = s;
+ mpReverbType = s;
break;
case SX_XG_ChorusMacro:
- ChorusType = s;
+ mpChorusType = s;
break;
case SX_XG_EqualizerMacro:
- EqualizerType = s;
+ mpEqualizerType = s;
break;
case SX_XG_CC1CtrlNo:
@@ -1072,15 +1072,15 @@
break;
case SX_XG_CC2CtrlNo:
- CC2ControllerNr = s;
+ mpCC2ControllerNr = s;
break;
case SX_XG_RxChannel:
- RxChannel = s;
+ mpRxChannel = s;
break;
case SX_XG_UseForRhythm:
- UseForRhythm = s;
+ mpUseForRhythm = s;
break;
default:
@@ -1236,9 +1236,9 @@
}
// Write MTC offset before any transmittable events (spec)
- if (MtcOffset)
+ if (mpMtcOffset)
{
- MtcOffset->Write(Io);
+ mpMtcOffset->Write(Io);
}
// Synth reset
@@ -1249,44 +1249,44 @@
// Rpn / Nrpn:
// All these must be written in order (three JZControlEvent's in a row)
- if (VibRate)
+ if (mpVibRate)
{
- VibRate->Write(Io);
+ mpVibRate->Write(Io);
}
- if (VibDepth)
+ if (mpVibDepth)
{
- VibDepth->Write(Io);
+ mpVibDepth->Write(Io);
}
- if (VibDelay)
+ if (mpVibDelay)
{
- VibDelay->Write(Io);
+ mpVibDelay->Write(Io);
}
- if (Cutoff)
+ if (mpCutoff)
{
- Cutoff->Write(Io);
+ mpCutoff->Write(Io);
}
- if (Resonance)
+ if (mpResonance)
{
- Resonance->Write(Io);
+ mpResonance->Write(Io);
}
- if (EnvAttack)
+ if (mpEnvAttack)
{
- EnvAttack->Write(Io);
+ mpEnvAttack->Write(Io);
}
- if (EnvDecay)
+ if (mpEnvDecay)
{
- EnvDecay->Write(Io);
+ mpEnvDecay->Write(Io);
}
- if (EnvRelease)
+ if (mpEnvRelease)
{
- EnvRelease->Write(Io);
+ mpEnvRelease->Write(Io);
}
- if (BendPitchSens)
+ if (mpBendPitchSens)
{
- BendPitchSens->Write(Io);
+ mpBendPitchSens->Write(Io);
}
- JZDrumInstrumentParameter* dpar = DrumParams.FirstElem();
+ JZDrumInstrumentParameter* dpar = mDrumParams.FirstElem();
while (dpar)
{
int index;
@@ -1297,7 +1297,7 @@
dpar->Get(index)->Write(Io);
}
}
- dpar = DrumParams.NextElem(dpar);
+ dpar = mDrumParams.NextElem(dpar);
}
// mpBank: Must be sure bank is written before program:
@@ -1424,51 +1424,51 @@
switch (Lsb)
{
case 0x08:
- if (!VibRate)
+ if (!mpVibRate)
{
- VibRate = new JZNrpn(0, cha, Msb, Lsb, Data);
+ mpVibRate = new JZNrpn(0, cha, Msb, Lsb, Data);
}
break;
case 0x09:
- if (!VibDepth)
+ if (!mpVibDepth)
{
- VibDepth = new JZNrpn(0, cha, Msb, Lsb, Data);
+ mpVibDepth = new JZNrpn(0, cha, Msb, Lsb, Data);
}
break;
case 0x0a:
- if (!VibDelay)
+ if (!mpVibDelay)
{
- VibDelay = new JZNrpn(0, cha, Msb, Lsb, Data);
+ mpVibDelay = new JZNrpn(0, cha, Msb, Lsb, Data);
}
break;
case 0x20:
- if (!Cutoff)
+ if (!mpCutoff)
{
- Cutoff = new JZNrpn(0, cha, Msb, Lsb, Data);
+ mpCutoff = new JZNrpn(0, cha, Msb, Lsb, Data);
}
break;
case 0x21:
- if (!Resonance)
+ if (!mpResonance)
{
- Resonance = new JZNrpn(0, cha, Msb, Lsb, Data);
+ mpResonance = new JZNrpn(0, cha, Msb, Lsb, Data);
}
break;
case 0x63:
- if (!EnvAttack)
+ if (!mpEnvAttack)
{
- EnvAttack = new JZNrpn(0, cha, Msb, Lsb, Data);
+ mpEnvAttack = new JZNrpn(0, cha, Msb, Lsb, Data);
}
break;
case 0x64:
- if (!EnvDecay)
+ if (!mpEnvDecay)
{
- EnvDecay = new JZNrpn(0, cha, Msb, Lsb, Data);
+ mpEnvDecay = new JZNrpn(0, cha, Msb, Lsb, Data);
}
break;
case 0x66:
- if (!EnvRelease)
+ if (!mpEnvRelease)
{
- EnvRelease = new JZNrpn(0, cha, Msb, Lsb, Data);
+ mpEnvRelease = new JZNrpn(0, cha, Msb, Lsb, Data);
}
break;
default:
@@ -1480,15 +1480,15 @@
case drumPan:
case drumReverb:
case drumChorus:
- DrumParams.PutParam(new JZNrpn(0, cha, Msb, Lsb, Data));
+ mDrumParams.PutParam(new JZNrpn(0, cha, Msb, Lsb, Data));
break;
case 0x00: // Rpn
if (Lsb == 0x00)
{
// Pitch Bend Sensivity
- if (!BendPitchSens)
+ if (!mpBendPitchSens)
{
- BendPitchSens = new JZRpn(0, cha, Msb, Lsb, Data);
+ mpBendPitchSens = new JZRpn(0, cha, Msb, Lsb, Data);
}
}
break;
@@ -1736,41 +1736,41 @@
pEvent = Iterator.Next();
} // while pEvent
- if (trk->VibRate)
+ if (trk->mpVibRate)
{
- trk->VibRate->SetChannel(trk->mChannel - 1);
+ trk->mpVibRate->SetChannel(trk->mChannel - 1);
}
- if (trk->VibDepth)
+ if (trk->mpVibDepth)
{
- trk->VibDepth->SetChannel(trk->mChannel - 1);
+ trk->mpVibDepth->SetChannel(trk->mChannel - 1);
}
- if (trk->VibDelay)
+ if (trk->mpVibDelay)
{
- trk->VibDelay->SetChannel(trk->mChannel - 1);
+ trk->mpVibDelay->SetChannel(trk->mChannel - 1);
}
- if (trk->Cutoff)
+ if (trk->mpCutoff)
{
- trk->Cutoff->SetChannel(trk->mChannel - 1);
+ trk->mpCutoff->SetChannel(trk->mChannel - 1);
}
- if (trk->Resonance)
+ if (trk->mpResonance)
{
- trk->Resonance->SetChannel(trk->mChannel - 1);
+ trk->mpResonance->SetChannel(trk->mChannel - 1);
}
- if (trk->EnvAttack)
+ if (trk->mpEnvAttack)
{
- trk->EnvAttack->SetChannel(trk->mChannel - 1);
+ trk->mpEnvAttack->SetChannel(trk->mChannel - 1);
}
- if (trk->EnvDecay)
+ if (trk->mpEnvDecay)
{
- trk->EnvDecay->SetChannel(trk->mChannel - 1);
+ trk->mpEnvDecay->SetChannel(trk->mChannel - 1);
}
- if (trk->EnvRelease)
+ if (trk->mpEnvRelease)
{
- trk->EnvRelease->SetChannel(trk->mChannel - 1);
+ trk->mpEnvRelease->SetChannel(trk->mChannel - 1);
}
- if (trk->BendPitchSens)
+ if (trk->mpBendPitchSens)
{
- trk->BendPitchSens->SetChannel(trk->mChannel - 1);
+ trk->mpBendPitchSens->SetChannel(trk->mChannel - 1);
}
if (trk->mpBank)
{
@@ -1780,9 +1780,9 @@
{
trk->mpPatch->mChannel = trk->mChannel - 1;
}
- if (!trk->DrumParams.IsEmpty())
+ if (!trk->mDrumParams.IsEmpty())
{
- JZDrumInstrumentParameter* dpar = trk->DrumParams.FirstElem();
+ JZDrumInstrumentParameter* dpar = trk->mDrumParams.FirstElem();
while (dpar)
{
for (int index = drumPitchIndex; index < numDrumParameters; ++index)
@@ -1792,7 +1792,7 @@
dpar->Get(index)->SetChannel(trk->mChannel - 1);
}
}
- dpar = trk->DrumParams.NextElem(dpar);
+ dpar = trk->mDrumParams.NextElem(dpar);
}
}
trk->Cleanup();
@@ -2391,25 +2391,25 @@
int JZTrack::GetVibRate()
{
- if (VibRate)
+ if (mpVibRate)
{
- return VibRate->GetVal() + 1;
+ return mpVibRate->GetVal() + 1;
}
return 0;
}
void JZTrack::SetVibRate(int Value)
{
- if (VibRate)
+ if (mpVibRate)
{
- delete VibRate;
- VibRate = 0;
+ delete mpVibRate;
+ mpVibRate = 0;
}
if (Value > 0)
{
- VibRate = new JZNrpn(0, mChannel - 1, 0x01, 0x08, Value - 1);
- gpMidiPlayer->OutNow(this, VibRate);
+ mpVibRate = new JZNrpn(0, mChannel - 1, 0x01, 0x08, Value - 1);
+ gpMidiPlayer->OutNow(this, mpVibRate);
mChanged = true;
}
}
@@ -2418,24 +2418,24 @@
int JZTrack::GetVibDepth()
{
- if (VibDepth)
+ if (mpVibDepth)
{
- return VibDepth->GetVal() + 1;
+ return mpVibDepth->GetVal() + 1;
}
return 0;
}
void JZTrack::SetVibDepth(int Value)
{
- if (VibDepth)
+ if (mpVibDepth)
{
- delete VibDepth;
- VibDepth = 0;
+ delete mpVibDepth;
+ mpVibDepth = 0;
}
if (Value > 0)
{
- VibDepth = new JZNrpn(0, mChannel - 1, 0x01, 0x09, Value - 1);
- gpMidiPlayer->OutNow(this, VibDepth);
+ mpVibDepth = new JZNrpn(0, mChannel - 1, 0x01, 0x09, Value - 1);
+ gpMidiPlayer->OutNow(this, mpVibDepth);
mChanged = true;
}
}
@@ -2444,25 +2444,25 @@
int JZTrack::GetVibDelay()
{
- if (VibDelay)
+ if (mpVibDelay)
{
- return VibDelay->GetVal() + 1;
+ return mpVibDelay->GetVal() + 1;
}
return 0;
}
void JZTrack::SetVibDelay(int Value)
{
- if (VibDelay)
+ if (mpVibDelay)
{
- delete VibDelay;
- VibDelay = 0;
+ delete mpVibDelay;
+ mpVibDelay = 0;
}
if (Value > 0)
{
- VibDelay = new JZNrpn(0, mChannel - 1, 0x01, 0x0a, Value - 1);
- gpMidiPlayer->OutNow(this, VibDelay);
+ mpVibDelay = new JZNrpn(0, mChannel - 1, 0x01, 0x0a, Value - 1);
+ gpMidiPlayer->OutNow(this, mpVibDelay);
mChanged = true;
}
}
@@ -2471,25 +2471,25 @@
int JZTrack::GetCutoff()
{
- if (Cutoff)
+ if (mpCutoff)
{
- return Cutoff->GetVal() + 1;
+ return mpCutoff->GetVal() + 1;
}
return 0;
}
void JZTrack::SetCutoff(int Value)
{
- if (Cutoff)
+ if (mpCutoff)
{
- delete Cutoff;
- Cutoff = 0;
+ delete mpCutoff;
+ mpCutoff = 0;
}
if (Value > 0)
{
- Cutoff = new JZNrpn(0, mChannel - 1, 0x01, 0x20, Value - 1);
- gpMidiPlayer->OutNow(this, Cutoff);
+ mpCutoff = new JZNrpn(0, mChannel - 1, 0x01, 0x20, Value - 1);
+ gpMidiPlayer->OutNow(this, mpCutoff);
mChanged = true;
}
}
@@ -2498,25 +2498,25 @@
int JZTrack::GetResonance()
{
- if (Resonance)
+ if (mpResonance)
{
- return Resonance->GetVal() + 1;
+ return mpResonance->GetVal() + 1;
}
return 0;
}
void JZTrack::SetResonance(int Value)
{
- if (Resonance)
+ if (mpResonance)
{
- delete Resonance;
- Resonance = 0;
+ delete mpResonance;
+ mpResonance = 0;
}
if (Value > 0)
{
- Resonance = new JZNrpn(0, mChannel - 1, 0x01, 0x21, Value - 1);
- gpMidiPlayer->OutNow(this, Resonance);
+ mpResonance = new JZNrpn(0, mChannel - 1, 0x01, 0x21, Value - 1);
+ gpMidiPlayer->OutNow(this, mpResonance);
mChanged = true;
}
}
@@ -2525,25 +2525,25 @@
int JZTrack::GetEnvAttack()
{
- if (EnvAttack)
+ if (mpEnvAttack)
{
- return EnvAttack->GetVal() + 1;
+ return mpEnvAttack->GetVal() + 1;
}
return 0;
}
void JZTrack::SetEnvAttack(int Value)
{
- if (EnvAttack)
+ if (mpEnvAttack)
{
- delete EnvAttack;
- EnvAttack = 0;
+ delete mpEnvAttack;
+ mpEnvAttack = 0;
}
if (Value > 0)
{
- EnvAttack = new JZNrpn(0, mChannel - 1, 0x01, 0x63, Value - 1);
- gpMidiPlayer->OutNow(this, EnvAttack);
+ mpEnvAttack = new JZNrpn(0, mChannel - 1, 0x01, 0x63, Value - 1);
+ gpMidiPlayer->OutNow(this, mpEnvAttack);
mChanged = true;
}
}
@@ -2552,25 +2552,25 @@
int JZTrack::GetEnvDecay()
{
- if (EnvDecay)
+ if (mpEnvDecay)
{
- return EnvDecay->GetVal() + 1;
+ return mpEnvDecay->GetVal() + 1;
}
return 0;
}
void JZTrack::SetEnvDecay(int Value)
{
- if (EnvDecay)
+ if (mpEnvDecay)
{
- delete EnvDecay;
- EnvDecay = 0;
+ delete mpEnvDecay;
+ mpEnvDecay = 0;
}
if (Value > 0)
{
- EnvDecay = new JZNrpn(0, mChannel - 1, 0x01, 0x64, Value - 1);
- gpMidiPlayer->OutNow(this, EnvDecay);
+ mpEnvDecay = new JZNrpn(0, mChannel - 1, 0x01, 0x64, Value - 1);
+ gpMidiPlayer->OutNow(this, mpEnvDecay);
mChanged = true;
}
}
@@ -2579,25 +2579,25 @@
int JZTrack::GetEnvRelease()
{
- if (EnvRelease)
+ if (mpEnvRelease)
{
- return EnvRelease->GetVal() + 1;
+ return mpEnvRelease->GetVal() + 1;
}
return 0;
}
void JZTrack::SetEnvRelease(int Value)
{
- if (EnvRelease)
+ if (mpEnvRelease)
{
- delete EnvRelease;
- EnvRelease = 0;
+ delete mpEnvRelease;
+ mpEnvRelease = 0;
}
if (Value > 0)
{
- EnvRelease = new JZNrpn(0, mChannel - 1, 0x01, 0x66, Value - 1);
- gpMidiPlayer->OutNow(this, EnvRelease);
+ mpEnvRelease = new JZNrpn(0, mChannel - 1, 0x01, 0x66, Value - 1);
+ gpMidiPlayer->OutNow(this, mpEnvRelease);
mChanged = true;
}
}
@@ -2606,9 +2606,9 @@
int JZTrack::GetDrumParam(int pitch, int index)
{
- if (!DrumParams.IsEmpty())
+ if (!mDrumParams.IsEmpty())
{
- JZNrpn* par = DrumParams.GetParam(pitch, index);
+ JZNrpn* par = mDrumParams.GetParam(pitch, index);
if (par)
{
return(par->GetVal() + 1);
@@ -2619,12 +2619,12 @@
void JZTrack::SetDrumParam(int pitch, int index, int Value)
{
- DrumParams.DelParam(pitch, index);
+ mDrumParams.DelParam(pitch, index);
if (Value > 0)
{
- DrumParams.PutParam(
+ mDrumParams.PutParam(
new JZNrpn(0, mChannel - 1, drumIndex2Param(index), pitch, Value - 1));
- gpMidiPlayer->OutNow(this, DrumParams.GetParam(pitch, index));
+ gpMidiPlayer->OutNow(this, mDrumParams.GetParam(pitch, index));
mChanged = true;
}
}
@@ -2633,25 +2633,25 @@
int JZTrack::GetBendPitchSens()
{
- if (BendPitchSens)
+ if (mpBendPitchSens)
{
- return BendPitchSens->GetVal() + 1;
+ return mpBendPitchSens->GetVal() + 1;
}
return 0;
}
void JZTrack::SetBendPitchSens(int Value)
{
- if (BendPitchSens)
+ if (mpBendPitchSens)
{
- delete BendPitchSens;
- BendPitchSens = 0;
+ delete mpBendPitchSens;
+ mpBendPitchSens = 0;
}
if (Value > 0)
{
- BendPitchSens = new JZRpn(0, mChannel - 1, 0x00, 0x00, Value - 1);
- gpMidiPlayer->OutNow(this, BendPitchSens);
+ mpBendPitchSens = new JZRpn(0, mChannel - 1, 0x00, 0x00, Value - 1);
+ gpMidiPlayer->OutNow(this, mpBendPitchSens);
mChanged = true;
}
}
@@ -2693,7 +2693,7 @@
int JZTrack::GetBenderSysex(int bsp)
{
- const unsigned char* pValue = gpSynth->GetSysexValPtr(BenderSettings[bsp]);
+ const unsigned char* pValue = gpSynth->GetSysexValPtr(mpBenderSettings[bsp]);
if (pValue)
{
@@ -2705,9 +2705,9 @@
void JZTrack::SetBenderSysex(int bsp, int Value)
{
- if (BenderSettings[bsp])
+ if (mpBenderSettings[bsp])
{
- Kill(BenderSettings[bsp]);
+ Kill(mpBenderSettings[bsp]);
}
if (Value > 0)
{
@@ -2725,7 +2725,7 @@
int JZTrack::GetCAfSysex(int csp)
{
- const unsigned char* pValue = gpSynth->GetSysexValPtr(CAfSettings[csp]);
+ const unsigned char* pValue = gpSynth->GetSysexValPtr(mpCAfSettings[csp]);
if (pValue)
{
@@ -2737,9 +2737,9 @@
void JZTrack::SetCAfSysex(int csp, int Value)
{
- if (CAfSettings[csp])
+ if (mpCAfSettings[csp])
{
- Kill(CAfSettings[csp]);
+ Kill(mpCAfSettings[csp]);
}
if (Value > 0)
{
@@ -2757,7 +2757,7 @@
int JZTrack::GetPAfSysex(int psp)
{
- const unsigned char* pValue = gpSynth->GetSysexValPtr(PAfSettings[psp]);
+ const unsigned char* pValue = gpSynth->GetSysexValPtr(mpPAfSettings[psp]);
if (pValue)
{
@@ -2769,9 +2769,9 @@
void JZTrack::SetPAfSysex(int psp, int Value)
{
- if (PAfSettings[psp])
+ if (mpPAfSettings[psp])
{
- Kill(PAfSettings[psp]);
+ Kill(mpPAfSettings[psp]);
}
if (Value > 0)
{
@@ -2789,7 +2789,7 @@
int JZTrack::GetCC1Sysex(int csp)
{
- const unsigned char* pValue = gpSynth->GetSysexValPtr(CC1Settings[csp]);
+ const unsigned char* pValue = gpSynth->GetSysexValPtr(mpCC1Settings[csp]);
if (pValue)
{
@@ -2801,9 +2801,9 @@
void JZTrack::SetCC1Sysex(int csp, int Value)
{
- if (CC1Settings[csp])
+ if (mpCC1Settings[csp])
{
- Kill(CC1Settings[csp]);
+ Kill(mpCC1Settings[csp]);
}
if (Value > 0)
{
@@ -2821,7 +2821,7 @@
int JZTrack::GetCC2Sysex(int csp)
{
- const unsigned char* pValue = gpSynth->GetSysexValPtr(CC2Settings[csp]);
+ const unsigned char* pValue = gpSynth->GetSysexValPtr(mpCC2Settings[csp]);
if (pValue)
{
@@ -2833,8 +2833,10 @@
void JZTrack::SetCC2Sysex(int csp, int Value)
{
- if (CC2Settings[csp])
- Kill(CC2Settings[csp]);
+ if (mpCC2Settings[csp])
+ {
+ Kill(mpCC2Settings[csp]);
+ }
if (Value > 0)
{
JZEvent* pEvent = gpSynth->CC2SX(csp, 0, mChannel, Value - 1);
@@ -2883,7 +2885,7 @@
int JZTrack::GetCC2ControllerNr()
{
- const unsigned char* pValue = gpSynth->GetSysexValPtr(CC2ControllerNr);
+ const unsigned char* pValue = gpSynth->GetSysexValPtr(mpCC2ControllerNr);
if (pValue)
{
@@ -2895,9 +2897,9 @@
void JZTrack::SetCC2ControllerNr(int Value)
{
- if (CC2ControllerNr)
+ if (mpCC2ControllerNr)
{
- Kill(CC2ControllerNr);
+ Kill(mpCC2ControllerNr);
}
if (Value > 0)
{
@@ -2915,7 +2917,7 @@
int JZTrack::GetReverbType(int lsb)
{
- const unsigned char* pValue = gpSynth->GetSysexValPtr(ReverbType);
+ const unsigned char* pValue = gpSynth->GetSysexValPtr(mpReverbType);
if (pValue)
{
@@ -2931,9 +2933,9 @@
void JZTrack::SetReverbType(int Value, int lsb)
{
- if (ReverbType)
+ if (mpReverbType)
{
- Kill(ReverbType);
+ Kill(mpReverbType);
}
if (Value > 0)
@@ -2955,7 +2957,7 @@
int JZTrack::GetChorusType(int lsb)
{
- const unsigned char* pValue = gpSynth->GetSysexValPtr(ChorusType);
+ const unsigned char* pValue = gpSynth->GetSysexValPtr(mpChorusType);
if (pValue)
{
@@ -2972,9 +2974,9 @@
void JZTrack::SetChorusType(int Value, int lsb)
{
- if (ChorusType)
+ if (mpChorusType)
{
- Kill(ChorusType);
+ Kill(mpChorusType);
}
if (Value > 0)
@@ -2996,7 +2998,7 @@
int JZTrack::GetEqualizerType()
{
- const unsigned char* pValue = gpSynth->GetSysexValPtr(EqualizerType);
+ const unsigned char* pValue = gpSynth->GetSysexValPtr(mpEqualizerType);
if (pValue)
{
@@ -3008,9 +3010,9 @@
void JZTrack::SetEqualizerType(int Value)
{
- if (EqualizerType)
+ if (mpEqualizerType)
{
- Kill(EqualizerType);
+ Kill(mpEqualizerType);
}
if (Value > 0)
@@ -3029,7 +3031,7 @@
int JZTrack::GetRevSysex(int rsp)
{
- const unsigned char* pValue = gpSynth->GetSysexValPtr(ReverbSettings[rsp]);
+ const unsigned char* pValue = gpSynth->GetSysexValPtr(mpReverbSettings[rsp]);
if (pValue)
{
@@ -3041,9 +3043,9 @@
void JZTrack::SetRevSysex(int rsp, int Value)
{
- if (ReverbSettings[rsp])
+ if (mpReverbSettings[rsp])
{
- Kill(ReverbSettings[rsp]);
+ Kill(mpReverbSettings[rsp]);
}
if (Value > 0)
@@ -3065,7 +3067,7 @@
int JZTrack::GetChoSysex(int csp)
{
- const unsigned char* pValue = gpSynth->GetSysexValPtr(ChorusSettings[csp]);
+ const unsigned char* pValue = gpSynth->GetSysexValPtr(mpChorusSettings[csp]);
if (pValue)
{
@@ -3077,9 +3079,9 @@
void JZTrack::SetChoSysex(int csp, int Value)
{
- if (ChorusSettings[csp])
+ if (mpChorusSettings[csp])
{
- Kill(ChorusSettings[csp]);
+ Kill(mpChorusSettings[csp]);
}
if (Value > 0)
@@ -3102,7 +3104,7 @@
int JZTrack::GetPartRsrv(int chan)
{
- const unsigned char* pValue = gpSynth->GetSysexValPtr(PartialReserve);
+ const unsigned char* pValue = gpSynth->GetSysexValPtr(mpPartialReserve);
if (pValue)
{
@@ -3114,9 +3116,9 @@
void JZTrack::SetPartRsrv(unsigned char* rsrv)
{
- if (PartialReserve)
+ if (mpPartialReserve)
{
- Kill(PartialReserve);
+ Kill(mpPartialReserve);
}
if (rsrv)
@@ -3135,11 +3137,11 @@
int JZTrack::GetMasterVol()
{
- const unsigned char* pValue = gpSynth->GetSysexValPtr(MasterVol);
+ const unsigned char* pValue = gpSynth->GetSysexValPtr(mpMasterVol);
if (pValue)
{
- if (gpSynth->GetSysexId(MasterVol) == SX_GM_MasterVol)
+ if (gpSynth->GetSysexId(mpMasterVol) == SX_GM_MasterVol)
{
// first data byte is lsb; get msb instead!
++pValue;
@@ -3153,9 +3155,9 @@
void JZTrack::SetMasterVol(int Value)
{
- if (MasterVol)
+ if (mpMasterVol)
{
- Kill(MasterVol);
+ Kill(mpMasterVol);
}
if (Value > 0)
{
@@ -3174,7 +3176,7 @@
int JZTrack::GetMasterPan()
{
- const unsigned char* pValue = gpSynth->GetSysexValPtr(MasterPan);
+ const unsigned char* pValue = gpSynth->GetSysexValPtr(mpMasterPan);
if (pValue)
{
@@ -3186,9 +3188,9 @@
void JZTrack::SetMasterPan(int Value)
{
- if (MasterPan)
+ if (mpMasterPan)
{
- Kill(MasterPan);
+ Kill(mpMasterPan);
}
if (Value > 0)
{
@@ -3211,11 +3213,11 @@
switch (param)
{
case mspRxChannel:
- pValue = gpSynth->GetSysexValPtr(RxChannel);
+ pValue = gpSynth->GetSysexValPtr(mpRxChannel);
break;
case mspUseForRhythm:
- pValue = gpSynth->GetSysexValPtr(UseForRhythm);
+ pValue = gpSynth->GetSysexValPtr(mpUseForRhythm );
break;
}
@@ -3232,16 +3234,16 @@
switch (param)
{
case mspRxChannel:
- if (RxChannel)
+ if (mpRxChannel)
{
- Kill(RxChannel);
+ Kill(mpRxChannel);
}
break;
case mspUseForRhythm:
- if (UseForRhythm)
+ if (mpUseForRhythm )
{
- Kill(UseForRhythm);
+ Kill(mpUseForRhythm );
}
break;
}
@@ -3273,18 +3275,18 @@
JZMtcTime* JZTrack::GetMtcOffset()
{
- if (MtcOffset)
+ if (mpMtcOffset)
{
- return new JZMtcTime(MtcOffset);
+ return new JZMtcTime(mpMtcOffset);
}
return(new JZMtcTime(0, Mtc30Ndf));
}
void JZTrack::SetMtcOffset(JZMtcTime* mtc)
{
- if (MtcOffset)
+ if (mpMtcOffset)
{
- Kill(MtcOffset);
+ Kill(mpMtcOffset);
}
if (mtc)
{
Modified: trunk/jazz/src/Track.h
===================================================================
--- trunk/jazz/src/Track.h 2013-04-06 17:41:36 UTC (rev 1003)
+++ trunk/jazz/src/Track.h 2013-04-06 17:42:24 UTC (rev 1004)
@@ -320,8 +320,8 @@
void PutParam(JZNrpn* par);
void DelParam(int pit, int index);
JZDrumInstrumentParameter *FirstElem();
- JZDrumInstrumentParameter *NextElem(JZDrumInstrumentParameter *cur );
- void DelElem( int pit );
+ JZDrumInstrumentParameter *NextElem(JZDrumInstrumentParameter *cur);
+ void DelElem(int pit);
void Clear();
bool IsEmpty() const
{
@@ -347,19 +347,25 @@
{
public:
- tMtcType type;
- int hour;
- int min;
- int sec;
- int fm;
-
JZMtcTime(JZMtcOffsetEvent* s); // an mtc offset or mtc full message
JZMtcTime(int millisek, tMtcType t);
JZMtcTime(char* str, tMtcType t);
+ tMtcType GetType() const
+ {
+ return mType;
+ }
JZMtcTime(unsigned h, unsigned m, unsigned s, unsigned f, unsigned t);
void ToString(std::string& String);
JZMtcOffsetEvent* ToOffset();
int ToMillisec();
+
+ private:
+
+ tMtcType mType;
+ int mHours;
+ int mMinutes;
+ int mSeconds;
+ int fm;
};
@@ -446,45 +452,45 @@
JZSysExEvent* mpReset;
JZSysExEvent* mpModulationSettings[mspModulationSysexParameters];
- JZSysExEvent* BenderSettings[bspBenderSysexParameters];
- JZSysExEvent* CAfSettings[cspCAfSysexParameters];
- JZSysExEvent* PAfSettings[pspPAfSysexParameters];
- JZSysExEvent* CC1Settings[cspCC1SysexParameters];
- JZSysExEvent* CC2Settings[cspCC2SysexParameters];
+ JZSysExEvent* mpBenderSettings[bspBenderSysexParameters];
+ JZSysExEvent* mpCAfSettings[cspCAfSysexParameters];
+ JZSysExEvent* mpPAfSettings[pspPAfSysexParameters];
+ JZSysExEvent* mpCC1Settings[cspCC1SysexParameters];
+ JZSysExEvent* mpCC2Settings[cspCC2SysexParameters];
JZSysExEvent* mpCC1ControllerNr;
- JZSysExEvent* CC2ControllerNr;
+ JZSysExEvent* mpCC2ControllerNr;
- JZSysExEvent* ReverbType;
- JZSysExEvent* ChorusType;
- JZSysExEvent* EqualizerType;
+ JZSysExEvent* mpReverbType;
+ JZSysExEvent* mpChorusType;
+ JZSysExEvent* mpEqualizerType;
- JZSysExEvent* ReverbSettings[rspReverbSysexParameters];
- JZSysExEvent* ChorusSettings[cspChorusSysexParameters];
+ JZSysExEvent* mpReverbSettings[rspReverbSysexParameters];
+ JZSysExEvent* mpChorusSettings[cspChorusSysexParameters];
- JZSysExEvent* PartialReserve;
- JZSysExEvent* MasterVol;
- JZSysExEvent* MasterPan;
+ JZSysExEvent* mpPartialReserve;
+ JZSysExEvent* mpMasterVol;
+ JZSysExEvent* mpMasterPan;
- JZSysExEvent* RxChannel;
- JZSysExEvent* UseForRhythm;
+ JZSysExEvent* mpRxChannel;
+ JZSysExEvent* mpUseForRhythm ;
- JZMtcOffsetEvent* MtcOffset;
+ JZMtcOffsetEvent* mpMtcOffset;
- JZNrpn* VibRate;
- JZNrpn* VibDepth;
- JZNrpn* VibDelay;
- JZNrpn* Cutoff;
- JZNrpn* Resonance;
- JZNrpn* EnvAttack;
- JZNrpn* EnvDecay;
- JZNrpn* EnvRelease;
- JZRpn* BendPitchSens;
+ JZNrpn* mpVibRate;
+ JZNrpn* mpVibDepth;
+ JZNrpn* mpVibDelay;
+ JZNrpn* mpCutoff;
+ JZNrpn* mpResonance;
+ JZNrpn* mpEnvAttack;
+ JZNrpn* mpEnvDecay;
+ JZNrpn* mpEnvRelease;
+ JZRpn* mpBendPitchSens;
- JZDrumInstrumentParameterList DrumParams;
+ JZDrumInstrumentParameterList mDrumParams;
int mChannel; // 1..16, set from first ChannelEvent, 0 = multichannel/nochannel
- int mDevice; // 0 for tSeq2/Mpu401
+ int mDevice; // 0 for JZSeq2Player/JZMpuPlayer
int mForceChannel;
virtual void Clear();
@@ -576,7 +582,7 @@
void Cleanup();
const char* GetName();
- void SetName(const char *Name);
+ void SetName(const char* Name);
const char* GetCopyright();
void SetCopyright(char *Copyright);
@@ -647,23 +653,23 @@
int GetBendPitchSens();
void SetBendPitchSens(int BendPitchSens);
- int GetModulationSysex( int msp );
- void SetModulationSysex( int msp, int value);
+ int GetModulationSysex(int msp);
+ void SetModulationSysex(int msp, int value);
- int GetBenderSysex( int bsp );
- void SetBenderSysex( int bsp, int value);
+ int GetBenderSysex(int bsp);
+ void SetBenderSysex(int bsp, int value);
- int GetCAfSysex( int csp );
- void SetCAfSysex( int csp, int value);
+ int GetCAfSysex(int csp);
+ void SetCAfSysex(int csp, int value);
- int GetPAfSysex( int psp );
- void SetPAfSysex( int psp, int value);
+ int GetPAfSysex(int psp);
+ void SetPAfSysex(int psp, int value);
- int GetCC1Sysex( int csp );
- void SetCC1Sysex( int csp, int value);
+ int GetCC1Sysex(int csp);
+ void SetCC1Sysex(int csp, int value);
- int GetCC2Sysex( int csp );
- void SetCC2Sysex( int csp, int value);
+ int GetCC2Sysex(int csp);
+ void SetCC2Sysex(int csp, int value);
int GetCC1ControllerNr();
void SetCC1ControllerNr(int ctrlno);
@@ -680,11 +686,11 @@
int GetEqualizerType();
void SetEqualizerType(int EqualizerType);
- int GetRevSysex( int rsp );
- void SetRevSysex( int rsp, int value);
+ int GetRevSysex(int rsp);
+ void SetRevSysex(int rsp, int value);
- int GetChoSysex( int csp );
- void SetChoSysex( int csp, int value);
+ int GetChoSysex(int csp);
+ void SetChoSysex(int csp, int value);
int GetBank();
void SetBank(int Bank);
@@ -702,14 +708,14 @@
int GetMasterPan();
void SetMasterPan(int MasterPan);
- int GetPartRsrv( int chan );
- void SetPartRsrv( unsigned char *rsrv );
+ int GetPartRsrv(int chan);
+ void SetPartRsrv(unsigned char* rsrv);
- int GetModeSysex( int param );
- void SetModeSysex( int param, int value);
+ int GetModeSysex(int param);
+ void SetModeSysex(int param, int value);
JZMtcTime* GetMtcOffset();
- void SetMtcOffset( JZMtcTime* mtc );
+ void SetMtcOffset(JZMtcTime* mtc);
private:
Modified: trunk/jazz/src/mswin/WindowsPlayer.cpp
===================================================================
--- trunk/jazz/src/mswin/WindowsPlayer.cpp 2013-04-06 17:41:36 UTC (rev 1003)
+++ trunk/jazz/src/mswin/WindowsPlayer.cpp 2013-04-06 17:42:24 UTC (rev 1004)
@@ -627,11 +627,11 @@
}
if (!Continue)
{
- JZMtcTime *offs = mpSong->GetTrack(0)->GetMtcOffset();
- mpState->start_time = offs->ToMillisec();
+ JZMtcTime* pMtcOffset = mpSong->GetTrack(0)->GetMtcOffset();
+ mpState->start_time = pMtcOffset->ToMillisec();
real_start_time = mpState->start_time;
- mpState->mtc_start.type = offs->type;
- delete offs;
+ mpState->mtc_start.type = pMtcOffset->GetType();
+ delete pMtcOffset;
mpState->start_clock = 0;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
