Menu
▾
▴
SF.net SVN: jazzplusplus:[1002] trunk/jazz/src
|
From: <pst...@us...> - 2013-04-02 20:28:01
|
Revision: 1002
http://sourceforge.net/p/jazzplusplus/code/1002
Author: pstieber
Date: 2013-04-02 20:27:58 +0000 (Tue, 02 Apr 2013)
Log Message:
-----------
1. Updated some data member names.
2. Updated pointer * location.
3. Removed some white space inside of parentheses.
4. Updated a default argument to Boolean.
Modified Paths:
--------------
trunk/jazz/src/Player.cpp
trunk/jazz/src/Song.cpp
trunk/jazz/src/Track.cpp
trunk/jazz/src/Track.h
Modified: trunk/jazz/src/Player.cpp
===================================================================
--- trunk/jazz/src/Player.cpp 2013-04-02 20:22:45 UTC (rev 1001)
+++ trunk/jazz/src/Player.cpp 2013-04-02 20:27:58 UTC (rev 1002)
@@ -430,9 +430,9 @@
for (j = mspModPitchControl; j < mspModulationSysexParameters; j++)
{
- if (t->ModulationSettings[j])
+ if (t->mpModulationSettings[j])
{
- OutNow(t, t->ModulationSettings[j]);
+ OutNow(t, t->mpModulationSettings[j]);
}
}
@@ -476,9 +476,9 @@
}
}
- if (t->CC1ControllerNr)
+ if (t->mpCC1ControllerNr)
{
- OutNow(t, t->CC1ControllerNr);
+ OutNow(t, t->mpCC1ControllerNr);
}
if (t->CC2ControllerNr)
Modified: trunk/jazz/src/Song.cpp
===================================================================
--- trunk/jazz/src/Song.cpp 2013-04-02 20:22:45 UTC (rev 1001)
+++ trunk/jazz/src/Song.cpp 2013-04-02 20:27:58 UTC (rev 1002)
@@ -357,7 +357,7 @@
bool DoSoloTracksExist = false;
for (i = 0; i < mTrackCount; i++)
{
- if (mTracks[i].State == tsSolo)
+ if (mTracks[i].mState == tsSolo)
{
DoSoloTracksExist = true;
break;
@@ -368,8 +368,8 @@
{
JZTrack* pTrack = &mTracks[i];
if (
- pTrack->State == tsSolo ||
- (!DoSoloTracksExist && pTrack->State == tsPlay))
+ pTrack->mState == tsSolo ||
+ (!DoSoloTracksExist && pTrack->mState == tsPlay))
{
if (pTrack->GetAudioMode() != AudioMode)
{
Modified: trunk/jazz/src/Track.cpp
===================================================================
--- trunk/jazz/src/Track.cpp 2013-04-02 20:22:45 UTC (rev 1001)
+++ trunk/jazz/src/Track.cpp 2013-04-02 20:27:58 UTC (rev 1002)
@@ -520,7 +520,7 @@
mChannel = 0;
mDevice = 0;
mForceChannel = 0;
- State = tsPlay;
+ mState = tsPlay;
Clear();
}
@@ -570,7 +570,7 @@
for (i = 0; i < mspModulationSysexParameters; i++)
{
- ModulationSettings[i] = 0;
+ mpModulationSettings[i] = 0;
}
for (i = 0; i < bspBenderSysexParameters; i++)
@@ -598,7 +598,7 @@
CC2Settings[i] = 0;
}
- CC1ControllerNr = 0;
+ mpCC1ControllerNr = 0;
CC2ControllerNr = 0;
ReverbType = 0;
@@ -641,7 +641,7 @@
mppEvents = 0;
mMaxEvents = 0;
- State = tsPlay;
+ mState = tsPlay;
mAudioMode = false;
}
@@ -697,7 +697,7 @@
for (i = 0; i < mspModulationSysexParameters; i++)
{
- ModulationSettings[i] = 0;
+ mpModulationSettings[i] = 0;
}
for (i = bspBendPitchControl; i < bspBenderSysexParameters; i++)
@@ -725,7 +725,7 @@
CC2Settings[i] = 0;
}
- CC1ControllerNr = 0;
+ mpCC1ControllerNr = 0;
CC2ControllerNr = 0;
ReverbType = 0;
@@ -869,7 +869,7 @@
case SX_GS_ModLfo2Pitch:
case SX_GS_ModLfo2Tvf:
case SX_GS_ModLfo2Tva:
- ModulationSettings[SysExId - SX_GS_ModPitch] = s;
+ mpModulationSettings[SysExId - SX_GS_ModPitch] = s;
break;
case SX_GS_CafPitch:
@@ -956,7 +956,7 @@
break;
case SX_GS_CC1CtrlNo:
- CC1ControllerNr = s;
+ mpCC1ControllerNr = s;
break;
case SX_GS_CC2CtrlNo:
@@ -998,13 +998,13 @@
case SX_XG_ModPitch:
case SX_XG_ModTvf:
case SX_XG_ModAmpl:
- ModulationSettings[SysExId - SX_XG_ModPitch] = s;
+ mpModulationSettings[SysExId - SX_XG_ModPitch] = s;
break;
case SX_XG_ModLfoPitch:
case SX_XG_ModLfoTvf:
case SX_XG_ModLfoTva:
- ModulationSettings[SysExId + 1 - SX_XG_ModPitch] = s;
+ mpModulationSettings[SysExId + 1 - SX_XG_ModPitch] = s;
break;
case SX_XG_CafPitch:
@@ -1068,7 +1068,7 @@
break;
case SX_XG_CC1CtrlNo:
- CC1ControllerNr = s;
+ mpCC1ControllerNr = s;
break;
case SX_XG_CC2CtrlNo:
@@ -1318,7 +1318,7 @@
JZJazzMetaEvent JazzMeta;
JazzMeta.SetAudioMode(mAudioMode);
- JazzMeta.SetTrackState(State);
+ JazzMeta.SetTrackState(mState);
JazzMeta.SetTrackDevice(mDevice);
JazzMeta.SetIntroLength(gpSong->GetIntroLength());
JazzMeta.Write(Io);
@@ -1392,7 +1392,7 @@
{
JZJazzMetaEvent* pJazzMetaEvent = pEvent->IsJazzMeta();
mAudioMode = pJazzMetaEvent->GetAudioMode();
- State = (int)pJazzMetaEvent->GetTrackState();
+ mState = (int)pJazzMetaEvent->GetTrackState();
mDevice = (int)pJazzMetaEvent->GetTrackDevice();
gpSong->SetIntroLength((int)pJazzMetaEvent->GetIntroLength());
delete pJazzMetaEvent;
@@ -2050,7 +2050,7 @@
{
mUndoBuffers[i].Clear();
}
- State = tsPlay;
+ mState = tsPlay;
JZEventArray::Clear();
}
@@ -2661,7 +2661,7 @@
int JZTrack::GetModulationSysex(int msp)
{
const unsigned char* pValue =
- gpSynth->GetSysexValPtr(ModulationSettings[msp]);
+ gpSynth->GetSysexValPtr(mpModulationSettings[msp]);
if (pValue)
{
@@ -2673,9 +2673,9 @@
void JZTrack::SetModulationSysex(int msp, int Value)
{
- if (ModulationSettings[msp])
+ if (mpModulationSettings[msp])
{
- Kill(ModulationSettings[msp]);
+ Kill(mpModulationSettings[msp]);
}
if (Value > 0)
{
@@ -2851,7 +2851,7 @@
int JZTrack::GetCC1ControllerNr()
{
- const unsigned char* pValue = gpSynth->GetSysexValPtr(CC1ControllerNr);
+ const unsigned char* pValue = gpSynth->GetSysexValPtr(mpCC1ControllerNr);
if (pValue)
{
@@ -2863,9 +2863,9 @@
void JZTrack::SetCC1ControllerNr(int Value)
{
- if (CC1ControllerNr)
+ if (mpCC1ControllerNr)
{
- Kill(CC1ControllerNr);
+ Kill(mpCC1ControllerNr);
}
if (Value > 0)
{
@@ -3353,7 +3353,7 @@
const char* JZTrack::GetStateChar()
{
- switch (State)
+ switch (mState)
{
case tsPlay:
return "P";
@@ -3367,12 +3367,12 @@
void JZTrack::SetState(int NewState)
{
- State = NewState % 3;
+ mState = NewState % 3;
}
void JZTrack::ToggleState(int Direction)
{
- State = (State + Direction + 3) % 3;
+ mState = (mState + Direction + 3) % 3;
}
// ------------------------- Channel ---------------------------
Modified: trunk/jazz/src/Track.h
===================================================================
--- trunk/jazz/src/Track.h 2013-04-02 20:22:45 UTC (rev 1001)
+++ trunk/jazz/src/Track.h 2013-04-02 20:27:58 UTC (rev 1002)
@@ -148,7 +148,7 @@
}
};
-unsigned char *SysExDT1(
+unsigned char* SysExDT1(
unsigned char aa,
unsigned char bb,
unsigned char cc,
@@ -294,7 +294,7 @@
JZDrumInstrumentParameter(JZNrpn* par);
JZNrpn* Get(int index);
- void Put( JZNrpn* par);
+ void Put(JZNrpn* par);
JZDrumInstrumentParameter* Next();
int Pitch();
@@ -355,7 +355,7 @@
JZMtcTime(JZMtcOffsetEvent* s); // an mtc offset or mtc full message
JZMtcTime(int millisek, tMtcType t);
- JZMtcTime(char *str, tMtcType t);
+ JZMtcTime(char* str, tMtcType t);
JZMtcTime(unsigned h, unsigned m, unsigned s, unsigned f, unsigned t);
void ToString(std::string& String);
JZMtcOffsetEvent* ToOffset();
@@ -445,14 +445,14 @@
JZSysExEvent* mpReset;
- JZSysExEvent* ModulationSettings[mspModulationSysexParameters];
+ JZSysExEvent* mpModulationSettings[mspModulationSysexParameters];
JZSysExEvent* BenderSettings[bspBenderSysexParameters];
JZSysExEvent* CAfSettings[cspCAfSysexParameters];
JZSysExEvent* PAfSettings[pspPAfSysexParameters];
JZSysExEvent* CC1Settings[cspCC1SysexParameters];
JZSysExEvent* CC2Settings[cspCC2SysexParameters];
- JZSysExEvent* CC1ControllerNr;
+ JZSysExEvent* mpCC1ControllerNr;
JZSysExEvent* CC2ControllerNr;
JZSysExEvent* ReverbType;
@@ -488,7 +488,7 @@
int mForceChannel;
virtual void Clear();
- void Cleanup(bool dont_delete_killed_events = 0);
+ void Cleanup(bool dont_delete_killed_events = false);
void Keyoff2Length();
void Length2Keyoff();
@@ -503,7 +503,7 @@
bool IsEmpty() const;
int GetFirstClock();
- int State; // tsXXX
+ int mState; // tsXXX
public:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
