Menu
▾
▴
SF.net SVN: jazzplusplus:[694] trunk/jazz/src
|
From: <pst...@us...> - 2009-01-20 05:51:24
|
Revision: 694
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=694&view=rev
Author: pstieber
Date: 2009-01-20 05:51:17 +0000 (Tue, 20 Jan 2009)
Log Message:
-----------
1. Changed Destin to pDestin in JZSong.
2. Changed buf to pEventArray in JZPlayer.
3. Added mPlayBuffer.Clear() and mRecdBuffer.Clear() calls to ~JZPlayer.
4. Prefixed several JZTrack data members with mp.
5. Fixed a leak of end-of-track events in tSimpleEventArray::RemoveEOT.
Modified Paths:
--------------
trunk/jazz/src/Player.cpp
trunk/jazz/src/Player.h
trunk/jazz/src/Song.cpp
trunk/jazz/src/Track.cpp
trunk/jazz/src/Track.h
trunk/jazz/src/TrackWindow.cpp
Modified: trunk/jazz/src/Player.cpp
===================================================================
--- trunk/jazz/src/Player.cpp 2009-01-20 05:45:55 UTC (rev 693)
+++ trunk/jazz/src/Player.cpp 2009-01-20 05:51:17 UTC (rev 694)
@@ -136,13 +136,13 @@
// Copy events from the passed song to output buffer.
//-----------------------------------------------------------------------------
void tPlayLoop::PrepareOutput(
- tEventArray* buf,
+ tEventArray* pEventArray,
JZSong* pSong,
long ExtFr,
long ExtTo,
int Mode)
{
- if (buf == 0)
+ if (pEventArray == 0)
{
return;
}
@@ -155,7 +155,7 @@
pSong->MergeTracks(
From,
mStopClock,
- buf,
+ pEventArray,
gpProject->GetMetronomeInfo(),
Delta,
Mode);
@@ -170,7 +170,7 @@
pSong->MergeTracks(
From,
From + Size,
- buf,
+ pEventArray,
gpProject->GetMetronomeInfo(),
Delta,
Mode);
@@ -199,6 +199,8 @@
JZPlayer::~JZPlayer()
{
delete PlayLoop;
+ mPlayBuffer.Clear();
+ mRecdBuffer.Clear();
}
//-----------------------------------------------------------------------------
@@ -229,7 +231,7 @@
Clock = PlayLoop->Int2ExtClock(Clock);
mPlayBuffer.Clear();
- RecdBuffer.Clear();
+ mRecdBuffer.Clear();
if (AudioBuffer)
{
AudioBuffer->Clear();
@@ -262,25 +264,25 @@
{
OutNow(t, t->mpBank2);
}
- if (t->mPatch)
+ if (t->mpPatch)
{
- OutNow(t, t->mPatch);
+ OutNow(t, t->mpPatch);
}
- if (t->Volume)
+ if (t->mpVolume)
{
- OutNow(t, t->Volume);
+ OutNow(t, t->mpVolume);
}
- if (t->Pan)
+ if (t->mpPan)
{
- OutNow(t, t->Pan);
+ OutNow(t, t->mpPan);
}
- if (t->Reverb)
+ if (t->mpReverb)
{
- OutNow(t, t->Reverb);
+ OutNow(t, t->mpReverb);
}
- if (t->Chorus)
+ if (t->mpChorus)
{
- OutNow(t, t->Chorus);
+ OutNow(t, t->mpChorus);
}
if (t->VibRate)
{
@@ -700,7 +702,7 @@
#if DB_WRITE
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-int dwrite(int dev, const char *buf, int size)
+int dwrite(int dev, const char* buf, int size)
{
int i, written;
//dev = 2; // stderr
@@ -864,7 +866,7 @@
// Get record buffer
GetRecordedData();
- RecdBuffer.Keyoff2Length();
+ mRecdBuffer.Keyoff2Length();
}
//-----------------------------------------------------------------------------
@@ -1046,7 +1048,7 @@
tGetMidiBytes midi;
if (pEvent->Write(midi) == 0)
{
- char *buf = new char[midi.nBytes + 3];
+ char* buf = new char[midi.nBytes + 3];
buf[n++] = CMD+1;
buf[n++] = 0xd7;
buf[n++] = DAT+midi.nBytes;
@@ -1329,7 +1331,7 @@
if (pEvent)
{
pEvent->Clock = PlayLoop->Ext2IntClock(pEvent->Clock);
- RecdBuffer.Put(pEvent);
+ mRecdBuffer.Put(pEvent);
}
}
else if (c == 0xfc)
@@ -1923,7 +1925,7 @@
through = new tOSSThru();
}
JZProjectManager::Instance()->NewPlayPosition(-1);
- RecdBuffer.Keyoff2Length();
+ mRecdBuffer.Keyoff2Length();
}
//-----------------------------------------------------------------------------
@@ -2053,7 +2055,7 @@
if (pEvent)
{
pEvent->SetClock(PlayLoop->Ext2IntClock(recd_clock));
- RecdBuffer.Put(pEvent);
+ mRecdBuffer.Put(pEvent);
pEvent = 0;
}
Modified: trunk/jazz/src/Player.h
===================================================================
--- trunk/jazz/src/Player.h 2009-01-20 05:45:55 UTC (rev 693)
+++ trunk/jazz/src/Player.h 2009-01-20 05:51:17 UTC (rev 694)
@@ -59,7 +59,7 @@
long Int2ExtClock(long Clock);
void PrepareOutput(
- tEventArray* buf,
+ tEventArray* pEventArray,
JZSong* pSong,
long ExtFr,
long ExtTo,
@@ -154,7 +154,7 @@
JZSong *Song;
tEventArray mPlayBuffer;
- tEventArray RecdBuffer;
+ tEventArray mRecdBuffer;
void SetRecordInfo(JZRecordingInfo* inf)
{
rec_info = inf;
Modified: trunk/jazz/src/Song.cpp
===================================================================
--- trunk/jazz/src/Song.cpp 2009-01-20 05:45:55 UTC (rev 693)
+++ trunk/jazz/src/Song.cpp 2009-01-20 05:51:17 UTC (rev 694)
@@ -341,7 +341,7 @@
void JZSong::MergeTracks(
int FrClock,
int ToClock,
- tEventArray* Destin,
+ tEventArray* pDestin,
const JZMetronomeInfo& MetronomeInfo,
int delta,
int mode)
@@ -349,7 +349,7 @@
// Make metronome
if (MetronomeInfo.IsOn())
{
- MakeMetronome(FrClock, ToClock, Destin, MetronomeInfo, delta);
+ MakeMetronome(FrClock, ToClock, pDestin, MetronomeInfo, delta);
}
// Find solo-tracks.
@@ -383,11 +383,11 @@
JZEvent* pEventCopy = pEvent->Copy();
pEventCopy->SetClock(pEventCopy->GetClock() + delta);
pEventCopy->SetDevice(pTrack->GetDevice());
- Destin->Put(pEventCopy);
+ pDestin->Put(pEventCopy);
if (pEventCopy->IsPlayTrack())
{
- MergePlayTrackEvent(pEventCopy->IsPlayTrack(), Destin, 0);
+ MergePlayTrackEvent(pEventCopy->IsPlayTrack(), pDestin, 0);
}
pEvent = Iterator.Next();
@@ -401,7 +401,7 @@
//-----------------------------------------------------------------------------
void JZSong::MergePlayTrackEvent(
tPlayTrack* c, //the playtrack event
- tEventArray* Destin,
+ tEventArray* pDestin,
int recursionDepth)
{
// Recursion might be simple, but we have the infinite loop problem, if a
@@ -470,10 +470,10 @@
}
if (d->IsPlayTrack())
{
- MergePlayTrackEvent(d->IsPlayTrack(), Destin, recursionDepth);
+ MergePlayTrackEvent(d->IsPlayTrack(), pDestin, recursionDepth);
}
d->SetDevice(pTrack->GetDevice());
- Destin->Put(d);
+ pDestin->Put(d);
f = IteratorPL.Next();
}
loopOffset+=loopLength;
@@ -485,7 +485,7 @@
void JZSong::MakeMetronome(
int FrClock,
int ToClock,
- tEventArray* Destin,
+ tEventArray* pDestin,
const JZMetronomeInfo& MetronomeInfo,
int delta)
{
@@ -510,13 +510,13 @@
}
// Insert normal click always
- Destin->Put(MetronomeInfo.CreateNormalEvent(clk + delta));
+ pDestin->Put(MetronomeInfo.CreateNormalEvent(clk + delta));
// On a bar?
if (count == 1 && MetronomeInfo.IsAccented())
{
// Insert accented click also
- Destin->Put(MetronomeInfo.CreateAccentedEvent(clk + delta));
+ pDestin->Put(MetronomeInfo.CreateAccentedEvent(clk + delta));
}
clk += BarInfo.GetTicksPerBar() / BarInfo.GetCountsPerBar();
Modified: trunk/jazz/src/Track.cpp
===================================================================
--- trunk/jazz/src/Track.cpp 2009-01-20 05:45:55 UTC (rev 693)
+++ trunk/jazz/src/Track.cpp 2009-01-20 05:51:17 UTC (rev 694)
@@ -505,6 +505,7 @@
{
if (Events[i] != 0 && Events[i]->IsEndOfTrack())
{
+ delete Events[i];
++j;
--newnEvents;
}
@@ -579,13 +580,13 @@
tEventArray::tEventArray()
: tSimpleEventArray(),
mpName(0),
- Copyright(0),
- mPatch(0),
- Speed(0),
- Volume(0),
- Pan(0),
- Reverb(0),
- Chorus(0),
+ mpCopyright(0),
+ mpPatch(0),
+ mpSpeed(0),
+ mpVolume(0),
+ mpPan(0),
+ mpReverb(0),
+ mpChorus(0),
mpBank(0),
mpBank2(0),
mpReset(0)
@@ -613,18 +614,23 @@
// delete mpName;
mpName = 0;
- Copyright = 0;
+// delete mpCopyright;
+ mpCopyright = 0;
- delete mPatch;
- mPatch = 0;
+ delete mpPatch;
+ mpPatch = 0;
- Volume = 0;
+// delete mpVolume;
+ mpVolume = 0;
- Pan = 0;
+// delete mpPan;
+ mpPan = 0;
- Reverb = 0;
+// delete mpReverb;
+ mpReverb = 0;
- Chorus = 0;
+// delete mpChorus;
+ mpChorus = 0;
delete mpBank;
mpBank = 0;
@@ -635,7 +641,9 @@
delete mpReset;
mpReset = 0;
- Speed = 0;
+// delete mpSpeed;
+ mpSpeed = 0;
+
Channel = 1;
Device = 0;
@@ -754,17 +762,17 @@
// delete mpName;
mpName = 0;
- Copyright = 0;
+ mpCopyright = 0;
- Speed = 0;
+ mpSpeed = 0;
- Volume = 0;
+ mpVolume = 0;
- Pan = 0;
+ mpPan = 0;
- Reverb = 0;
+ mpReverb = 0;
- Chorus = 0;
+ mpChorus = 0;
for (i = 0; i < mspModulationSysexParameters; i++)
{
@@ -846,13 +854,13 @@
mpName = pEvent->IsTrackName();
}
- if (!Copyright)
+ if (!mpCopyright)
{
- Copyright = pEvent->IsCopyright();
+ mpCopyright = pEvent->IsCopyright();
}
- if (!Speed)
+ if (!mpSpeed)
{
- Speed = pEvent->IsSetTempo();
+ mpSpeed = pEvent->IsSetTempo();
}
if (!MtcOffset)
{
@@ -863,27 +871,27 @@
switch (pControl->GetControl())
{
case 0x07:
- if (!Volume)
+ if (!mpVolume)
{
- Volume = pControl;
+ mpVolume = pControl;
}
break;
case 0x0a:
- if (!Pan)
+ if (!mpPan)
{
- Pan = pControl;
+ mpPan = pControl;
}
break;
case 0x5b:
- if (!Reverb)
+ if (!mpReverb)
{
- Reverb = pControl;
+ mpReverb = pControl;
}
break;
case 0x5d:
- if (!Chorus)
+ if (!mpChorus)
{
- Chorus = pControl;
+ mpChorus = pControl;
}
break;
}
@@ -1301,9 +1309,9 @@
Io.NextTrack();
// Write copyright notice first (according to spec):
- if (Copyright)
+ if (mpCopyright)
{
- Copyright->Write(Io);
+ mpCopyright->Write(Io);
}
// Write MTC offset before any transmittable events (spec)
@@ -1382,9 +1390,9 @@
mpBank2->Write(Io);
}
- if (mPatch)
+ if (mpPatch)
{
- mPatch->Write(Io);
+ mpPatch->Write(Io);
}
tJazzMeta JazzMeta;
@@ -1591,21 +1599,21 @@
}
else if (pEvent->IsProgram())
{
- if (!mPatch)
+ if (!mpPatch)
{
- mPatch = pEvent->IsProgram();
- mPatch->SetClock(0);
+ mpPatch = pEvent->IsProgram();
+ mpPatch->SetClock(0);
SpecialEvent = true;
}
}
else if (pEvent->IsCopyright())
{
- if (!Copyright)
+ if (!mpCopyright)
{
- Copyright = pEvent->IsCopyright();
+ mpCopyright = pEvent->IsCopyright();
// Just make sure clock is zero, then put into event array
- Copyright->SetClock(0);
+ mpCopyright->SetClock(0);
}
}
else if (pEvent->IsSysEx())
@@ -1847,9 +1855,9 @@
{
trk->mpBank->Channel = trk->Channel - 1;
}
- if (trk->mPatch)
+ if (trk->mpPatch)
{
- trk->mPatch->Channel = trk->Channel - 1;
+ trk->mpPatch->Channel = trk->Channel - 1;
}
if (!trk->DrumParams.IsEmpty())
{
@@ -2124,9 +2132,9 @@
const char* JZTrack::GetCopyright()
{
- if (Copyright)
+ if (mpCopyright)
{
- return (const char *)Copyright->GetData();
+ return (const char *)mpCopyright->GetData();
}
return "";
}
@@ -2135,9 +2143,9 @@
void JZTrack::SetCopyright(char *str)
{
- if (Copyright)
+ if (mpCopyright)
{
- Kill(Copyright);
+ Kill(mpCopyright);
}
if (str && strlen(str))
{
@@ -2177,22 +2185,22 @@
Cleanup();
}
-// ------------------------ Volume ------------------------------
+// ------------------------ Volume ------------------------------
int JZTrack::GetVolume()
{
- if (Volume)
+ if (mpVolume)
{
- return Volume->GetControlValue() + 1;
+ return mpVolume->GetControlValue() + 1;
}
return 0;
}
void JZTrack::SetVolume(int Value)
{
- if (Volume)
+ if (mpVolume)
{
- Kill(Volume);
+ Kill(mpVolume);
}
if (Value > 0)
{
@@ -2205,17 +2213,17 @@
bool JZTrack::DecreaseVolume()
{
- if (Volume && Volume->GetControlValue() > 0)
+ if (mpVolume && mpVolume->GetControlValue() > 0)
{
- Kill(Volume);
+ Kill(mpVolume);
- Volume->SetControlValue(Volume->GetControlValue() - 1);
+ mpVolume->SetControlValue(mpVolume->GetControlValue() - 1);
JZEvent* pEvent = new tControl(
0,
Channel - 1,
0x07,
- Volume->GetControlValue());
+ mpVolume->GetControlValue());
Put(pEvent);
gpMidiPlayer->OutNow(this, pEvent);
@@ -2228,17 +2236,17 @@
bool JZTrack::IncreaseVolume()
{
- if (Volume && Volume->GetControlValue() < 127)
+ if (mpVolume && mpVolume->GetControlValue() < 127)
{
- Kill(Volume);
+ Kill(mpVolume);
- Volume->SetControlValue(Volume->GetControlValue() + 1);
+ mpVolume->SetControlValue(mpVolume->GetControlValue() + 1);
JZEvent* pEvent = new tControl(
0,
Channel - 1,
0x07,
- Volume->GetControlValue());
+ mpVolume->GetControlValue());
Put(pEvent);
gpMidiPlayer->OutNow(this, pEvent);
@@ -2250,22 +2258,22 @@
return false;
}
-// ------------------------ Pan ------------------------------
+// ------------------------ Pan ------------------------------
int JZTrack::GetPan()
{
- if (Pan)
+ if (mpPan)
{
- return Pan->GetControlValue() + 1;
+ return mpPan->GetControlValue() + 1;
}
return 0;
}
void JZTrack::SetPan(int Value)
{
- if (Pan)
+ if (mpPan)
{
- Kill(Pan);
+ Kill(mpPan);
}
if (Value > 0)
{
@@ -2276,22 +2284,22 @@
Cleanup();
}
-// ------------------------ Reverb ------------------------------
+// ------------------------ Reverb ------------------------------
int JZTrack::GetReverb()
{
- if (Reverb)
+ if (mpReverb)
{
- return Reverb->GetControlValue() + 1;
+ return mpReverb->GetControlValue() + 1;
}
return 0;
}
void JZTrack::SetReverb(int Value)
{
- if (Reverb)
+ if (mpReverb)
{
- Kill(Reverb);
+ Kill(mpReverb);
}
if (Value > 0)
{
@@ -2302,22 +2310,22 @@
Cleanup();
}
-// ------------------------ Chorus ------------------------------
+// ------------------------ Chorus ------------------------------
int JZTrack::GetChorus()
{
- if (Chorus)
+ if (mpChorus)
{
- return Chorus->GetControlValue() + 1;
+ return mpChorus->GetControlValue() + 1;
}
return 0;
}
void JZTrack::SetChorus(int Value)
{
- if (Chorus)
+ if (mpChorus)
{
- Kill(Chorus);
+ Kill(mpChorus);
}
if (Value > 0)
{
@@ -2430,24 +2438,24 @@
int JZTrack::GetPatch()
{
- if (mPatch)
+ if (mpPatch)
{
- return mPatch->GetProgram() + 1;
+ return mpPatch->GetProgram() + 1;
}
return 0;
}
void JZTrack::SetPatch(int PatchNr)
{
- if (mPatch)
+ if (mpPatch)
{
- delete mPatch;
- mPatch = 0;
+ delete mpPatch;
+ mpPatch = 0;
}
if (PatchNr > 0)
{
- mPatch = new tProgram(0, Channel - 1, PatchNr - 1);
- gpMidiPlayer->OutNow(this, mPatch);
+ mpPatch = new tProgram(0, Channel - 1, PatchNr - 1);
+ gpMidiPlayer->OutNow(this, mpPatch);
mChanged = true;
}
}
@@ -3359,13 +3367,13 @@
Cleanup();
}
-// ------------------------ Speed ------------------------------
+// ------------------------ Speed ------------------------------
int JZTrack::GetDefaultSpeed()
{
- if (Speed)
+ if (mpSpeed)
{
- return Speed->GetBPM();
+ return mpSpeed->GetBPM();
}
return 120;
}
@@ -3374,9 +3382,9 @@
void JZTrack::SetDefaultSpeed(int bpm)
{
JZEvent* pEvent = new tSetTempo(0, bpm);
- if (Speed)
+ if (mpSpeed)
{
- Kill(Speed);
+ Kill(mpSpeed);
}
Put(pEvent);
gpMidiPlayer->OutNow(this, pEvent);
@@ -3388,7 +3396,7 @@
tEventIterator Iterator(this);
Sort();
JZEvent* pEvent = Iterator.Range(0, clk + 1);
- tSetTempo *t = Speed;
+ tSetTempo* t = mpSpeed;
while (pEvent)
{
if (pEvent->IsSetTempo())
Modified: trunk/jazz/src/Track.h
===================================================================
--- trunk/jazz/src/Track.h 2009-01-20 05:45:55 UTC (rev 693)
+++ trunk/jazz/src/Track.h 2009-01-20 05:51:17 UTC (rev 694)
@@ -455,13 +455,13 @@
public:
tTrackName* mpName;
- tCopyright* Copyright;
- tProgram* mPatch;
- tSetTempo* Speed;
- tControl* Volume;
- tControl* Pan;
- tControl* Reverb;
- tControl* Chorus;
+ tCopyright* mpCopyright;
+ tProgram* mpPatch;
+ tSetTempo* mpSpeed;
+ tControl* mpVolume;
+ tControl* mpPan;
+ tControl* mpReverb;
+ tControl* mpChorus;
tControl* mpBank;
tControl* mpBank2;
Modified: trunk/jazz/src/TrackWindow.cpp
===================================================================
--- trunk/jazz/src/TrackWindow.cpp 2009-01-20 05:45:55 UTC (rev 693)
+++ trunk/jazz/src/TrackWindow.cpp 2009-01-20 05:51:17 UTC (rev 694)
@@ -1412,7 +1412,7 @@
}
if (
!pRecInfo->mpTrack->GetAudioMode() &&
- !gpProject->GetPlayer()->RecdBuffer.IsEmpty())
+ !gpProject->GetPlayer()->mRecdBuffer.IsEmpty())
{
//int choice = wxMessageBox("Keep recorded events?", "You played", wxOK | wxCANCEL);
//if (choice == wxOK)
@@ -1420,7 +1420,7 @@
wxBeginBusyCursor();
gpProject->NewUndoBuffer();
pRecInfo->mpTrack->MergeRange(
- &gpProject->GetPlayer()->RecdBuffer,
+ &gpProject->GetPlayer()->mRecdBuffer,
pRecInfo->mFromClock,
pRecInfo->mToClock,
pRecInfo->mIsMuted);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
