Menu
▾
▴
SF.net SVN: jazzplusplus:[759] trunk/jazz/src
|
From: <pst...@us...> - 2010-04-26 14:36:06
|
Revision: 759
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=759&view=rev
Author: pstieber
Date: 2010-04-26 14:35:58 +0000 (Mon, 26 Apr 2010)
Log Message:
-----------
Updated MIDI event class names.
Modified Paths:
--------------
trunk/jazz/src/AlsaPlayer.cpp
trunk/jazz/src/AsciiMidiFile.cpp
trunk/jazz/src/Audio.cpp
trunk/jazz/src/Command.cpp
trunk/jazz/src/Command.h
trunk/jazz/src/ControlEdit.cpp
trunk/jazz/src/Dialogs/ControllerDialog.cpp
trunk/jazz/src/Dialogs/ControllerDialog.h
trunk/jazz/src/Dialogs/EndOfTrackDialog.cpp
trunk/jazz/src/Dialogs/EndOfTrackDialog.h
trunk/jazz/src/Dialogs/KeyOnDialog.cpp
trunk/jazz/src/Dialogs/KeyOnDialog.h
trunk/jazz/src/Dialogs/ProgramChangeDialog.cpp
trunk/jazz/src/Dialogs/ProgramChangeDialog.h
trunk/jazz/src/Dialogs/SetTempoDialog.cpp
trunk/jazz/src/Dialogs/SetTempoDialog.h
trunk/jazz/src/Dialogs/SysexDialog.cpp
trunk/jazz/src/Dialogs/SysexDialog.h
trunk/jazz/src/Dialogs/TextDialog.cpp
trunk/jazz/src/Dialogs/TextDialog.h
trunk/jazz/src/Dialogs.cpp
trunk/jazz/src/Events.cpp
trunk/jazz/src/Events.h
trunk/jazz/src/Harmony.cpp
trunk/jazz/src/HarmonyBrowserAnalyzer.cpp
trunk/jazz/src/HarmonyBrowserAnalyzer.h
trunk/jazz/src/Metronome.cpp
trunk/jazz/src/Metronome.h
trunk/jazz/src/PianoWindow.cpp
trunk/jazz/src/Player.cpp
trunk/jazz/src/PortMidiPlayer.cpp
trunk/jazz/src/Rhythm.cpp
trunk/jazz/src/Song.cpp
trunk/jazz/src/Song.h
trunk/jazz/src/StandardFile.cpp
trunk/jazz/src/Synth.cpp
trunk/jazz/src/Synth.h
trunk/jazz/src/Track.cpp
trunk/jazz/src/Track.h
trunk/jazz/src/mswin/WindowsPlayer.cpp
Modified: trunk/jazz/src/AlsaPlayer.cpp
===================================================================
--- trunk/jazz/src/AlsaPlayer.cpp 2010-04-26 03:44:22 UTC (rev 758)
+++ trunk/jazz/src/AlsaPlayer.cpp 2010-04-26 14:35:58 UTC (rev 759)
@@ -411,7 +411,7 @@
{
case StatKeyOn:
{
- tKeyOn* pKeyOn = pEvent->IsKeyOn();
+ JZKeyOnEvent* pKeyOn = pEvent->IsKeyOn();
set_event_header(&ev, pEvent->GetClock(), SND_SEQ_EVENT_NOTEON);
ev.data.note.channel = pKeyOn->GetChannel();
ev.data.note.note = pKeyOn->GetKey();
@@ -422,7 +422,7 @@
case StatKeyOff:
{
- tKeyOff* pKeyOff = pEvent->IsKeyOff();
+ JZKeyOffEvent* pKeyOff = pEvent->IsKeyOff();
set_event_header(&ev, pEvent->GetClock(), SND_SEQ_EVENT_NOTEOFF);
ev.data.note.channel = pKeyOff->GetChannel();
ev.data.note.note = pKeyOff->GetKey();
@@ -433,7 +433,7 @@
case StatProgram:
{
- tProgram* pProgram = pEvent->IsProgram();
+ JZProgramEvent* pProgram = pEvent->IsProgram();
set_event_header(&ev, pEvent->GetClock(), SND_SEQ_EVENT_PGMCHANGE);
ev.data.control.channel = pProgram->GetChannel();
ev.data.control.value = pProgram->GetProgram();
@@ -443,7 +443,7 @@
case StatKeyPressure:
{
- tKeyPressure* pKeyPressure = pEvent->IsKeyPressure();
+ JZKeyPressureEvent* pKeyPressure = pEvent->IsKeyPressure();
set_event_header(&ev, pEvent->GetClock(), SND_SEQ_EVENT_KEYPRESS);
ev.data.note.channel = pKeyPressure->GetChannel();
ev.data.note.note = pKeyPressure->GetKey();
@@ -454,7 +454,7 @@
case StatChnPressure:
{
- tChnPressure *k = pEvent->IsChnPressure();
+ JZChnPressureEvent *k = pEvent->IsChnPressure();
set_event_header(&ev, pEvent->GetClock(), SND_SEQ_EVENT_CHANPRESS);
ev.data.control.channel = k->GetChannel();
ev.data.control.value = k->Value;
@@ -464,7 +464,7 @@
case StatControl:
{
- tControl *k = pEvent->IsControl();
+ JZControlEvent* k = pEvent->IsControl();
set_event_header(&ev, pEvent->GetClock(), SND_SEQ_EVENT_CONTROLLER);
ev.data.control.channel = k->GetChannel();
ev.data.control.param = k->GetControl();
@@ -475,7 +475,7 @@
case StatPitch:
{
- tPitch *k = pEvent->IsPitch();
+ JZPitchEvent *k = pEvent->IsPitch();
set_event_header(&ev, pEvent->GetClock(), SND_SEQ_EVENT_PITCHBEND);
ev.data.control.channel = k->GetChannel();
ev.data.control.value = k->Value;
@@ -495,7 +495,7 @@
case StatSysEx:
{
- tSysEx* pSysEx = pEvent->IsSysEx();
+ JZSysExEvent* pSysEx = pEvent->IsSysEx();
// prepend 0xf0
char* pBuffer = new char[pSysEx->GetDataLength() + 1];
pBuffer[0] = 0xF0;
@@ -841,7 +841,7 @@
case SND_SEQ_EVENT_NOTEON:
if (ev->data.note.velocity > 0)
{
- pEvent = new tKeyOn(
+ pEvent = new JZKeyOnEvent(
0,
ev->data.note.channel,
ev->data.note.note,
@@ -849,12 +849,16 @@
}
else
{
- pEvent = new tKeyOff(0, ev->data.note.channel, ev->data.note.note, 0);
+ pEvent = new JZKeyOffEvent(
+ 0,
+ ev->data.note.channel,
+ ev->data.note.note,
+ 0);
}
break;
case SND_SEQ_EVENT_NOTEOFF:
- pEvent = new tKeyOff(
+ pEvent = new JZKeyOffEvent(
0,
ev->data.note.channel,
ev->data.note.note,
@@ -862,14 +866,14 @@
break;
case SND_SEQ_EVENT_PGMCHANGE:
- pEvent = new tProgram(
+ pEvent = new JZProgramEvent(
0,
ev->data.control.channel,
ev->data.control.value);
break;
case SND_SEQ_EVENT_KEYPRESS:
- pEvent = new tKeyPressure(
+ pEvent = new JZKeyPressureEvent(
0,
ev->data.note.channel,
ev->data.note.note,
@@ -877,14 +881,14 @@
break;
case SND_SEQ_EVENT_CHANPRESS:
- pEvent = new tChnPressure(
+ pEvent = new JZChnPressureEvent(
0,
ev->data.control.channel,
ev->data.control.value);
break;
case SND_SEQ_EVENT_CONTROLLER:
- pEvent = new tControl(
+ pEvent = new JZControlEvent(
0,
ev->data.control.channel,
ev->data.control.param,
@@ -892,14 +896,14 @@
break;
case SND_SEQ_EVENT_PITCHBEND:
- pEvent = new tPitch(
+ pEvent = new JZPitchEvent(
0,
ev->data.control.channel,
ev->data.control.value);
break;
case SND_SEQ_EVENT_SYSEX:
- pEvent = new tSysEx(
+ pEvent = new JZSysExEvent(
0,
((unsigned char *)ev->data.ext.ptr) + 1,
ev->data.ext.len - 1);
Modified: trunk/jazz/src/AsciiMidiFile.cpp
===================================================================
--- trunk/jazz/src/AsciiMidiFile.cpp 2010-04-26 03:44:22 UTC (rev 758)
+++ trunk/jazz/src/AsciiMidiFile.cpp 2010-04-26 14:35:58 UTC (rev 759)
@@ -67,46 +67,46 @@
break;
case StatKeyOff:
- pEvent = new tKeyOff(Clock, cha, pBuffer[0]);
+ pEvent = new JZKeyOffEvent(Clock, cha, pBuffer[0]);
break;
case StatKeyOn:
- pEvent = new tKeyOn(Clock, cha, pBuffer[0], pBuffer[1]);
+ pEvent = new JZKeyOnEvent(Clock, cha, pBuffer[0], pBuffer[1]);
break;
case StatControl:
- pEvent = new tControl(Clock, cha, pBuffer[0], pBuffer[1]);
+ pEvent = new JZControlEvent(Clock, cha, pBuffer[0], pBuffer[1]);
break;
case StatPitch:
- pEvent = new tPitch(Clock, cha, pBuffer[0], pBuffer[1]);
+ pEvent = new JZPitchEvent(Clock, cha, pBuffer[0], pBuffer[1]);
break;
case StatProgram:
- pEvent = new tProgram(Clock, cha, pBuffer[0]);
+ pEvent = new JZProgramEvent(Clock, cha, pBuffer[0]);
break;
case StatText:
- pEvent = new tText(Clock, pBuffer, Length);
+ pEvent = new JZTextEvent(Clock, pBuffer, Length);
break;
case StatTrackName:
- pEvent = new tTrackName(Clock, pBuffer, Length);
+ pEvent = new JZTrackNameEvent(Clock, pBuffer, Length);
break;
case StatMarker:
- pEvent = new tMarker(Clock, pBuffer, Length);
+ pEvent = new JZMarkerEvent(Clock, pBuffer, Length);
break;
case StatEndOfTrack:
break;
case StatSetTempo:
- pEvent = new tSetTempo(Clock, pBuffer[0], pBuffer[1], pBuffer[2]);
+ pEvent = new JZSetTempoEvent(Clock, pBuffer[0], pBuffer[1], pBuffer[2]);
break;
case StatTimeSignat:
- pEvent = new tTimeSignat(
+ pEvent = new JZTimeSignatEvent(
Clock,
pBuffer[0],
pBuffer[1],
@@ -115,7 +115,7 @@
break;
case StatSysEx:
- pEvent = new tSysEx(Clock, pBuffer, Length);
+ pEvent = new JZSysExEvent(Clock, pBuffer, Length);
break;
}
@@ -160,7 +160,7 @@
//-----------------------------------------------------------------------------
int JZAsciiWrite::Write(JZEvent* pEvent, unsigned char* pData, int Length)
{
- tChannelEvent* pChannelEvent;
+ JZChannelEvent* pChannelEvent;
fprintf(mpFd, "%6d %02x ", pEvent->GetClock(), pEvent->GetStat());
if ((pChannelEvent = pEvent->IsChannelEvent()) != 0)
Modified: trunk/jazz/src/Audio.cpp
===================================================================
--- trunk/jazz/src/Audio.cpp 2010-04-26 03:44:22 UTC (rev 758)
+++ trunk/jazz/src/Audio.cpp 2010-04-26 14:35:58 UTC (rev 759)
@@ -465,7 +465,7 @@
}
event_index++;
- tKeyOn* pKeyOn = e->IsKeyOn();
+ JZKeyOnEvent* pKeyOn = e->IsKeyOn();
if (pKeyOn && num_voices < MAXPOLY)
{
voices[num_voices++]->Start(samples[pKeyOn->GetKey()], pKeyOn->GetClock());
@@ -581,7 +581,7 @@
JZEvent *e = it.First();
while (e)
{
- tKeyOn* pKeyOn = e->IsKeyOn();
+ JZKeyOnEvent* pKeyOn = e->IsKeyOn();
if (pKeyOn)
{
pKeyOn->SetLength(
@@ -913,7 +913,7 @@
e = iter.Next();
}
// add a noteon
- tKeyOn* pKeyOn = new tKeyOn(
+ JZKeyOnEvent* pKeyOn = new JZKeyOnEvent(
frc,
track->Channel - 1,
key,
Modified: trunk/jazz/src/Command.cpp
===================================================================
--- trunk/jazz/src/Command.cpp 2010-04-26 03:44:22 UTC (rev 758)
+++ trunk/jazz/src/Command.cpp 2010-04-26 14:35:58 UTC (rev 759)
@@ -138,7 +138,7 @@
//-----------------------------------------------------------------------------
void tSelectedKeys::ExecuteEvent(JZTrack* pTrack, JZEvent* pEvent)
{
- tKeyOn* pKeyOn = pEvent->IsKeyOn();
+ JZKeyOnEvent* pKeyOn = pEvent->IsKeyOn();
if (pKeyOn)
{
Keys[pKeyOn->GetKey()] += pKeyOn->GetEventLength();
@@ -402,10 +402,10 @@
//-----------------------------------------------------------------------------
void tCmdQuantize::ExecuteEvent(JZTrack* pTrack, JZEvent* pEvent)
{
- tKeyOn* pKeyOn;
+ JZKeyOnEvent* pKeyOn;
if ((pKeyOn = pEvent->IsKeyOn()) != 0)
{
- pKeyOn = (tKeyOn *)pEvent->Copy();
+ pKeyOn = (JZKeyOnEvent *)pEvent->Copy();
if (mNoteStart)
{
pKeyOn->SetClock(Quantize(pKeyOn->GetClock(), 0));
@@ -441,10 +441,10 @@
//-----------------------------------------------------------------------------
void tCmdTranspose::ExecuteEvent(JZTrack* pTrack, JZEvent* pEvent)
{
- tKeyOn* pKeyOn;
+ JZKeyOnEvent* pKeyOn;
if (pEvent->IsKeyOn())
{
- pKeyOn = (tKeyOn *)pEvent->Copy();
+ pKeyOn = (JZKeyOnEvent *)pEvent->Copy();
if (mFitIntoScale)
{
pKeyOn->SetKey(pKeyOn->GetKey() + mNotes);
@@ -461,7 +461,7 @@
// After touch.
if (pEvent->IsKeyPressure())
{
- tKeyPressure* pKeyPressure = (tKeyPressure *)pEvent->Copy();
+ JZKeyPressureEvent* pKeyPressure = (JZKeyPressureEvent *)pEvent->Copy();
if (mFitIntoScale)
{
pKeyPressure->SetKey(pKeyPressure->GetKey() + mNotes);
@@ -491,11 +491,11 @@
//-----------------------------------------------------------------------------
void tCmdSetChannel::ExecuteEvent(JZTrack* pTrack, JZEvent* pEvent)
{
- tChannelEvent* pChannelEvent;
+ JZChannelEvent* pChannelEvent;
if ((pChannelEvent = pEvent->IsChannelEvent()) != 0)
{
- pChannelEvent = (tChannelEvent *)pEvent->Copy();
+ pChannelEvent = (JZChannelEvent *)pEvent->Copy();
pChannelEvent->SetChannel(mNewChannel);
pTrack->Kill(pEvent);
pTrack->Put(pChannelEvent);
@@ -523,11 +523,11 @@
//-----------------------------------------------------------------------------
void tCmdVelocity::ExecuteEvent(JZTrack* pTrack, JZEvent* pEvent)
{
- tKeyOn* pKeyOn;
+ JZKeyOnEvent* pKeyOn;
if (pEvent->IsKeyOn() != 0)
{
- pKeyOn = (tKeyOn *)pEvent->Copy();
+ pKeyOn = (JZKeyOnEvent *)pEvent->Copy();
int Value = 0;
if (mToValue <= 0)
{
@@ -575,11 +575,11 @@
//-----------------------------------------------------------------------------
void tCmdLength::ExecuteEvent(JZTrack* pTrack, JZEvent* pEvent)
{
- tKeyOn* pKeyOn;
+ JZKeyOnEvent* pKeyOn;
if (pEvent->IsKeyOn() != 0)
{
- pKeyOn = (tKeyOn *)pEvent->Copy();
+ pKeyOn = (JZKeyOnEvent *)pEvent->Copy();
int Value = 0;
if (mToValue <= 0)
{
@@ -628,7 +628,7 @@
{
// Make a copy of the current event.
JZEvent* k;
- k = (tKeyOn *)pEvent->Copy();
+ k = (JZKeyOnEvent *)pEvent->Copy();
//little hack, if clock is -1000 it means set startclock from the first event.
if (startClock==-1000)
@@ -705,8 +705,8 @@
}
pitchdiff = pEvent->GetPitch()-previouspitch;
- tPitch* pitchmodulation=0;
- pitchmodulation = new tPitch(
+ JZPitchEvent* pitchmodulation=0;
+ pitchmodulation = new JZPitchEvent(
pEvent->GetClock(),
channel,
pitchsteparray[pitchdiff + 4]);
@@ -715,12 +715,12 @@
pTrack->Kill(pEvent); //remove the old event
- pTrack->Put(new tControl(
+ pTrack->Put(new JZControlEvent(
pEvent->GetClock(),
channel,
0x07,
pEvent->IsKeyOn()->GetVelocity()));
- pTrack->Put(new tControl(
+ pTrack->Put(new JZControlEvent(
pEvent->GetClock() + pEvent->IsKeyOn()->GetEventLength(),
channel,
0x07,
@@ -734,7 +734,7 @@
pEvent = Iterator.Next();
}
//now insert the new long event
- tKeyOn* longevent = new tKeyOn(
+ JZKeyOnEvent* longevent = new JZKeyOnEvent(
startclock,
channel,
startkey,
@@ -766,14 +766,14 @@
//-----------------------------------------------------------------------------
void tCmdMidiDelay::ExecuteEvent(JZTrack* pTrack, JZEvent* pEvent)
{
- tKeyOn* pKeyOn;
+ JZKeyOnEvent* pKeyOn;
for (int i = 1; i < repeat; ++i)
{
if (pEvent->IsKeyOn())
{
// Only echo note events.
- pKeyOn = (tKeyOn *)pEvent->Copy();
+ pKeyOn = (JZKeyOnEvent *)pEvent->Copy();
pKeyOn->SetClock(pKeyOn->GetClock()+ clockDelay * i);
pKeyOn->SetVelocity(
(unsigned char)(pow(scale, i) * pKeyOn->GetVelocity()));
@@ -806,7 +806,7 @@
//-----------------------------------------------------------------------------
void tCmdCleanup::ExecuteEvent(JZTrack* pTrack, JZEvent* pEvent)
{
- tKeyOn* pKeyOn;
+ JZKeyOnEvent* pKeyOn;
if ((pKeyOn = pEvent->IsKeyOn()) != 0)
{
if (pKeyOn->GetEventLength() < lengthLimit)
@@ -817,7 +817,7 @@
else if (shortenOverlaps)
{
// Shorten length of overlapping notes.
- tKeyOn* pPreviousKeyOn = prev_note[pKeyOn->GetChannel()][pKeyOn->GetKey()];
+ JZKeyOnEvent* pPreviousKeyOn = prev_note[pKeyOn->GetChannel()][pKeyOn->GetKey()];
if (
pPreviousKeyOn &&
pPreviousKeyOn->GetClock() + pPreviousKeyOn->GetEventLength() >=
@@ -851,12 +851,12 @@
//-----------------------------------------------------------------------------
void tCmdSearchReplace::ExecuteEvent(JZTrack* pTrack, JZEvent* pEvent)
{
- tControl* pControl = pEvent->IsControl();
+ JZControlEvent* pControl = pEvent->IsControl();
if (pControl)
{
if (pControl->GetControl() == mFrom)
{
- tControl* pControlCopy = (tControl *)pControl->Copy();
+ JZControlEvent* pControlCopy = (JZControlEvent *)pControl->Copy();
pControlCopy->SetControl(mTo);
pTrack->Kill(pControl);
pTrack->Put(pControlCopy);
@@ -1042,7 +1042,7 @@
{
if (pEvent->IsKeyOn())
{
- tKeyOn* pKeyOn = (tKeyOn *)pEvent->Copy();
+ JZKeyOnEvent* pKeyOn = (JZKeyOnEvent *)pEvent->Copy();
pKeyOn->SetClock(
mpFilter->GetFromClock() + mpFilter->GetToClock() - pKeyOn->GetClock());
pTrack->Kill(pEvent);
@@ -1082,7 +1082,7 @@
{
if (mpFilter->IsSelected(pEvent) && pEvent->IsKeyOn())
{
- tKeyOn* pKeyOn = (tKeyOn *)pEvent;
+ JZKeyOnEvent* pKeyOn = (JZKeyOnEvent *)pEvent;
Keys[pKeyOn->GetKey()] = 1;
}
pEvent = Iterator.Next();
@@ -1096,7 +1096,7 @@
{
if (mpFilter->IsSelected(pEvent) && pEvent->IsKeyOn())
{
- tKeyOn* pKeyOn = (tKeyOn *)pEvent->Copy();
+ JZKeyOnEvent* pKeyOn = (JZKeyOnEvent *)pEvent->Copy();
int n_th = 0;
// the n'th key from bottom
@@ -1157,7 +1157,7 @@
//-----------------------------------------------------------------------------
void tCmdMapper::ExecuteEvent(JZTrack* pTrack, JZEvent* pEvent)
{
- tKeyOn* pKeyOn = pEvent->IsKeyOn();
+ JZKeyOnEvent* pKeyOn = pEvent->IsKeyOn();
if (pKeyOn)
{
int sval = 0;
@@ -1224,7 +1224,7 @@
{
sval = 1;
}
- tKeyOn* pKeyOnCopy = (tKeyOn *)pKeyOn->Copy();
+ JZKeyOnEvent* pKeyOnCopy = (JZKeyOnEvent *)pKeyOn->Copy();
pTrack->Kill(pKeyOn);
pKeyOnCopy->SetVelocity(sval);
pTrack->Put(pKeyOnCopy);
@@ -1245,7 +1245,7 @@
{
sval = 1;
}
- tKeyOn* pKeyOnCopy = (tKeyOn *)pKeyOn->Copy();
+ JZKeyOnEvent* pKeyOnCopy = (JZKeyOnEvent *)pKeyOn->Copy();
pTrack->Kill(pKeyOn);
pKeyOnCopy->SetKey(sval);
pTrack->Put(pKeyOnCopy);
@@ -1262,7 +1262,7 @@
{
sval = 1;
}
- tKeyOn* pKeyOnCopy = (tKeyOn *)pKeyOn->Copy();
+ JZKeyOnEvent* pKeyOnCopy = (JZKeyOnEvent *)pKeyOn->Copy();
pTrack->Kill(pKeyOn);
pKeyOnCopy->SetLength(sval);
pTrack->Put(pKeyOnCopy);
@@ -1271,7 +1271,7 @@
case clock:
{
- tKeyOn* pKeyOnCopy = (tKeyOn *)pKeyOn->Copy();
+ JZKeyOnEvent* pKeyOnCopy = (JZKeyOnEvent *)pKeyOn->Copy();
pKeyOnCopy->SetClock(pKeyOnCopy->GetClock() + sval);
if (pKeyOnCopy->GetClock() < 0)
{
Modified: trunk/jazz/src/Command.h
===================================================================
--- trunk/jazz/src/Command.h 2010-04-26 03:44:22 UTC (rev 758)
+++ trunk/jazz/src/Command.h 2010-04-26 14:35:58 UTC (rev 759)
@@ -32,7 +32,7 @@
class tEventArray;
class JZRndArray;
class JZBarInfo;
-class tKeyOn;
+class JZKeyOnEvent;
//*****************************************************************************
//*****************************************************************************
@@ -188,7 +188,7 @@
{
long lengthLimit;
int shortenOverlaps;
- tKeyOn *prev_note[16][128];
+ JZKeyOnEvent *prev_note[16][128];
public:
tCmdCleanup(JZFilter* pFilter, long limitClocks, int shortenOverlaps);
virtual void ExecuteTrack(JZTrack* pTrack);
Modified: trunk/jazz/src/ControlEdit.cpp
===================================================================
--- trunk/jazz/src/ControlEdit.cpp 2010-04-26 03:44:22 UTC (rev 758)
+++ trunk/jazz/src/ControlEdit.cpp 2010-04-26 14:35:58 UTC (rev 759)
@@ -312,7 +312,7 @@
// edit mode: Erzeugt keine neuen Events sondern aendert den Wert
// bestehender Events.
// SN++
- tControl* pControlCopy;
+ JZControlEvent* pControlCopy;
while (pEvent)
{
if (IsCtrlEdit(pEvent))
@@ -441,7 +441,7 @@
JZEvent * tPitchEdit::NewEvent(long clock, int val)
{
- return new tPitch(clock, track->Channel - 1, val);
+ return new JZPitchEvent(clock, track->Channel - 1, val);
}
// ------------------------------------------------------------------
@@ -475,7 +475,7 @@
int tCtrlEdit::IsCtrlEdit(JZEvent* pEvent)
{
- tControl* pControl = pEvent->IsControl();
+ JZControlEvent* pControl = pEvent->IsControl();
return (pControl && pControl->GetControl() == ctrl_num);
}
@@ -486,7 +486,7 @@
JZEvent * tCtrlEdit::NewEvent(long clock, int val)
{
- return new tControl(clock, track->Channel - 1, ctrl_num, val);
+ return new JZControlEvent(clock, track->Channel - 1, ctrl_num, val);
}
// ------------------------------------------------------------------
@@ -567,10 +567,10 @@
mpPianoWindow->GetFilter()->IsSelected(pEvent))
{
- tKeyOn* pKeyOn = pEvent->IsKeyOn();
+ JZKeyOnEvent* pKeyOn = pEvent->IsKeyOn();
if (pKeyOn)
{
- tKeyOn* pKeyOnCopy = pKeyOn->Copy()->IsKeyOn();
+ JZKeyOnEvent* pKeyOnCopy = pKeyOn->Copy()->IsKeyOn();
int i = Clock2i(pKeyOnCopy->GetClock());
pKeyOnCopy->SetVelocity(array[i]);
@@ -634,7 +634,7 @@
int tPolyAfterEdit::GetValue(JZEvent* pEvent)
{
- tKeyPressure* pKeyPressure = pEvent->IsKeyPressure();
+ JZKeyPressureEvent* pKeyPressure = pEvent->IsKeyPressure();
if (pKeyPressure)
{
return pKeyPressure->GetPressureValue();
@@ -670,7 +670,7 @@
from_clk = from_clock;
to_clk = to_clock;
}
- tKeyOn* pKeyOn;
+ JZKeyOnEvent* pKeyOn;
if (!ctrlmode)
{
@@ -684,7 +684,7 @@
!mpPianoWindow->mpSnapSel->IsSelected() ||
mpPianoWindow->GetFilter()->IsSelected(pEvent))
{
- tKeyPressure* pKeyPressure = pEvent->IsKeyPressure();
+ JZKeyPressureEvent* pKeyPressure = pEvent->IsKeyPressure();
if (pKeyPressure)
{
track->Kill(pKeyPressure);
@@ -696,7 +696,7 @@
long key_end(-1), key_clk(-1);
int key_val = -1;
int key_cha(-1);
- tKeyPressure* pKeyPressure;
+ JZKeyPressureEvent* pKeyPressure;
pEvent = iter.Range(from_clk, to_clk);
while (pEvent)
{
@@ -723,7 +723,11 @@
// und der Wert groesser als 0 ist.
if (array[i] > 0 && array[i] != temp)
{
- pKeyPressure = new tKeyPressure(iclk, key_cha, key_val, array[i]);
+ pKeyPressure = new JZKeyPressureEvent(
+ iclk,
+ key_cha,
+ key_val,
+ array[i]);
track->Put(pKeyPressure);
temp = array[i];
}
@@ -741,7 +745,7 @@
// bestehender Events.
// SN++
pEvent = iter.Range(from_clk, to_clk);
- tKeyPressure* pKeyPressureCopy;
+ JZKeyPressureEvent* pKeyPressureCopy;
while (pEvent)
{
if (
@@ -805,7 +809,7 @@
JZEvent *tChannelAfterEdit::NewEvent(long clock, int val)
{
- return new tChnPressure(clock, track->Channel - 1, val);
+ return new JZChnPressureEvent(clock, track->Channel - 1, val);
}
void tChannelAfterEdit::UpDate()
@@ -871,7 +875,7 @@
// edit mode: Erzeugt keine neuen Events sondern aendert den Wert
// bestehender Events.
// SN++
- tChnPressure* pChnPressureCopy;
+ JZChnPressureEvent* pChnPressureCopy;
while (pEvent)
{
if (IsCtrlEdit(pEvent))
@@ -929,5 +933,5 @@
JZEvent * tTempoEdit::NewEvent(long clock, int val)
{
- return new tSetTempo(clock, val);
+ return new JZSetTempoEvent(clock, val);
}
Modified: trunk/jazz/src/Dialogs/ControllerDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/ControllerDialog.cpp 2010-04-26 03:44:22 UTC (rev 758)
+++ trunk/jazz/src/Dialogs/ControllerDialog.cpp 2010-04-26 14:35:58 UTC (rev 759)
@@ -39,7 +39,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
JZControllerDialog::JZControllerDialog(
- tControl* pControl,
+ JZControlEvent* pControl,
JZTrack* pTrack,
wxWindow* pParent)
: wxDialog(pParent, wxID_ANY, wxString("Controller")),
Modified: trunk/jazz/src/Dialogs/ControllerDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/ControllerDialog.h 2010-04-26 03:44:22 UTC (rev 758)
+++ trunk/jazz/src/Dialogs/ControllerDialog.h 2010-04-26 14:35:58 UTC (rev 759)
@@ -24,7 +24,7 @@
#include <wx/dialog.h>
-class tControl;
+class JZControlEvent;
class JZTrack;
class wxListBox;
@@ -35,13 +35,13 @@
public:
JZControllerDialog(
- tControl* pControl,
+ JZControlEvent* pControl,
JZTrack* pTrack,
wxWindow* pParent);
private:
- tControl* mpControl;
+ JZControlEvent* mpControl;
wxListBox* mpControllerListBox;
Modified: trunk/jazz/src/Dialogs/EndOfTrackDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/EndOfTrackDialog.cpp 2010-04-26 03:44:22 UTC (rev 758)
+++ trunk/jazz/src/Dialogs/EndOfTrackDialog.cpp 2010-04-26 14:35:58 UTC (rev 759)
@@ -46,7 +46,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
JZEndOfTrackDialog::JZEndOfTrackDialog(
- tEndOfTrack* pEndOfTrackEvent,
+ JZEndOfTrackEvent* pEndOfTrackEvent,
JZTrack* pTrack,
wxWindow * pParent)
: wxDialog(pParent, wxID_ANY, wxString("End of Track")),
Modified: trunk/jazz/src/Dialogs/EndOfTrackDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/EndOfTrackDialog.h 2010-04-26 03:44:22 UTC (rev 758)
+++ trunk/jazz/src/Dialogs/EndOfTrackDialog.h 2010-04-26 14:35:58 UTC (rev 759)
@@ -23,7 +23,7 @@
#include <wx/dialog.h>
-class tEndOfTrack;
+class JZEndOfTrackEvent;
class JZTrack;
class wxTextCtrl;
@@ -34,7 +34,7 @@
public:
JZEndOfTrackDialog(
- tEndOfTrack* pEndOfTrackEvent,
+ JZEndOfTrackEvent* pEndOfTrackEvent,
JZTrack* pTrack,
wxWindow* pParent);
@@ -48,7 +48,7 @@
private:
- tEndOfTrack* mpEndOfTrackEvent;
+ JZEndOfTrackEvent* mpEndOfTrackEvent;
wxTextCtrl* mpClockEdit;
Modified: trunk/jazz/src/Dialogs/KeyOnDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/KeyOnDialog.cpp 2010-04-26 03:44:22 UTC (rev 758)
+++ trunk/jazz/src/Dialogs/KeyOnDialog.cpp 2010-04-26 14:35:58 UTC (rev 759)
@@ -54,7 +54,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-JZKeyOnDialog::JZKeyOnDialog(tKeyOn* pEvent, wxWindow* pParent)
+JZKeyOnDialog::JZKeyOnDialog(JZKeyOnEvent* pEvent, wxWindow* pParent)
: wxDialog(pParent, wxID_ANY, wxString("Key On")),
mpEvent(pEvent),
mpPitchEdit(0),
Modified: trunk/jazz/src/Dialogs/KeyOnDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/KeyOnDialog.h 2010-04-26 03:44:22 UTC (rev 758)
+++ trunk/jazz/src/Dialogs/KeyOnDialog.h 2010-04-26 14:35:58 UTC (rev 759)
@@ -25,7 +25,7 @@
class JZKnob;
class JZKnobEvent;
-class tKeyOn;
+class JZKeyOnEvent;
class wxStaticText;
class wxTextCtrl;
@@ -35,7 +35,7 @@
{
public:
- JZKeyOnDialog(tKeyOn* pEvent, wxWindow* pParent);
+ JZKeyOnDialog(JZKeyOnEvent* pEvent, wxWindow* pParent);
private:
@@ -53,7 +53,7 @@
private:
- tKeyOn* mpEvent;
+ JZKeyOnEvent* mpEvent;
wxTextCtrl* mpPitchEdit;
wxStaticText* mpVelocityValue;
Modified: trunk/jazz/src/Dialogs/ProgramChangeDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/ProgramChangeDialog.cpp 2010-04-26 03:44:22 UTC (rev 758)
+++ trunk/jazz/src/Dialogs/ProgramChangeDialog.cpp 2010-04-26 14:35:58 UTC (rev 759)
@@ -39,7 +39,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
JZProgramChangeDialog::JZProgramChangeDialog(
- tProgram* pProgram,
+ JZProgramEvent* pProgram,
JZTrack* pTrack,
wxWindow* pParent)
: wxDialog(pParent, wxID_ANY, wxString("Program Change")),
Modified: trunk/jazz/src/Dialogs/ProgramChangeDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/ProgramChangeDialog.h 2010-04-26 03:44:22 UTC (rev 758)
+++ trunk/jazz/src/Dialogs/ProgramChangeDialog.h 2010-04-26 14:35:58 UTC (rev 759)
@@ -23,7 +23,7 @@
#include <wx/dialog.h>
-class tProgram;
+class JZProgramEvent;
class JZTrack;
class wxListBox;
@@ -34,13 +34,13 @@
public:
JZProgramChangeDialog(
- tProgram* pProgram,
+ JZProgramEvent* pProgram,
JZTrack* pTrack,
wxWindow* pParent);
private:
- tProgram* mpProgram;
+ JZProgramEvent* mpProgram;
wxListBox* mpProgramListBox;
Modified: trunk/jazz/src/Dialogs/SetTempoDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/SetTempoDialog.cpp 2010-04-26 03:44:22 UTC (rev 758)
+++ trunk/jazz/src/Dialogs/SetTempoDialog.cpp 2010-04-26 14:35:58 UTC (rev 759)
@@ -48,7 +48,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
JZSetTempoDialog::JZSetTempoDialog(
- tSetTempo* pSetTempoEvent,
+ JZSetTempoEvent* pSetTempoEvent,
JZTrack* pTrack,
wxWindow * pParent)
: wxDialog(pParent, wxID_ANY, wxString("Set Tempo (for track 0)")),
Modified: trunk/jazz/src/Dialogs/SetTempoDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/SetTempoDialog.h 2010-04-26 03:44:22 UTC (rev 758)
+++ trunk/jazz/src/Dialogs/SetTempoDialog.h 2010-04-26 14:35:58 UTC (rev 759)
@@ -24,8 +24,8 @@
#include <wx/dialog.h>
class JZIntegerEdit;
+class JZSetTempoEvent;
class JZTrack;
-class tSetTempo;
class wxTextCtrl;
//*****************************************************************************
@@ -35,7 +35,7 @@
public:
JZSetTempoDialog(
- tSetTempo* pSetTempoEvent,
+ JZSetTempoEvent* pSetTempoEvent,
JZTrack* pTrack,
wxWindow* pParent);
@@ -49,7 +49,7 @@
private:
- tSetTempo* mpSetTempoEvent;
+ JZSetTempoEvent* mpSetTempoEvent;
JZIntegerEdit* mpTempoEdit;
Modified: trunk/jazz/src/Dialogs/SysexDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/SysexDialog.cpp 2010-04-26 03:44:22 UTC (rev 758)
+++ trunk/jazz/src/Dialogs/SysexDialog.cpp 2010-04-26 14:35:58 UTC (rev 759)
@@ -48,11 +48,11 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
JZSysexDialog::JZSysexDialog(
- tSysEx* pEvent,
+ JZSysExEvent* pSysExEvent,
JZTrack* pTrack,
wxWindow* pParent)
: wxDialog(pParent, wxID_ANY, wxString("System Exclusive")),
- mpSysExEvent(pEvent),
+ mpSysExEvent(pSysExEvent),
mpSysExEdit(0),
mpClockEdit(0)
{
Modified: trunk/jazz/src/Dialogs/SysexDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/SysexDialog.h 2010-04-26 03:44:22 UTC (rev 758)
+++ trunk/jazz/src/Dialogs/SysexDialog.h 2010-04-26 14:35:58 UTC (rev 759)
@@ -25,7 +25,7 @@
class JZKnob;
class JZKnobEvent;
-class tSysEx;
+class JZSysExEvent;
class JZTrack;
class wxStaticText;
class wxTextCtrl;
@@ -36,7 +36,10 @@
{
public:
- JZSysexDialog(tSysEx* pEvent, JZTrack* pTrack, wxWindow* pParent);
+ JZSysexDialog(
+ JZSysExEvent* pSysExEvent,
+ JZTrack* pTrack,
+ wxWindow* pParent);
private:
@@ -48,7 +51,7 @@
private:
- tSysEx* mpSysExEvent;
+ JZSysExEvent* mpSysExEvent;
wxTextCtrl* mpSysExEdit;
wxTextCtrl* mpClockEdit;
Modified: trunk/jazz/src/Dialogs/TextDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/TextDialog.cpp 2010-04-26 03:44:22 UTC (rev 758)
+++ trunk/jazz/src/Dialogs/TextDialog.cpp 2010-04-26 14:35:58 UTC (rev 759)
@@ -47,7 +47,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
JZTextDialog::JZTextDialog(
- tText* pTextEvent,
+ JZTextEvent* pTextEvent,
JZTrack* pTrack,
wxWindow * pParent)
: wxDialog(pParent, wxID_ANY, wxString("Text")),
Modified: trunk/jazz/src/Dialogs/TextDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/TextDialog.h 2010-04-26 03:44:22 UTC (rev 758)
+++ trunk/jazz/src/Dialogs/TextDialog.h 2010-04-26 14:35:58 UTC (rev 759)
@@ -24,7 +24,7 @@
#include <wx/dialog.h>
class JZTrack;
-class tText;
+class JZTextEvent;
class wxTextCtrl;
//*****************************************************************************
@@ -33,7 +33,7 @@
{
public:
- JZTextDialog(tText* pTextEvent, JZTrack* pTrack, wxWindow* pParent);
+ JZTextDialog(JZTextEvent* pTextEvent, JZTrack* pTrack, wxWindow* pParent);
private:
@@ -45,7 +45,7 @@
private:
- tText* mpTextEvent;
+ JZTextEvent* mpTextEvent;
wxTextCtrl* mpTextEdit;
wxTextCtrl* mpClockEdit;
Modified: trunk/jazz/src/Dialogs.cpp
===================================================================
--- trunk/jazz/src/Dialogs.cpp 2010-04-26 03:44:22 UTC (rev 758)
+++ trunk/jazz/src/Dialogs.cpp 2010-04-26 14:35:58 UTC (rev 759)
@@ -321,7 +321,7 @@
int Channel;
- tChEventDlg(tChannelEvent* pChannelEvent, JZPianoWindow* w, JZTrack *pTrack)
+ tChEventDlg(JZChannelEvent* pChannelEvent, JZPianoWindow* w, JZTrack *pTrack)
: tEventDlg(pChannelEvent, w, pTrack)
{
Channel = pChannelEvent->GetChannel() + 1; // 1..16
@@ -343,7 +343,7 @@
bool tChEventDlg::OnClose()
{
- ((tChannelEvent *)Copy)->SetChannel(Channel - 1);
+ ((JZChannelEvent *)Copy)->SetChannel(Channel - 1);
tEventDlg::OnClose();
return false;
}
@@ -356,14 +356,14 @@
int Value;
- tPitchDlg(tPitch* e, JZPianoWindow* w, JZTrack *pTrack);
+ tPitchDlg(JZPitchEvent* e, JZPianoWindow* w, JZTrack *pTrack);
void AddProperties();
bool OnClose();
};
-tPitchDlg::tPitchDlg(tPitch *e, JZPianoWindow* w, JZTrack *pTrack)
+tPitchDlg::tPitchDlg(JZPitchEvent *e, JZPianoWindow* w, JZTrack *pTrack)
: tChEventDlg(e, w, pTrack)
{
Event = e;
@@ -373,13 +373,12 @@
bool tPitchDlg::OnClose()
{
- ((tPitch *)Copy)->Value = Value;
+ ((JZPitchEvent *)Copy)->Value = Value;
return tChEventDlg::OnClose();
}
void tPitchDlg::AddProperties()
{
- //Add(wxMakeFormShort("Pitch:", &Value, wxFORM_DEFAULT, new wxList(wxMakeConstraintRange(-8191.0, 8191.0), 0)));
sheet->AddProperty(new wxProperty(
"Pitch:",
wxPropertyValue(&Value),
@@ -401,14 +400,14 @@
tNamedChoice Choice;
- tPlayTrackDlg(tPlayTrack *e, JZPianoWindow* w, JZTrack *pTrack);
+ tPlayTrackDlg(JZPlayTrackEvent *e, JZPianoWindow* w, JZTrack *pTrack);
void AddProperties();
bool OnClose();
};
-tPlayTrackDlg::tPlayTrackDlg(tPlayTrack *e, JZPianoWindow* w, JZTrack *pTrack)
+tPlayTrackDlg::tPlayTrackDlg(JZPlayTrackEvent *e, JZPianoWindow* w, JZTrack *pTrack)
: tEventDlg(e, w, pTrack),
Choice("playtrack", gpConfig->GetControlNames(), &track)
{
@@ -421,7 +420,7 @@
bool tPlayTrackDlg::OnClose()
{
- tPlayTrack* p=(tPlayTrack*)Copy;
+ JZPlayTrackEvent* p=(JZPlayTrackEvent*)Copy;
Choice.GetValue();
p->track = track;
@@ -481,7 +480,7 @@
-1
};
- JZEvent *e = 0;
+ JZEvent* pEvent = 0;
int i = ::wxGetSingleChoiceIndex(
"Select event to create",
@@ -493,36 +492,36 @@
switch (Values[i])
{
case StatKeyOn:
- e = new tKeyOn(Clock, Channel, Pitch, 64, 64);
+ pEvent = new JZKeyOnEvent(Clock, Channel, Pitch, 64, 64);
break;
case StatPitch:
- e = new tPitch(Clock, Channel, 0);
- e->SetPitch(Pitch);
+ pEvent = new JZPitchEvent(Clock, Channel, 0);
+ pEvent->SetPitch(Pitch);
break;
case StatControl:
- e = new tControl(Clock, Channel, Pitch, 64);
+ pEvent = new JZControlEvent(Clock, Channel, Pitch, 64);
break;
case StatProgram:
- e = new tProgram(Clock, Channel, Pitch);
+ pEvent = new JZProgramEvent(Clock, Channel, Pitch);
break;
case StatSetTempo:
- e = new tSetTempo(Clock, 100);
+ pEvent = new JZSetTempoEvent(Clock, 100);
break;
case StatSysEx:
- e = new tSysEx(Clock, (unsigned char*) "", 0);
+ pEvent = new JZSysExEvent(Clock, (unsigned char*) "", 0);
break;
case StatPlayTrack:
- e = new tPlayTrack(Clock, 0, Pitch);
+ pEvent = new JZPlayTrackEvent(Clock, 0, Pitch);
break;
case StatEndOfTrack:
- e = new tEndOfTrack(Clock);
+ pEvent = new JZEndOfTrackEvent(Clock);
break;
case StatText:
- e = new tText(Clock, (unsigned char*)"");
+ pEvent = new JZTextEvent(Clock, (unsigned char*)"");
break;
}
}
- return e;
+ return pEvent;
}
//*****************************************************************************
Modified: trunk/jazz/src/Events.cpp
===================================================================
--- trunk/jazz/src/Events.cpp 2010-04-26 03:44:22 UTC (rev 758)
+++ trunk/jazz/src/Events.cpp 2010-04-26 14:35:58 UTC (rev 759)
@@ -150,11 +150,10 @@
}
//*****************************************************************************
-// tGetMidiBytes
//*****************************************************************************
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-int tGetMidiBytes::Write(JZEvent* pEvent, unsigned char* pData, int Length)
+int JZGetMidiBytes::Write(JZEvent* pEvent, unsigned char* pData, int Length)
{
int Stat = pEvent->GetStat();
@@ -170,7 +169,7 @@
case StatPitch:
nBytes = 0;
- Buffer[nBytes++] = Stat | ((tChannelEvent *)pEvent)->GetChannel();
+ Buffer[nBytes++] = Stat | ((JZChannelEvent *)pEvent)->GetChannel();
while (Length--)
{
Buffer[nBytes++] = *pData++;
@@ -190,7 +189,7 @@
// Description:
// This function fixed the checksum bytes at the end of the data stream.
//-----------------------------------------------------------------------------
-void tMetaEvent::FixCheckSum()
+void JZMetaEvent::FixCheckSum()
{
unsigned char Sum = 0x00;
for (unsigned short i = 4; i < (mLength - 2); ++i)
@@ -207,7 +206,7 @@
//*****************************************************************************
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-int tSysEx::GetPitch() const
+int JZSysExEvent::GetPitch() const
{
edb();
Modified: trunk/jazz/src/Events.h
===================================================================
--- trunk/jazz/src/Events.h 2010-04-26 03:44:22 UTC (rev 758)
+++ trunk/jazz/src/Events.h 2010-04-26 14:35:58 UTC (rev 759)
@@ -208,9 +208,8 @@
}
//*****************************************************************************
-// tGetMidiBytes
//*****************************************************************************
-class tGetMidiBytes : public JZWriteBase
+class JZGetMidiBytes : public JZWriteBase
{
public:
@@ -288,32 +287,32 @@
// Event-Classes
class JZEvent;
-class tChannelEvent;
-class tMetaEvent;
-class tKeyOn;
-class tKeyOff;
-class tPitch;
-class tControl;
-class tProgram;
-class tSysEx;
-class tSongPtr;
-class tMidiClock;
-class tStartPlay;
-class tContPlay;
-class tStopPlay;
-class tText;
-class tCopyright;
-class tTrackName;
-class tMarker;
-class tSetTempo;
-class tMtcOffset;
-class tTimeSignat;
-class tKeySignat;
-class tKeyPressure;
-class tJazzMeta;
-class tChnPressure;
-class tPlayTrack;
-class tEndOfTrack;
+class JZChannelEvent;
+class JZMetaEvent;
+class JZKeyOnEvent;
+class JZKeyOffEvent;
+class JZPitchEvent;
+class JZControlEvent;
+class JZProgramEvent;
+class JZSysExEvent;
+class JZSongPtrEvent;
+class JZMidiClockEvent;
+class JZStartPlayEvent;
+class JZContPlayEvent;
+class JZStopPlayEvent;
+class JZTextEvent;
+class JZCopyrightEvent;
+class JZTrackNameEvent;
+class JZMarkerEvent;
+class JZSetTempoEvent;
+class JZMtcOffsetEvent;
+class JZTimeSignatEvent;
+class JZKeySignatEvent;
+class JZKeyPressureEvent;
+class JZJazzMetaEvent;
+class JZChnPressureEvent;
+class JZPlayTrackEvent;
+class JZEndOfTrackEvent;
//*****************************************************************************
// Description:
@@ -398,32 +397,32 @@
return (mClock & KILLED_CLOCK) != 0;
}
- virtual tMetaEvent* IsMetaEvent() { edb(); return 0; }
- virtual tChannelEvent* IsChannelEvent() { edb(); return 0; }
- virtual tKeyOn* IsKeyOn() { edb(); return 0; }
- virtual tKeyOff* IsKeyOff() { edb(); return 0; }
- virtual tPitch* IsPitch() { edb(); return 0; }
- virtual tControl* IsControl() { edb(); return 0; }
- virtual tProgram* IsProgram() { edb(); return 0; }
- virtual tSysEx* IsSysEx() { edb(); return 0; }
- virtual tSongPtr* IsSongPtr() { edb(); return 0; }
- virtual tMidiClock* IsMidiClock() { edb(); return 0; }
- virtual tStartPlay* IsStartPlay() { edb(); return 0; }
- virtual tContPlay* IsContPlay() { edb(); return 0; }
- virtual tStopPlay* IsStopPlay() { edb(); return 0; }
- virtual tText* IsText() { edb(); return 0; }
- virtual tCopyright* IsCopyright() { edb(); return 0; }
- virtual tTrackName* IsTrackName() { edb(); return 0; }
- virtual tMarker* IsMarker() { edb(); return 0; }
- virtual tSetTempo* IsSetTempo() { edb(); return 0; }
- virtual tMtcOffset* IsMtcOffset() { edb(); return 0; }
- virtual tTimeSignat* IsTimeSignat() { edb(); return 0; }
- virtual tKeySignat* IsKeySignat() { edb(); return 0; }
- virtual tKeyPressure* IsKeyPressure() { edb(); return 0; }
- virtual tJazzMeta* IsJazzMeta() { edb(); return 0; }
- virtual tPlayTrack* IsPlayTrack() { edb(); return 0; }
- virtual tEndOfTrack* IsEndOfTrack() { edb(); return 0; }
- virtual tChnPressure* IsChnPressure() { edb(); return 0; }
+ virtual JZMetaEvent* IsMetaEvent() { edb(); return 0; }
+ virtual JZChannelEvent* IsChannelEvent() { edb(); return 0; }
+ virtual JZKeyOnEvent* IsKeyOn() { edb(); return 0; }
+ virtual JZKeyOffEvent* IsKeyOff() { edb(); return 0; }
+ virtual JZPitchEvent* IsPitch() { edb(); return 0; }
+ virtual JZControlEvent* IsControl() { edb(); return 0; }
+ virtual JZProgramEvent* IsProgram() { edb(); return 0; }
+ virtual JZSysExEvent* IsSysEx() { edb(); return 0; }
+ virtual JZSongPtrEvent* IsSongPtr() { edb(); return 0; }
+ virtual JZMidiClockEvent* IsMidiClock() { edb(); return 0; }
+ virtual JZStartPlayEvent* IsStartPlay() { edb(); return 0; }
+ virtual JZContPlayEvent* IsContPlay() { edb(); return 0; }
+ virtual JZStopPlayEvent* IsStopPlay() { edb(); return 0; }
+ virtual JZTextEvent* IsText() { edb(); return 0; }
+ virtual JZCopyrightEvent* IsCopyright() { edb(); return 0; }
+ virtual JZTrackNameEvent* IsTrackName() { edb(); return 0; }
+ virtual JZMarkerEvent* IsMarker() { edb(); return 0; }
+ virtual JZSetTempoEvent* IsSetTempo() { edb(); return 0; }
+ virtual JZMtcOffsetEvent* IsMtcOffset() { edb(); return 0; }
+ virtual JZTimeSignatEvent* IsTimeSignat() { edb(); return 0; }
+ virtual JZKeySignatEvent* IsKeySignat() { edb(); return 0; }
+ virtual JZKeyPressureEvent* IsKeyPressure() { edb(); return 0; }
+ virtual JZJazzMetaEvent* IsJazzMeta() { edb(); return 0; }
+ virtual JZPlayTrackEvent* IsPlayTrack() { edb(); return 0; }
+ virtual JZEndOfTrackEvent* IsEndOfTrack() { edb(); return 0; }
+ virtual JZChnPressureEvent* IsChnPressure() { edb(); return 0; }
virtual int Write(JZWriteBase& io)
{
@@ -523,17 +522,17 @@
//*****************************************************************************
//*****************************************************************************
-class tChannelEvent : public JZEvent
+class JZChannelEvent : public JZEvent
{
public:
- tChannelEvent(int Clock, unsigned char sta, int Channel)
+ JZChannelEvent(int Clock, unsigned char sta, int Channel)
: JZEvent(Clock, sta)
{
mChannel = Channel;
}
- virtual tChannelEvent* IsChannelEvent()
+ virtual JZChannelEvent* IsChannelEvent()
{
edb();
return this;
@@ -542,7 +541,7 @@
virtual JZEvent* Copy() const
{
edb();
- return new tChannelEvent(*this);
+ return new JZChannelEvent(*this);
}
unsigned char GetChannel() const
@@ -562,17 +561,17 @@
//*****************************************************************************
//*****************************************************************************
-class tKeyOn : public tChannelEvent
+class JZKeyOnEvent : public JZChannelEvent
{
public:
- tKeyOn(
+ JZKeyOnEvent(
int Clock,
int Channel,
unsigned char Key,
unsigned char Velocity,
unsigned short Length = 0)
- : tChannelEvent(Clock, StatKeyOn, Channel),
+ : JZChannelEvent(Clock, StatKeyOn, Channel),
mKey(Key),
mVelocity(Velocity),
mLength(Length),
@@ -586,7 +585,7 @@
return io.Write(this, mKey, mVelocity);
}
- virtual tKeyOn* IsKeyOn()
+ virtual JZKeyOnEvent* IsKeyOn()
{
edb();
return this;
@@ -595,7 +594,7 @@
virtual JZEvent* Copy() const
{
edb();
- return new tKeyOn(*this);
+ return new JZKeyOnEvent(*this);
}
virtual int GetValue() const
@@ -679,7 +678,7 @@
unsigned char mVelocity;
- // Length is 0 if a corresponding tKeyOff exists.
+ // Length is 0 if a corresponding JZKeyOffEvent exists.
unsigned short mLength;
unsigned short mOffVelocity;
@@ -687,15 +686,15 @@
//*****************************************************************************
//*****************************************************************************
-class tKeyOff : public tChannelEvent
+class JZKeyOffEvent : public JZChannelEvent
{
public:
- tKeyOff(
+ JZKeyOffEvent(
int Clock,
int Channel,
unsigned char Key,
unsigned char OffVelocity = 0)
- : tChannelEvent(Clock, StatKeyOff, Channel),
+ : JZChannelEvent(Clock, StatKeyOff, Channel),
mKey(Key),
mOffVelocity(OffVelocity)
{
@@ -707,7 +706,7 @@
return io.Write(this, mKey, mOffVelocity);
}
- virtual tKeyOff* IsKeyOff()
+ virtual JZKeyOffEvent* IsKeyOff()
{
edb();
return this;
@@ -716,7 +715,7 @@
virtual JZEvent* Copy() const
{
edb();
- return new tKeyOff(*this);
+ return new JZKeyOffEvent(*this);
}
unsigned char GetKey() const
@@ -743,23 +742,23 @@
//*****************************************************************************
//*****************************************************************************
-class tPitch : public tChannelEvent
+class JZPitchEvent : public JZChannelEvent
{
public:
short Value;
- tPitch(
+ JZPitchEvent(
int Clock,
unsigned short Channel,
unsigned char lo,
unsigned char hi)
- : tChannelEvent(Clock, StatPitch, Channel)
+ : JZChannelEvent(Clock, StatPitch, Channel)
{
Value = ((hi << 7) | lo) - 8192;
}
- tPitch(int Clock, unsigned short Channel, short val)
- : tChannelEvent(Clock, StatPitch, Channel)
+ JZPitchEvent(int Clock, unsigned short Channel, short val)
+ : JZChannelEvent(Clock, StatPitch, Channel)
{
Value = val;
}
@@ -770,7 +769,7 @@
edb(); return io.Write(this, (unsigned char)(v & 0x7F), (unsigned char)(v >> 7));
}
- virtual tPitch* IsPitch()
+ virtual JZPitchEvent* IsPitch()
{
edb();
return this;
@@ -779,7 +778,7 @@
virtual JZEvent* Copy() const
{
edb();
- return new tPitch(*this);
+ return new JZPitchEvent(*this);
}
virtual int GetValue() const
@@ -813,16 +812,16 @@
//*****************************************************************************
//*****************************************************************************
-class tControl : public tChannelEvent
+class JZControlEvent : public JZChannelEvent
{
public:
- tControl(
+ JZControlEvent(
int Clock,
int Channel,
unsigned char Control,
unsigned char Value)
- : tChannelEvent(Clock, StatControl, Channel),
+ : JZChannelEvent(Clock, StatControl, Channel),
mControl(Control),
mValue(Value)
{
@@ -834,7 +833,7 @@
return io.Write(this, mControl, mValue);
}
- virtual tControl* IsControl()
+ virtual JZControlEvent* IsControl()
{
edb();
return this;
@@ -843,7 +842,7 @@
virtual JZEvent* Copy() const
{
edb();
- return new tControl(*this);
+ return new JZControlEvent(*this);
}
virtual int GetValue() const
@@ -902,12 +901,12 @@
//*****************************************************************************
//*****************************************************************************
-class tProgram : public tChannelEvent
+class JZProgramEvent : public JZChannelEvent
{
public:
- tProgram(int Clock, int Channel, unsigned char Program)
- : tChannelEvent(Clock, StatProgram, Channel)
+ JZProgramEvent(int Clock, int Channel, unsigned char Program)
+ : JZChannelEvent(Clock, StatProgram, Channel)
{
mProgram = Program;
}
@@ -917,7 +916,7 @@
edb(); return io.Write(this, mProgram);
}
- virtual tProgram* IsProgram()
+ virtual JZProgramEvent* IsProgram()
{
edb();
return this;
@@ -926,7 +925,7 @@
virtual JZEvent* Copy() const
{
edb();
- return new tProgram(*this);
+ return new JZProgramEvent(*this);
}
virtual int GetValue() const
@@ -974,11 +973,11 @@
//*****************************************************************************
//*****************************************************************************
-class tMetaEvent : public JZEvent
+class JZMetaEvent : public JZEvent
{
public:
- tMetaEvent(
+ JZMetaEvent(
int Clock,
unsigned char sta,
unsigned char* pData,
@@ -995,7 +994,7 @@
mpData[Length] = 0;
}
- virtual ~tMetaEvent()
+ virtual ~JZMetaEvent()
{
delete [] mpData;
}
@@ -1006,7 +1005,7 @@
return io.Write(this, mpData, mLength);
}
- virtual tMetaEvent* IsMetaEvent()
+ virtual JZMetaEvent* IsMetaEvent()
{
edb();
return this;
@@ -1015,7 +1014,7 @@
virtual JZEvent* Copy() const
{
edb();
- return new tMetaEvent(mClock, mStat, mpData, mLength);
+ return new JZMetaEvent(mClock, mStat, mpData, mLength);
}
const unsigned char* GetData() const
@@ -1042,7 +1041,7 @@
// should should not go into a track itself but is read/written from/to
// the file.
//*****************************************************************************
-class tJazzMeta : public tMetaEvent
+class JZJazzMetaEvent : public JZMetaEvent
{
public:
@@ -1051,13 +1050,13 @@
DATALEN = 20
};
- tJazzMeta(int Clock, unsigned char* pData, unsigned short Length)
- : tMetaEvent(Clock, StatJazzMeta, pData, Length)
+ JZJazzMetaEvent(int Clock, unsigned char* pData, unsigned short Length)
+ : JZMetaEvent(Clock, StatJazzMeta, pData, Length)
{
}
- tJazzMeta()
- : tMetaEvent(0, StatJazzMeta, 0, DATALEN)
+ JZJazzMetaEvent()
+ : JZMetaEvent(0, StatJazzMeta, 0, DATALEN)
{
memset(mpData, 0, DATALEN);
memcpy(mpData, "JAZ2", 4);
@@ -1106,7 +1105,7 @@
mpData[9] = x;
}
- virtual tJazzMeta* IsJazzMeta()
+ virtual JZJazzMetaEvent* IsJazzMeta()
{
edb();
return this;
@@ -1115,22 +1114,22 @@
virtual JZEvent* Copy() const
{
edb();
- return new tJazzMeta(mClock, mpData, mLength);
+ return new JZJazzMetaEvent(mClock, mpData, mLength);
}
};
//*****************************************************************************
//*****************************************************************************
-class tSysEx : public tMetaEvent
+class JZSysExEvent : public JZMetaEvent
{
public:
- tSysEx(int Clock, unsigned char* pData, unsigned short Length)
- : tMetaEvent(Clock, StatSysEx, pData, Length)
+ JZSysExEvent(int Clock, unsigned char* pData, unsigned short Length)
+ : JZMetaEvent(Clock, StatSysEx, pData, Length)
{
}
- virtual tSysEx* IsSysEx()
+ virtual JZSysExEvent* IsSysEx()
{
edb();
return this;
@@ -1139,7 +1138,7 @@
virtual JZEvent* Copy() const
{
edb();
- return new tSysEx(mClock, mpData, mLength);
+ return new JZSysExEvent(mClock, mpData, mLength);
}
// todo
@@ -1148,16 +1147,16 @@
//*****************************************************************************
//*****************************************************************************
-class tSongPtr : public tMetaEvent
+class JZSongPtrEvent : public JZMetaEvent
{
public:
- tSongPtr(int Clock, unsigned char* pData, unsigned short Length)
- : tMetaEvent(Clock, StatSongPtr, pData, Length)
+ JZSongPtrEvent(int Clock, unsigned char* pData, unsigned short Length)
+ : JZMetaEvent(Clock, StatSongPtr, pData, Length)
{
}
- virtual tSongPtr* IsSongPtr()
+ virtual JZSongPtrEvent* IsSongPtr()
{
edb();
return this;
@@ -1166,26 +1165,26 @@
virtual JZEvent* Copy() const
{
edb();
- return new tSongPtr(mClock, mpData, mLength);
+ return new JZSongPtrEvent(mClock, mpData, mLength);
}
};
//*****************************************************************************
//*****************************************************************************
-class tMidiClock : public tMetaEvent
+class JZMidiClockEvent : public JZMetaEvent
{
public:
- tMidiClock(int Clock, unsigned char* pData, unsigned short Length)
- : tMetaEvent(Clock, StatMidiClock, pData, Length)
+ JZMidiClockEvent(int Clock, unsigned char* pData, unsigned short Length)
+ : JZMetaEvent(Clock, StatMidiClock, pData, Length)
{
}
- tMidiClock(int Clock)
- : tMetaEvent(Clock, StatMidiClock, 0, 0)
+ JZMidiClockEvent(int Clock)
+ : JZMetaEvent(Clock, StatMidiClock, 0, 0)
{
}
- virtual tMidiClock *IsMidiClock()
+ virtual JZMidiClockEvent *IsMidiClock()
{
edb();
return this;
@@ -1194,27 +1193,27 @@
virtual JZEvent* Copy() const
{
edb();
- return new tMidiClock(mClock, mpData, mLength);
+ return new JZMidiClockEvent(mClock, mpData, mLength);
}
};
//*****************************************************************************
//*****************************************************************************
-class tStartPlay : public tMetaEvent
+class JZStartPlayEvent : public JZMetaEvent
{
public:
- tStartPlay(int Clock, unsigned char* pData, unsigned short Length)
- : tMetaEvent(Clock, StatStartPlay, pData, Length)
+ JZStartPlayEvent(int Clock, unsigned char* pData, unsigned short Length)
+ : JZMetaEvent(Clock, StatStartPlay, pData, Length)
{
}
- tStartPlay(int Clock)
- : tMetaEvent(Clock, StatStartPlay, 0, 0)
+ JZStartPlayEvent(int Clock)
+ : JZMetaEvent(Clock, StatStartPlay, 0, 0)
{
}
- virtual tStartPlay* IsStartPlay()
+ virtual JZStartPlayEvent* IsStartPlay()
{
edb();
return this;
@@ -1223,27 +1222,27 @@
virtual JZEvent* Copy() const
{
edb();
- return new tStartPlay(mClock, mpData, mLength);
+ return new JZStartPlayEvent(mClock, mpData, mLength);
}
};
//*****************************************************************************
//*****************************************************************************
-class tContPlay : public tMetaEvent
+class JZContPlayEvent : public JZMetaEvent
{
public:
- tContPlay(int Clock, unsigned char* pData, unsigned short Length)
- : tMetaEvent(Clock, StatContPlay, pData, Length)
+ JZContPlayEvent(int Clock, unsigned char* pData, unsigned short Length)
+ : JZMetaEvent(Clock, StatContPlay, pData, Length)
{
}
- tContPlay(int Clock)
- : tMetaEvent(Clock, StatContPlay, 0, 0)
+ JZContPlayEvent(int Clock)
+ : JZMetaEvent(Clock, StatContPlay, 0, 0)
{
}
- virtual tContPlay* IsContPlay()
+ virtual JZContPlayEvent* IsContPlay()
{
edb();
return this;
@@ -1252,27 +1251,27 @@
virtual JZEvent* Copy() const
{
edb();
- return new tContPlay(mClock, mpData, mLength);
+ return new JZContPlayEvent(mClock, mpData, mLength);
}
};
//*****************************************************************************
//*****************************************************************************
-class tStopPlay : public tMetaEvent
+class JZStopPlayEvent : public JZMetaEvent
{
public:
- tStopPlay(int Clock, unsigned char* pData, unsigned short Length)
- : tMetaEvent(Clock, StatStopPlay, pData, Length)
+ JZStopPlayEvent(int Clock, unsigned char* pData, unsigned short Length)
+ : JZMetaEvent(Clock, StatStopPlay, pData, Length)
{
}
- tStopPlay(int Clock)
- : tMetaEvent(Clock, StatStopPlay, 0, 0)
+ JZStopPlayEvent(int Clock)
+ : JZMetaEvent(Clock, StatStopPlay, 0, 0)
{
}
- virtual tStopPlay* IsStopPlay()
+ virtual JZStopPlayEvent* IsStopPlay()
{
edb();
return this;
@@ -1281,27 +1280,27 @@
virtual JZEvent* Copy() const
{
edb();
- return new tStopPlay(mClock, mpData, mLength);
+ return new JZStopPlayEvent(mClock, mpData, mLength);
}
};
//*****************************************************************************
//*****************************************************************************
-class tText : public tMetaEvent
+class JZTextEvent : public JZMetaEvent
{
public:
- tText(int Clock, unsigned char* pData, unsigned short Length)
- : tMetaEvent(Clock, StatText, pData, Length)
+ JZTextEvent(int Clock, unsigned char* pData, unsigned short Length)
+ : JZMetaEvent(Clock, StatText, pData, Length)
{
}
- tText(int Clock, unsigned char* pData)
- : tMetaEvent(Clock, StatText, pData, strlen((const char*)pData))
+ JZTextEvent(int Clock, unsigned char* pData)
+ : JZMetaEvent(Clock, StatText, pData, strlen((const char*)pData))
{
}
- virtual tText* IsText()
+ virtual JZTextEvent* IsText()
{
edb();
return this;
@@ -1310,7 +1309,7 @@
virtual JZEvent* Copy() const
{
edb();
- return new tText(mClock, mpData, mLength);
+ return new JZTextEvent(mClock, mpData, mLength);
}
virtual unsigned char* GetText()
@@ -1331,16 +1330,16 @@
//*****************************************************************************
//*****************************************************************************
-class tCopyright : public tMetaEvent
+class JZCopyrightEvent : public JZMetaEvent
{
public:
- tCopyright(int Clock, unsigned char* pData, unsigned short Length)
- : tMetaEvent(Clock, StatCopyright, pData, Length)
+ JZCopyrightEvent(int Clock, unsigned char* pData, unsigned short Length)
+ : JZMetaEvent(Clock, StatCopyright, pData, Length)
{
}
- virtual tCopyright* IsCopyright()
+ virtual JZCopyrightEvent* IsCopyright()
{
edb();
return this;
@@ -1349,18 +1348,18 @@
virtual JZEvent* Copy() const
{
edb();
- return new tCopyright(mClock, mpD...
[truncated message content] |
