Menu
▾
▴
SF.net SVN: jazzplusplus: [334] trunk/jazz/src
|
From: <pst...@us...> - 2008-03-18 14:25:19
|
Revision: 334
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=334&view=rev
Author: pstieber
Date: 2008-03-18 07:25:17 -0700 (Tue, 18 Mar 2008)
Log Message:
-----------
1. Renamed tTrack to JZTrack.
2. Added the ability to changed the state of an individual track between
P = ?
S = Solo
M = Mute
by clicking of the state column for the track.
Modified Paths:
--------------
trunk/jazz/src/Audio.cpp
trunk/jazz/src/Audio.h
trunk/jazz/src/Command.cpp
trunk/jazz/src/Command.h
trunk/jazz/src/ControlEdit.cpp
trunk/jazz/src/ControlEdit.h
trunk/jazz/src/Dialogs.cpp
trunk/jazz/src/Dialogs.h
trunk/jazz/src/Filter.cpp
trunk/jazz/src/Filter.h
trunk/jazz/src/HarmonyBrowserAnalyzer.cpp
trunk/jazz/src/HarmonyBrowserAnalyzer.h
trunk/jazz/src/PianoFrame.cpp
trunk/jazz/src/PianoFrame.h
trunk/jazz/src/Player.cpp
trunk/jazz/src/Player.h
trunk/jazz/src/RecordingInfo.h
trunk/jazz/src/Rhythm.cpp
trunk/jazz/src/Rhythm.h
trunk/jazz/src/Song.cpp
trunk/jazz/src/Song.h
trunk/jazz/src/Track.cpp
trunk/jazz/src/Track.h
trunk/jazz/src/TrackFrame.cpp
trunk/jazz/src/TrackWindow.cpp
trunk/jazz/src/TrackWindow.h
Modified: trunk/jazz/src/Audio.cpp
===================================================================
--- trunk/jazz/src/Audio.cpp 2008-03-18 04:25:04 UTC (rev 333)
+++ trunk/jazz/src/Audio.cpp 2008-03-18 14:25:17 UTC (rev 334)
@@ -523,7 +523,7 @@
-void tSampleSet::AdjustAudioLength(tTrack *t, long tpm)
+void tSampleSet::AdjustAudioLength(JZTrack *t, long tpm)
{
if (!t->GetAudioMode() || !adjust_audio_length)
return;
@@ -829,7 +829,7 @@
JZSong *song = gpProject->Song;
#endif
const JZRecordingInfo* info = gpProject->GetRecInfo();
- tTrack* track = info->mpTrack;
+ JZTrack* track = info->mpTrack;
#ifdef OBSOLETE
song->NewUndoBuffer();
#endif
Modified: trunk/jazz/src/Audio.h
===================================================================
--- trunk/jazz/src/Audio.h 2008-03-18 04:25:04 UTC (rev 333)
+++ trunk/jazz/src/Audio.h 2008-03-18 14:25:17 UTC (rev 334)
@@ -31,7 +31,7 @@
#include "Project.h"
class tEventArray;
-class tTrack;
+class JZTrack;
struct tAudioBuffer;
class tAudioBufferQueue;
class tAudioRecordBuffer;
@@ -268,7 +268,7 @@
return buffers[i];
}
- void AdjustAudioLength(tTrack *t, long ticks_per_minute);
+ void AdjustAudioLength(JZTrack *t, long ticks_per_minute);
long Ticks2Samples(long ticks) const
{
Modified: trunk/jazz/src/Command.cpp
===================================================================
--- trunk/jazz/src/Command.cpp 2008-03-18 04:25:04 UTC (rev 333)
+++ trunk/jazz/src/Command.cpp 2008-03-18 14:25:17 UTC (rev 334)
@@ -43,7 +43,7 @@
public:
long Keys[128];
tSelectedKeys(tFilter *f);
- void ExecuteEvent(tTrack *t, JZEvent *e);
+ void ExecuteEvent(JZTrack *t, JZEvent *e);
};
tSelectedKeys::tSelectedKeys(tFilter *f)
@@ -54,7 +54,7 @@
Keys[i] = 0;
}
-void tSelectedKeys::ExecuteEvent(tTrack *t, JZEvent *e)
+void tSelectedKeys::ExecuteEvent(JZTrack *t, JZEvent *e)
{
tKeyOn *k = e->IsKeyOn();
if (k)
@@ -220,7 +220,7 @@
if (NewUndo)
Song->NewUndoBuffer();
tTrackIterator Tracks(Filter, Reverse);
- tTrack *t = Tracks.First();
+ JZTrack *t = Tracks.First();
while (t)
{
ExecuteTrack(t);
@@ -230,7 +230,7 @@
}
-void tCommand::ExecuteTrack(tTrack *t)
+void tCommand::ExecuteTrack(JZTrack *t)
{
tEventIterator Iterator(t);
JZEvent *e = Iterator.Range(Filter->FromClock, Filter->ToClock);
@@ -244,7 +244,7 @@
}
-void tCommand::ExecuteEvent(tTrack *t, JZEvent *e)
+void tCommand::ExecuteEvent(JZTrack *t, JZEvent *e)
{
}
@@ -265,7 +265,7 @@
DeltaClock = dclk;
}
-void tCmdShift::ExecuteEvent(tTrack *t, JZEvent *e)
+void tCmdShift::ExecuteEvent(JZTrack *t, JZEvent *e)
{
JZEvent *c = e->Copy();
t->Kill(e);
@@ -297,7 +297,7 @@
}
}
-void tCmdErase::ExecuteEvent(tTrack *t, JZEvent *e)
+void tCmdErase::ExecuteEvent(JZTrack *t, JZEvent *e)
{
t->Kill(e);
}
@@ -327,7 +327,7 @@
return Clock > minclk ? Clock : minclk;
}
-void tCmdQuantize::ExecuteEvent(tTrack *t, JZEvent *e)
+void tCmdQuantize::ExecuteEvent(JZTrack *t, JZEvent *e)
{
tKeyOn *k;
if ((k = e->IsKeyOn()) != 0)
@@ -358,7 +358,7 @@
FitIntoScale = fit;
}
-void tCmdTranspose::ExecuteEvent(tTrack *t, JZEvent *e)
+void tCmdTranspose::ExecuteEvent(JZTrack *t, JZEvent *e)
{
tKeyOn *k;
if (e->IsKeyOn())
@@ -402,7 +402,7 @@
NewChannel = chan;
}
-void tCmdSetChannel::ExecuteEvent(tTrack *t, JZEvent *e)
+void tCmdSetChannel::ExecuteEvent(JZTrack *t, JZEvent *e)
{
tChannelEvent *c;
@@ -427,7 +427,7 @@
Mode = m;
}
-void tCmdVelocity::ExecuteEvent(tTrack *t, JZEvent *e)
+void tCmdVelocity::ExecuteEvent(JZTrack *t, JZEvent *e)
{
tKeyOn *k;
@@ -462,7 +462,7 @@
Mode = m;
}
-void tCmdLength::ExecuteEvent(tTrack *t, JZEvent *e)
+void tCmdLength::ExecuteEvent(JZTrack *t, JZEvent *e)
{
tKeyOn *k;
@@ -503,7 +503,7 @@
/** move an event according to startclock and scale
*/
-void tCmdSeqLength::ExecuteEvent(tTrack *t, JZEvent *e)
+void tCmdSeqLength::ExecuteEvent(JZTrack *t, JZEvent *e)
{
//make a copy of the current event
JZEvent *k;
@@ -536,7 +536,7 @@
//need to override executetrack, since we have begin/end behaviour in this filter
-void tCmdConvertToModulation::ExecuteTrack(tTrack *t)
+void tCmdConvertToModulation::ExecuteTrack(JZTrack *t)
{
//JAVE:iterate over all events, make a long event from start until stop of the sequence,
//convert all note-on messages to a pitch bend/volume controller pair, velocity -> volume
@@ -617,7 +617,7 @@
this->repeat=repeat;
}
-void tCmdMidiDelay::ExecuteEvent(tTrack *t, JZEvent *e)
+void tCmdMidiDelay::ExecuteEvent(JZTrack *t, JZEvent *e)
{
tKeyOn *k;
@@ -646,13 +646,13 @@
shortenOverlaps = so;
}
-void tCmdCleanup::ExecuteTrack(tTrack *t)
+void tCmdCleanup::ExecuteTrack(JZTrack *t)
{
memset(prev_note, 0, sizeof(prev_note));
tCommand::ExecuteTrack(t);
}
-void tCmdCleanup::ExecuteEvent(tTrack *t, JZEvent *e)
+void tCmdCleanup::ExecuteEvent(JZTrack *t, JZEvent *e)
{
tKeyOn *k;
if ((k = e->IsKeyOn()) != 0)
@@ -688,7 +688,7 @@
to = st;
}
-void tCmdSearchReplace::ExecuteEvent(tTrack *t, JZEvent *e)
+void tCmdSearchReplace::ExecuteEvent(JZTrack *t, JZEvent *e)
{
tControl *ctrl;
if ((ctrl = e->IsControl()) != 0)
@@ -713,7 +713,7 @@
Buffer = buf;
}
-void tCmdCopyToBuffer::ExecuteEvent(tTrack *t, JZEvent *e)
+void tCmdCopyToBuffer::ExecuteEvent(JZTrack *t, JZEvent *e)
{
Buffer->Put(e->Copy());
}
@@ -742,10 +742,10 @@
-void tCmdCopy::ExecuteTrack(tTrack *s)
+void tCmdCopy::ExecuteTrack(JZTrack *s)
{
long StartClock, StopClock;
- tTrack *d;
+ JZTrack *d;
StartClock = DestClock;
@@ -862,7 +862,7 @@
{
}
-void tCmdExchLeftRight::ExecuteEvent(tTrack *t, JZEvent *e)
+void tCmdExchLeftRight::ExecuteEvent(JZTrack *t, JZEvent *e)
{
if (e->IsKeyOn())
{
@@ -883,7 +883,7 @@
{
}
-void tCmdExchUpDown::ExecuteTrack(tTrack *t)
+void tCmdExchUpDown::ExecuteTrack(JZTrack *t)
{
int i;
int Keys[128];
@@ -954,7 +954,7 @@
delete binfo;
}
-void tCmdMapper::ExecuteEvent(tTrack *t, JZEvent *e)
+void tCmdMapper::ExecuteEvent(JZTrack *t, JZEvent *e)
{
tKeyOn *k = e->IsKeyOn();
if (k)
Modified: trunk/jazz/src/Command.h
===================================================================
--- trunk/jazz/src/Command.h 2008-03-18 04:25:04 UTC (rev 333)
+++ trunk/jazz/src/Command.h 2008-03-18 14:25:17 UTC (rev 334)
@@ -25,7 +25,7 @@
class tFilter;
class JZEvent;
-class tTrack;
+class JZTrack;
class JZSong;
class tEventArray;
class JZRndArray;
@@ -60,8 +60,8 @@
tCommand(tFilter *f);
virtual void Execute(int NewUndo = 1);
- virtual void ExecuteTrack(tTrack *t);
- virtual void ExecuteEvent(tTrack *t, JZEvent *e);
+ virtual void ExecuteTrack(JZTrack *t);
+ virtual void ExecuteEvent(JZTrack *t, JZEvent *e);
long Interpolate(long clk, long vmin, long vmax);
virtual ~tCommand() {}
};
@@ -72,7 +72,7 @@
long DeltaClock;
public:
tCmdShift(tFilter *f, long DeltaClock);
- virtual void ExecuteEvent(tTrack *t, JZEvent *e);
+ virtual void ExecuteEvent(JZTrack *t, JZEvent *e);
};
@@ -82,7 +82,7 @@
int LeaveSpace;
tCmdErase(tFilter *f, int LeaveSpace = 1);
virtual void Execute(int NewUndo = 1);
- virtual void ExecuteEvent(tTrack *t, JZEvent *e);
+ virtual void ExecuteEvent(JZTrack *t, JZEvent *e);
};
class tCmdVelocity : public tCommand
@@ -90,7 +90,7 @@
public:
int FromValue, ToValue, Mode;
tCmdVelocity(tFilter *f, int From, int To, int Mode);
- virtual void ExecuteEvent(tTrack *t, JZEvent *e);
+ virtual void ExecuteEvent(JZTrack *t, JZEvent *e);
};
@@ -99,7 +99,7 @@
public:
int FromValue, ToValue, Mode;
tCmdLength(tFilter *f, int From, int To, int Mode);
- virtual void ExecuteEvent(tTrack *t, JZEvent *e);
+ virtual void ExecuteEvent(JZTrack *t, JZEvent *e);
};
@@ -109,7 +109,7 @@
double scale;
long startClock;
tCmdSeqLength(tFilter *f, double scale);
- virtual void ExecuteEvent(tTrack *t, JZEvent *e);
+ virtual void ExecuteEvent(JZTrack *t, JZEvent *e);
};
@@ -122,7 +122,7 @@
int repeat;
tCmdMidiDelay(tFilter *f, double scale, long clockDelay, int repeat);
- virtual void ExecuteEvent(tTrack *t, JZEvent *e);
+ virtual void ExecuteEvent(JZTrack *t, JZEvent *e);
};
class tCmdConvertToModulation : public tCommand
@@ -130,7 +130,7 @@
public:
tCmdConvertToModulation(tFilter *f);
- virtual void ExecuteTrack(tTrack *t);
+ virtual void ExecuteTrack(JZTrack *t);
};
@@ -144,8 +144,8 @@
tKeyOn *prev_note[16][128];
public:
tCmdCleanup(tFilter *f, long limitClocks, int shortenOverlaps);
- virtual void ExecuteTrack(tTrack *t);
- virtual void ExecuteEvent(tTrack *t, JZEvent *e);
+ virtual void ExecuteTrack(JZTrack *t);
+ virtual void ExecuteEvent(JZTrack *t, JZEvent *e);
};
@@ -154,7 +154,7 @@
short fr, to;
public:
tCmdSearchReplace(tFilter *f, short fr, short to);
- virtual void ExecuteEvent(tTrack *t, JZEvent *e);
+ virtual void ExecuteEvent(JZTrack *t, JZEvent *e);
};
@@ -168,7 +168,7 @@
int Delay; // zero
int Groove; // zero
tCmdQuantize(tFilter *f, long QntClocks, int groove, int delay);
- virtual void ExecuteEvent(tTrack *t, JZEvent *e);
+ virtual void ExecuteEvent(JZTrack *t, JZEvent *e);
};
@@ -179,7 +179,7 @@
int FitIntoScale;
tScale Scale;
tCmdTranspose(tFilter *f, int Notes, int ScaleNr = 0, int FitIntoScale = 0);
- virtual void ExecuteEvent(tTrack *t, JZEvent *e);
+ virtual void ExecuteEvent(JZTrack *t, JZEvent *e);
};
@@ -188,7 +188,7 @@
public:
int NewChannel; // 0
tCmdSetChannel(tFilter *f, int NewChannel);
- virtual void ExecuteEvent(tTrack *t, JZEvent *e);
+ virtual void ExecuteEvent(JZTrack *t, JZEvent *e);
};
@@ -197,7 +197,7 @@
tEventArray *Buffer;
public:
tCmdCopyToBuffer(tFilter *f, tEventArray *Buffer);
- virtual void ExecuteEvent(tTrack *t, JZEvent *e);
+ virtual void ExecuteEvent(JZTrack *t, JZEvent *e);
};
@@ -214,7 +214,7 @@
long RepeatClock; // -1L
tCmdCopy(tFilter *f, long DestTrack, long DestClock);
- virtual void ExecuteTrack(tTrack *t);
+ virtual void ExecuteTrack(JZTrack *t);
};
@@ -223,14 +223,14 @@
{
public:
tCmdExchLeftRight(tFilter *f);
- virtual void ExecuteEvent(tTrack *t, JZEvent *e);
+ virtual void ExecuteEvent(JZTrack *t, JZEvent *e);
};
class tCmdExchUpDown : public tCommand
{
public:
tCmdExchUpDown(tFilter *f);
- virtual void ExecuteTrack(tTrack *t);
+ virtual void ExecuteTrack(JZTrack *t);
};
class tCmdMapper : public tCommand
@@ -239,7 +239,7 @@
enum prop { veloc, length, key, rhythm, random, pan, modul, cc1, cc2, pitch, clock };
tCmdMapper(tFilter *f, prop src, prop dst, JZRndArray &array, int nbars, int add);
~tCmdMapper();
- virtual void ExecuteEvent(tTrack *t, JZEvent *e);
+ virtual void ExecuteEvent(JZTrack *t, JZEvent *e);
private:
int n_bars;
int start_bar;
Modified: trunk/jazz/src/ControlEdit.cpp
===================================================================
--- trunk/jazz/src/ControlEdit.cpp 2008-03-18 04:25:04 UTC (rev 333)
+++ trunk/jazz/src/ControlEdit.cpp 2008-03-18 14:25:17 UTC (rev 334)
@@ -131,7 +131,7 @@
}
-void tCtrlEditBase::ReInit(tTrack *t, long fc, long cpp)
+void tCtrlEditBase::ReInit(JZTrack *t, long fc, long cpp)
{
int w, h;
edit->GetSize(&w, &h);
Modified: trunk/jazz/src/ControlEdit.h
===================================================================
--- trunk/jazz/src/ControlEdit.h 2008-03-18 04:25:04 UTC (rev 333)
+++ trunk/jazz/src/ControlEdit.h 2008-03-18 14:25:17 UTC (rev 334)
@@ -26,7 +26,7 @@
#include "Random.h"
class JZPianoFrame;
-class tTrack;
+class JZTrack;
class JZEvent;
class tCtrlEditBase;
@@ -55,7 +55,7 @@
tCtrlEditBase(int min, int max, JZPianoFrame *parent, char const *label, int xoff, int x, int y, int w, int h, int mode=0);
virtual ~tCtrlEditBase();
void SetSize(int xoff, int x, int y, int w, int h);
- void ReInit(tTrack *track, long FromClock, long ClocksPerPixel);
+ void ReInit(JZTrack *track, long FromClock, long ClocksPerPixel);
// SN++ Default = 0, 1 bedeutet der Editor arbeitet auch auf Selektionen.
// Dieser Patch zusammen mit dem "selectable Patch" im PianoWin
@@ -82,7 +82,7 @@
// SN++
int x_off;
int ctrlmode;
- tTrack *track;
+ JZTrack *track;
long from_clock;
long to_clock;
long i_max;
Modified: trunk/jazz/src/Dialogs.cpp
===================================================================
--- trunk/jazz/src/Dialogs.cpp 2008-03-18 04:25:04 UTC (rev 333)
+++ trunk/jazz/src/Dialogs.cpp 2008-03-18 14:25:17 UTC (rev 334)
@@ -730,14 +730,14 @@
{
public:
- tTrack *Track;
+ JZTrack *Track;
tClockDlg ClockDlg;
JZPianoFrame* Win;
JZEvent *Event;
JZEvent *Copy;
- tEventDlg(JZEvent *e, JZPianoFrame* w, tTrack *t);
+ tEventDlg(JZEvent *e, JZPianoFrame* w, JZTrack *t);
virtual void AddProperties();
virtual bool OnClose();
virtual void OnHelp();
@@ -745,7 +745,7 @@
};
-tEventDlg::tEventDlg(JZEvent *e, JZPianoFrame* w, tTrack *t)
+tEventDlg::tEventDlg(JZEvent *e, JZPianoFrame* w, JZTrack *t)
: tPropertyListDlg( "Event" ),
ClockDlg(w->Song, "Time ", e->GetClock())
{
@@ -790,7 +790,7 @@
int Channel;
- tChEventDlg(tChannelEvent *e, JZPianoFrame* w, tTrack *t)
+ tChEventDlg(tChannelEvent *e, JZPianoFrame* w, JZTrack *t)
: tEventDlg(e, w, t)
{
Channel = e->Channel + 1; // 1..16
@@ -830,14 +830,14 @@
// SN++
int OffVeloc;
- tKeyOnDlg(tKeyOn *e, JZPianoFrame* w, tTrack *t);
+ tKeyOnDlg(tKeyOn *e, JZPianoFrame* w, JZTrack *t);
void AddProperties();
bool OnClose();
};
-tKeyOnDlg::tKeyOnDlg(tKeyOn *e, JZPianoFrame* w, tTrack *t)
+tKeyOnDlg::tKeyOnDlg(tKeyOn *e, JZPianoFrame* w, JZTrack *t)
: tChEventDlg(e, w, t),
PitchDlg("Pitch", e->Key)
{
@@ -901,14 +901,14 @@
int Value;
- tPitchDlg(tPitch *e, JZPianoFrame* w, tTrack *t);
+ tPitchDlg(tPitch *e, JZPianoFrame* w, JZTrack *t);
void AddProperties();
bool OnClose();
};
-tPitchDlg::tPitchDlg(tPitch *e, JZPianoFrame* w, tTrack *t)
+tPitchDlg::tPitchDlg(tPitch *e, JZPianoFrame* w, JZTrack *t)
: tChEventDlg(e, w, t)
{
Event = e;
@@ -944,14 +944,14 @@
int Control;
//tNamedChoice Choice;
- tControlDlg(tControl *e, JZPianoFrame* w, tTrack *t);
+ tControlDlg(tControl *e, JZPianoFrame* w, JZTrack *t);
void AddProperties();
bool OnClose();
};
-tControlDlg::tControlDlg(tControl *e, JZPianoFrame* w, tTrack *t)
+tControlDlg::tControlDlg(tControl *e, JZPianoFrame* w, JZTrack *t)
: tChEventDlg(e, w, t)
//, Choice("Controller", &gpConfig->CtrlName(0), &Control)
{
@@ -1006,14 +1006,14 @@
tNamedChoice Choice;
- tPlayTrackDlg(tPlayTrack *e, JZPianoFrame* w, tTrack *t);
+ tPlayTrackDlg(tPlayTrack *e, JZPianoFrame* w, JZTrack *t);
void AddProperties();
bool OnClose();
};
-tPlayTrackDlg::tPlayTrackDlg(tPlayTrack *e, JZPianoFrame* w, tTrack *t)
+tPlayTrackDlg::tPlayTrackDlg(tPlayTrack *e, JZPianoFrame* w, JZTrack *t)
: tEventDlg(e, w, t),
Choice("playtrack", gpConfig->GetControlNames(), &track)
{
@@ -1065,14 +1065,14 @@
int track;
tNamedChoice Choice;
- tTextDlg(tText *e, JZPianoFrame* w, tTrack *t);
+ tTextDlg(tText *e, JZPianoFrame* w, JZTrack *t);
void AddProperties();
bool OnClose();
};
-tTextDlg::tTextDlg(tText *e, JZPianoFrame* w, tTrack *t)
+tTextDlg::tTextDlg(tText *e, JZPianoFrame* w, JZTrack *t)
: tEventDlg(e, w, t),
Choice("text", gpConfig->GetControlNames(), &track)
{
@@ -1112,14 +1112,14 @@
tNamedChoice Choice;
- tEndOfTrackDlg(tEndOfTrack *e, JZPianoFrame* w, tTrack *t);
+ tEndOfTrackDlg(tEndOfTrack *e, JZPianoFrame* w, JZTrack *t);
void AddProperties();
bool OnClose();
};
-tEndOfTrackDlg::tEndOfTrackDlg(tEndOfTrack *e, JZPianoFrame* w, tTrack *t)
+tEndOfTrackDlg::tEndOfTrackDlg(tEndOfTrack *e, JZPianoFrame* w, JZTrack *t)
: tEventDlg(e, w, t),
Choice("End Of Track", gpConfig->GetControlNames(), &track)
{
@@ -1149,14 +1149,14 @@
int Program;
// tNamedChoice Choice;
- tProgramDlg(tProgram *e, JZPianoFrame* w, tTrack *t);
+ tProgramDlg(tProgram *e, JZPianoFrame* w, JZTrack *t);
void AddProperties();
bool OnClose();
};
-tProgramDlg::tProgramDlg(tProgram *e, JZPianoFrame* w, tTrack *t)
+tProgramDlg::tProgramDlg(tProgram *e, JZPianoFrame* w, JZTrack *t)
: tEventDlg(e, w, t),
Program(e->Program + 1)
//, Choice("Program", &gpConfig->VoiceName(0), &Program)
@@ -1194,14 +1194,14 @@
int Value;
- tSetTempoDlg(tSetTempo *e, JZPianoFrame* w, tTrack *t);
+ tSetTempoDlg(tSetTempo *e, JZPianoFrame* w, JZTrack *t);
void AddProperties();
bool OnClose();
};
-tSetTempoDlg::tSetTempoDlg(tSetTempo *e, JZPianoFrame* w, tTrack *t)
+tSetTempoDlg::tSetTempoDlg(tSetTempo *e, JZPianoFrame* w, JZTrack *t)
: tEventDlg(e, w, t)
{
Event = e;
@@ -1234,14 +1234,14 @@
char *str;
- tSysexDlg(tSysEx *s, JZPianoFrame* w, tTrack *t);
+ tSysexDlg(tSysEx *s, JZPianoFrame* w, JZTrack *t);
void AddProperties();
bool OnClose();
};
-tSysexDlg::tSysexDlg(tSysEx *s, JZPianoFrame* w, tTrack *t)
+tSysexDlg::tSysexDlg(tSysEx *s, JZPianoFrame* w, JZTrack *t)
: tEventDlg(s, w, t)
{
Event = s;
@@ -1452,7 +1452,7 @@
void EventDialog(
JZEvent* e,
JZPianoFrame* w,
- tTrack* t,
+ JZTrack* t,
long Clock,
int Channel,
int Pitch)
Modified: trunk/jazz/src/Dialogs.h
===================================================================
--- trunk/jazz/src/Dialogs.h 2008-03-18 04:25:04 UTC (rev 333)
+++ trunk/jazz/src/Dialogs.h 2008-03-18 14:25:17 UTC (rev 334)
@@ -29,7 +29,7 @@
class tFilter;
class JZSong;
class JZEventFrame;
-class tTrack;
+class JZTrack;
class JZEvent;
class tShiftDlg : public tPropertyListDlg
@@ -250,7 +250,7 @@
void EventDialog(
JZEvent*,
JZPianoFrame*,
- tTrack*,
+ JZTrack*,
long Clock,
int Channel,
int Pitch);
Modified: trunk/jazz/src/Filter.cpp
===================================================================
--- trunk/jazz/src/Filter.cpp 2008-03-18 04:25:04 UTC (rev 333)
+++ trunk/jazz/src/Filter.cpp 2008-03-18 14:25:17 UTC (rev 334)
@@ -215,7 +215,7 @@
}
-tTrack *tTrackIterator::First()
+JZTrack *tTrackIterator::First()
{
if (Reverse)
TrackNr = Filter->ToTrack;
@@ -225,7 +225,7 @@
}
-tTrack *tTrackIterator::Next()
+JZTrack *tTrackIterator::Next()
{
if (Reverse)
{
Modified: trunk/jazz/src/Filter.h
===================================================================
--- trunk/jazz/src/Filter.h 2008-03-18 04:25:04 UTC (rev 333)
+++ trunk/jazz/src/Filter.h 2008-03-18 14:25:17 UTC (rev 334)
@@ -26,7 +26,7 @@
#include "Events.h"
class JZSong;
-class tTrack;
+class JZTrack;
#define FltKeyOn 0
@@ -126,8 +126,8 @@
int Reverse;
public:
tTrackIterator(tFilter *f, int Reverse = 0);
- tTrack *First();
- tTrack *Next();
+ JZTrack *First();
+ JZTrack *Next();
int Count() const;
};
Modified: trunk/jazz/src/HarmonyBrowserAnalyzer.cpp
===================================================================
--- trunk/jazz/src/HarmonyBrowserAnalyzer.cpp 2008-03-18 04:25:04 UTC (rev 333)
+++ trunk/jazz/src/HarmonyBrowserAnalyzer.cpp 2008-03-18 14:25:17 UTC (rev 334)
@@ -121,10 +121,10 @@
}
-void HBAnalyzer::IterateEvents(void (HBAnalyzer::*Action)(tKeyOn *on, tTrack *t))
+void HBAnalyzer::IterateEvents(void (HBAnalyzer::*Action)(tKeyOn *on, JZTrack *t))
{
tTrackIterator Tracks(filter);
- tTrack *t = Tracks.First();
+ JZTrack *t = Tracks.First();
while (t)
{
if (!t->IsDrumTrack())
@@ -154,7 +154,7 @@
return (step * (to - fr)) / steps + fr;
}
-void HBAnalyzer::CountEvent(tKeyOn *on, tTrack *t)
+void HBAnalyzer::CountEvent(tKeyOn *on, JZTrack *t)
{
for (int i = 0; i < steps; i++)
{
@@ -176,7 +176,7 @@
}
-void HBAnalyzer::TransposeEvent(tKeyOn *on, tTrack *track)
+void HBAnalyzer::TransposeEvent(tKeyOn *on, JZTrack *track)
{
for (int i = 0; i < steps; i++)
{
Modified: trunk/jazz/src/HarmonyBrowserAnalyzer.h
===================================================================
--- trunk/jazz/src/HarmonyBrowserAnalyzer.h 2008-03-18 04:25:04 UTC (rev 333)
+++ trunk/jazz/src/HarmonyBrowserAnalyzer.h 2008-03-18 14:25:17 UTC (rev 334)
@@ -24,7 +24,7 @@
#define JZ_HARMONYBROWSERANALYZER_H
class tFilter;
-class tTrack;
+class JZTrack;
class HBContext;
class tKeyOn;
class HBChord;
@@ -51,11 +51,11 @@
int eighths_per_chord;
int steps;
tFilter* filter;
- tTrack* track;
+ JZTrack* track;
- void IterateEvents(void (HBAnalyzer::*Action)(tKeyOn *on, tTrack *t));
- void CountEvent(tKeyOn *on, tTrack *t);
- void TransposeEvent(tKeyOn *on, tTrack *t);
+ void IterateEvents(void (HBAnalyzer::*Action)(tKeyOn *on, JZTrack *t));
+ void CountEvent(tKeyOn *on, JZTrack *t);
+ void TransposeEvent(tKeyOn *on, JZTrack *t);
void CreateChords();
int NumCount(int i);
int MaxCount(int i, const HBChord &done);
Modified: trunk/jazz/src/PianoFrame.cpp
===================================================================
--- trunk/jazz/src/PianoFrame.cpp 2008-03-18 04:25:04 UTC (rev 333)
+++ trunk/jazz/src/PianoFrame.cpp 2008-03-18 14:25:17 UTC (rev 334)
@@ -250,7 +250,7 @@
{
}
void KeyOn(
- tTrack *t,
+ JZTrack *t,
int Pitch,
int Channel,
int Veloc = 64,
@@ -260,10 +260,10 @@
private:
- tTrack *track;
+ JZTrack *track;
};
-void tListen::KeyOn(tTrack *t, int pitch, int channel, int veloc, int milli)
+void tListen::KeyOn(JZTrack *t, int pitch, int channel, int veloc, int milli)
{
if (!Active)
{
@@ -1096,7 +1096,7 @@
}
-int JZPianoFrame::IsVisible(tTrack *t)
+int JZPianoFrame::IsVisible(JZTrack *t)
{
if (!VisibleAllTracks)
return t == Track;
@@ -1384,7 +1384,7 @@
int i;
for (i = 0; i < Song->nTracks; i++)
{
- tTrack *t = Song->GetTrack(i);
+ JZTrack *t = Song->GetTrack(i);
if (t != Track && IsVisible(t))
DrawEvents(dc, t, StatKeyOn, wxLIGHT_GREY_BRUSH, TRUE);
}
@@ -1603,7 +1603,7 @@
-void JZPianoFrame::DrawEvents(wxDC* dc, tTrack *t, int Stat, const wxBrush* Brush, int force_color)
+void JZPianoFrame::DrawEvents(wxDC* dc, JZTrack *t, int Stat, const wxBrush* Brush, int force_color)
{
//dc->SetClippingRegion(mEventsX, mEventsY, mEventsWidth, mEventsHeight);
dc->SetBrush(*Brush);
@@ -1748,7 +1748,7 @@
}
-JZEvent *JZPianoFrame::FindEvent(tTrack *Track, int Clock, int Pitch)
+JZEvent *JZPianoFrame::FindEvent(JZTrack *Track, int Clock, int Pitch)
// Pitch == -1: search for any pitches
{
tEventIterator Iterator(Track);
@@ -1774,7 +1774,7 @@
}
-void JZPianoFrame::kill_keys_aftertouch(tTrack *t, JZEvent* pEvent)
+void JZPianoFrame::kill_keys_aftertouch(JZTrack *t, JZEvent* pEvent)
{
int key,channel;
tEventIterator iter(t);
@@ -1805,7 +1805,7 @@
}
}
-void JZPianoFrame::paste_keys_aftertouch(tTrack *t, JZEvent* pEvent)
+void JZPianoFrame::paste_keys_aftertouch(JZTrack *t, JZEvent* pEvent)
{
int key,channel;
tEventIterator iter(t);
@@ -1849,7 +1849,7 @@
-void JZPianoFrame::Copy(tTrack *t, JZEvent* pEvent, int Kill)
+void JZPianoFrame::Copy(JZTrack *t, JZEvent* pEvent, int Kill)
{
if (!pEvent)
{
@@ -1900,7 +1900,7 @@
}
-void JZPianoFrame::Paste(tTrack *t, int Clock, int Pitch)
+void JZPianoFrame::Paste(JZTrack *t, int Clock, int Pitch)
{
if (PasteBuffer.nEvents == 0)
{
@@ -2105,7 +2105,7 @@
tKeyOn *KeyOn;
tKeyOn *Copy;
JZPianoFrame *Win;
- tTrack *Track;
+ JZTrack *Track;
wxDC *dc;
public:
@@ -2224,7 +2224,7 @@
tPlayTrack *KeyOn;
tPlayTrack *Copy;
JZPianoFrame *Win;
- tTrack *Track;
+ JZTrack *Track;
wxDC *dc;
public:
@@ -2436,7 +2436,7 @@
int i;
for (i = 0; i < Song->nTracks; i++)
{
- tTrack *t = Song->GetTrack(i);
+ JZTrack *t = Song->GetTrack(i);
if (IsVisible(t) && FindEvent(t, Clock, Pitch))
{
NewPosition(i, -1L);
Modified: trunk/jazz/src/PianoFrame.h
===================================================================
--- trunk/jazz/src/PianoFrame.h 2008-03-18 04:25:04 UTC (rev 333)
+++ trunk/jazz/src/PianoFrame.h 2008-03-18 14:25:17 UTC (rev 334)
@@ -31,7 +31,7 @@
class JZToolBar;
class tFilter;
class tCtrlEditBase;
-class tTrack;
+class JZTrack;
class JZPianoWindow;
//*****************************************************************************
@@ -80,7 +80,7 @@
int mFromLines[eMaxTrackCount];
int IsVisible(JZEvent *e);
- int IsVisible(tTrack *t);
+ int IsVisible(JZTrack *t);
void VisibleDialog();
bool VisibleKeyOn;
bool VisiblePitch;
@@ -117,10 +117,10 @@
void SnapDlg(wxCommandEvent& Event);
int TrackNr; // aktueller Track
- tTrack *Track;
+ JZTrack *Track;
tEventArray PasteBuffer;
- void DrawEvents(wxDC* dc, tTrack *t, int Stat, const wxBrush* Brush, int force_colors);
+ void DrawEvents(wxDC* dc, JZTrack *t, int Stat, const wxBrush* Brush, int force_colors);
void DrawEvent(wxDC* dc, JZEvent *, const wxBrush* Brush, int xoor, int force_color=0);
void DrawPianoRoll(wxDC* dc);
@@ -138,12 +138,12 @@
// Utils
int y2Pitch(int y);
int Pitch2y(int Pitch);
- JZEvent *FindEvent(tTrack *t, int Clock, int Pitch);
- void Copy(tTrack *t, JZEvent *e, int Kill);
- void Paste(tTrack *t, int Clock, int Pitch);
+ JZEvent *FindEvent(JZTrack *t, int Clock, int Pitch);
+ void Copy(JZTrack *t, JZEvent *e, int Kill);
+ void Paste(JZTrack *t, int Clock, int Pitch);
// SN++ Key_Aftertouch Utils
- void paste_keys_aftertouch(tTrack *t, JZEvent *e);
- void kill_keys_aftertouch(tTrack *t, JZEvent *e);
+ void paste_keys_aftertouch(JZTrack *t, JZEvent *e);
+ void kill_keys_aftertouch(JZTrack *t, JZEvent *e);
int nKeyOnEvents();
void LogicalMousePosition(wxMouseEvent &e, int *x, int *y);
Modified: trunk/jazz/src/Player.cpp
===================================================================
--- trunk/jazz/src/Player.cpp 2008-03-18 04:25:04 UTC (rev 333)
+++ trunk/jazz/src/Player.cpp 2008-03-18 14:25:17 UTC (rev 334)
@@ -237,7 +237,7 @@
AudioBuffer->Clear();
}
- tTrack *t;
+ JZTrack *t;
if ( !Continue )
{
@@ -510,7 +510,7 @@
for (ii = 0; ii < Song->nTracks; ii++)
{
- tTrack *Track = Song->GetTrack(ii);
+ JZTrack *Track = Song->GetTrack(ii);
if (Track)
{
tEventIterator Iterator(Track);
@@ -635,7 +635,7 @@
-void tPlayer::OutNow(tTrack *t, tParam *r) {
+void tPlayer::OutNow(JZTrack *t, tParam *r) {
OutNow(t, &r->Msb);
OutNow(t, &r->Lsb);
OutNow(t, &r->DataMsb);
Modified: trunk/jazz/src/Player.h
===================================================================
--- trunk/jazz/src/Player.h 2008-03-18 04:25:04 UTC (rev 333)
+++ trunk/jazz/src/Player.h 2008-03-18 14:25:17 UTC (rev 334)
@@ -207,7 +207,7 @@
virtual const char *GetSampleName(int i) {
return samples.GetSampleName(i);
}
- virtual void AdjustAudioLength(tTrack *t) {
+ virtual void AdjustAudioLength(JZTrack *t) {
long ticks_per_minute = Song->TicksPerQuarter * Song->Speed();
samples.AdjustAudioLength(t, ticks_per_minute);
}
@@ -242,7 +242,7 @@
virtual void OutBreak() = 0;
// send event immediately ignoring clock
- void OutNow(tTrack *t, JZEvent* pEvent)
+ void OutNow(JZTrack *t, JZEvent* pEvent)
{
pEvent->SetDevice(t->GetDevice());
OutNow(pEvent);
@@ -254,7 +254,7 @@
OutNow(pEvent);
}
- void OutNow(tTrack *t, tParam *r);
+ void OutNow(JZTrack *t, tParam *r);
// what's played right now?
virtual long GetRealTimeClock() = 0;
Modified: trunk/jazz/src/RecordingInfo.h
===================================================================
--- trunk/jazz/src/RecordingInfo.h 2008-03-18 04:25:04 UTC (rev 333)
+++ trunk/jazz/src/RecordingInfo.h 2008-03-18 14:25:17 UTC (rev 334)
@@ -23,7 +23,7 @@
#ifndef JZ_RECORDINGINFO_H
#define JZ_RECORDINGINFO_H
-class tTrack;
+class JZTrack;
//*****************************************************************************
// Description:
@@ -35,7 +35,7 @@
JZRecordingInfo();
// If the track pointer is not set, the code is not recording.
- tTrack* mpTrack;
+ JZTrack* mpTrack;
// This is the recording from clock.
long mFromClock;
Modified: trunk/jazz/src/Rhythm.cpp
===================================================================
--- trunk/jazz/src/Rhythm.cpp 2008-03-18 04:25:04 UTC (rev 333)
+++ trunk/jazz/src/Rhythm.cpp 2008-03-18 14:25:17 UTC (rev 334)
@@ -260,7 +260,7 @@
}
-void tRhythm::GenerateEvent(tTrack *track, long clock, short vel, short len)
+void tRhythm::GenerateEvent(JZTrack *track, long clock, short vel, short len)
{
int chan = track->Channel - 1;
@@ -296,7 +296,7 @@
#if 0
-void tRhythm::Generate(tTrack *track, long fr_clock, long to_clock, long ticks_per_bar)
+void tRhythm::Generate(JZTrack *track, long fr_clock, long to_clock, long ticks_per_bar)
{
int chan = track->Channel - 1;
long clock = fr_clock;
@@ -404,7 +404,7 @@
}
-void tRhythm::Generate(tTrack *track, JZBarInfo &bi, tRhythm *rhy[], int n_rhy)
+void tRhythm::Generate(JZTrack *track, JZBarInfo &bi, tRhythm *rhy[], int n_rhy)
{
JZRndArray rrg(rhythm);
@@ -1035,7 +1035,7 @@
long fr_clock = pFilter->FromClock;
long to_clock = pFilter->ToClock;
- tTrack *track = song->GetTrack(pFilter->FromTrack);
+ JZTrack *track = song->GetTrack(pFilter->FromTrack);
song->NewUndoBuffer();
// remove selection
Modified: trunk/jazz/src/Rhythm.h
===================================================================
--- trunk/jazz/src/Rhythm.h 2008-03-18 04:25:04 UTC (rev 333)
+++ trunk/jazz/src/Rhythm.h 2008-03-18 14:25:17 UTC (rev 334)
@@ -29,7 +29,7 @@
#include <iostream>
-class tTrack;
+class JZTrack;
class JZEventFrame;
class JZSong;
class JZBarInfo;
@@ -101,10 +101,10 @@
char const * GetLabel() { return label; }
void SetLabel(char const *);
- void Generate(tTrack *track, long fr_clock, long to_clock, long ticks_per_bar);
- void Generate(tTrack *track, JZBarInfo &bi, tRhythm *rhy[], int n_rhy);
+ void Generate(JZTrack *track, long fr_clock, long to_clock, long ticks_per_bar);
+ void Generate(JZTrack *track, JZBarInfo &bi, tRhythm *rhy[], int n_rhy);
void GenInit(long start_clock);
- void GenerateEvent(tTrack *track, long clock, short vel, short len);
+ void GenerateEvent(JZTrack *track, long clock, short vel, short len);
void write(std::ostream& os);
void read(std::istream& is, int version);
Modified: trunk/jazz/src/Song.cpp
===================================================================
--- trunk/jazz/src/Song.cpp 2008-03-18 04:25:04 UTC (rev 333)
+++ trunk/jazz/src/Song.cpp 2008-03-18 14:25:17 UTC (rev 334)
@@ -121,7 +121,7 @@
}
-tTrack *JZSong::GetTrack(int Nr)
+JZTrack *JZSong::GetTrack(int Nr)
{
if (Nr >= 0 && Nr < nTracks)
{
@@ -204,7 +204,7 @@
for (i = 0; i < nTracks; ++i)
{
- tTrack* pTrack = &mTracks[i];
+ JZTrack* pTrack = &mTracks[i];
if (pTrack->State == tsSolo || (!solo && pTrack->State == tsPlay))
{
if (pTrack->GetAudioMode() != mode)
@@ -245,7 +245,7 @@
if(recursionDepth>100) //yes yes, you should use symbolics...
return;
fprintf(stderr, "playtrack %d\n",c->track);
- tTrack* pTrack = &mTracks[c->track];//the track we want to play
+ JZTrack* pTrack = &mTracks[c->track];//the track we want to play
tEventIterator IteratorPL(pTrack); //get an iterator of all events the playtrack is pointing to
JZEvent *f;
@@ -469,7 +469,7 @@
double f = (double)NewTicks / (double)TicksPerQuarter;
for (tt = 0; tt < nTracks; ++tt)
{
- tTrack* pTrack = &mTracks[tt];
+ JZTrack* pTrack = &mTracks[tt];
for (ee = 0; ee < pTrack->nEvents; ee++)
{
JZEvent *e = pTrack->Events[ee];
@@ -503,7 +503,7 @@
// evtl vorhandene TimeSignatures loeschen
- tTrack* pTrack = &mTracks[0];
+ JZTrack* pTrack = &mTracks[0];
tEventIterator Iterator(pTrack);
JZEvent *e = Iterator.Range(FrClock, ToClock);
while (e)
@@ -552,7 +552,7 @@
// SN++
void JZSong::moveTrack(int from, int to)
{
- tTrack* pTrack;
+ JZTrack* pTrack;
int i;
if (from == to) return;
Modified: trunk/jazz/src/Song.h
===================================================================
--- trunk/jazz/src/Song.h 2008-03-18 04:25:04 UTC (rev 333)
+++ trunk/jazz/src/Song.h 2008-03-18 14:25:17 UTC (rev 334)
@@ -73,7 +73,7 @@
int nTracks;
int TicksPerQuarter;
- tTrack mTracks[eMaxTrackCount];
+ JZTrack mTracks[eMaxTrackCount];
void NewUndoBuffer();
void Undo();
@@ -86,7 +86,7 @@
void Read(tReadBase &io, const char *fname = 0);
void Write(tWriteBase &io, const char *fname = 0);
- tTrack *GetTrack(int Nr);
+ JZTrack *GetTrack(int Nr);
int GetLastClock();
int NumUsedTracks(); // number of used tracks
int Speed();
Modified: trunk/jazz/src/Track.cpp
===================================================================
--- trunk/jazz/src/Track.cpp 2008-03-18 04:25:04 UTC (rev 333)
+++ trunk/jazz/src/Track.cpp 2008-03-18 14:25:17 UTC (rev 334)
@@ -1682,7 +1682,7 @@
class tTrackDlg : public wxForm
{
JZTrackWindow* TrackWin;
- tTrack *trk;
+ JZTrack *trk;
char *TrackName;
tNamedChoice PatchChoice;
tNamedChoice DeviceChoice;
@@ -1693,7 +1693,7 @@
int AudioMode;
public:
- tTrackDlg::tTrackDlg(JZTrackWindow *w, tTrack *t);
+ tTrackDlg::tTrackDlg(JZTrackWindow *w, JZTrack *t);
void EditForm(wxPanel *panel);
virtual void OnOk();
virtual void OnCancel();
@@ -1701,7 +1701,7 @@
};
-tTrackDlg::tTrackDlg(JZTrackWindow *w, tTrack *t)
+tTrackDlg::tTrackDlg(JZTrackWindow *w, JZTrack *t)
: wxForm(USED_WXFORM_BUTTONS),
PatchChoice(
"Patch",
@@ -1903,7 +1903,7 @@
#endif // OBSOLETE
-void tTrack::Dialog(JZTrackWindow *parent)
+void JZTrack::Dialog(JZTrackWindow *parent)
{
#ifdef OBSOLETE
@@ -1929,13 +1929,13 @@
// ***********************************************************************
-// tTrack
+// JZTrack
// ***********************************************************************
-bool tTrack::changed = false;
+bool JZTrack::changed = false;
-tTrack::tTrack()
+JZTrack::JZTrack()
: tEventArray()
{
iUndo = 0;
@@ -1946,12 +1946,12 @@
}
-bool tTrack::IsDrumTrack()
+bool JZTrack::IsDrumTrack()
{
return Channel == gpConfig->GetValue(C_DrumChannel);
}
-void tTrack::Merge(tEventArray *t)
+void JZTrack::Merge(tEventArray *t)
{
for (int i = 0; i < t->nEvents; i++)
{
@@ -1961,7 +1961,7 @@
}
-void tTrack::MergeRange(tEventArray *other, int FromClock, int ToClock, int Replace)
+void JZTrack::MergeRange(tEventArray *other, int FromClock, int ToClock, int Replace)
{
// Erase destin
if (Replace)
@@ -1996,7 +1996,7 @@
}
-void tTrack::Cleanup()
+void JZTrack::Cleanup()
{
// on audio tracks, adjust length of keyon events to
// actual sample length
@@ -2007,7 +2007,7 @@
-void tTrack::Undo()
+void JZTrack::Undo()
{
if (nUndo > 0)
{
@@ -2035,7 +2035,7 @@
}
}
-void tTrack::Redo()
+void JZTrack::Redo()
{
if (nRedo > 0)
{
@@ -2065,7 +2065,7 @@
}
-void tTrack::NewUndoBuffer()
+void JZTrack::NewUndoBuffer()
{
nRedo = 0;
nUndo++;
@@ -2079,7 +2079,7 @@
};
-void tTrack::Clear()
+void JZTrack::Clear()
{
for (int i = 0; i < MaxUndo; i++)
{
@@ -2091,7 +2091,7 @@
// ----------------------- Copyright ------------------------------------
-char* tTrack::GetCopyright()
+char* JZTrack::GetCopyright()
{
if (Copyright)
{
@@ -2102,7 +2102,7 @@
-void tTrack::SetCopyright(char *str)
+void JZTrack::SetCopyright(char *str)
{
if (Copyright)
{
@@ -2122,7 +2122,7 @@
// ----------------------- Name ------------------------------------
-char* tTrack::GetName()
+char* JZTrack::GetName()
{
if (mName)
{
@@ -2133,7 +2133,7 @@
-void tTrack::SetName(char *str)
+void JZTrack::SetName(char *str)
{
if (mName)
{
@@ -2148,7 +2148,7 @@
// ------------------------ Volume ------------------------------
-int tTrack::GetVolume()
+int JZTrack::GetVolume()
{
if (Volume)
{
@@ -2157,7 +2157,7 @@
return 0;
}
-void tTrack::SetVolume(int Value)
+void JZTrack::SetVolume(int Value)
{
if (Volume)
{
@@ -2174,7 +2174,7 @@
// ------------------------ Pan ------------------------------
-int tTrack::GetPan()
+int JZTrack::GetPan()
{
if (Pan)
{
@@ -2183,7 +2183,7 @@
return 0;
}
-void tTrack::SetPan(int Value)
+void JZTrack::SetPan(int Value)
{
if (Pan)
{
@@ -2200,7 +2200,7 @@
// ------------------------ Reverb ------------------------------
-int tTrack::GetReverb()
+int JZTrack::GetReverb()
{
if (Reverb)
{
@@ -2209,7 +2209,7 @@
return 0;
}
-void tTrack::SetReverb(int Value)
+void JZTrack::SetReverb(int Value)
{
if (Reverb)
{
@@ -2226,7 +2226,7 @@
// ------------------------ Chorus ------------------------------
-int tTrack::GetChorus()
+int JZTrack::GetChorus()
{
if (Chorus)
{
@@ -2235,7 +2235,7 @@
return 0;
}
-void tTrack::SetChorus(int Value)
+void JZTrack::SetChorus(int Value)
{
if (Chorus)
{
@@ -2252,7 +2252,7 @@
// ------------------------ Bank ------------------------------
-int tTrack::GetBank()
+int JZTrack::GetBank()
{
if (!gpConfig->GetValue(C_UseTwoCommandBankSelect))
{
@@ -2284,7 +2284,7 @@
return 0;
}
-void tTrack::SetBank(int Value)
+void JZTrack::SetBank(int Value)
{
if (mpBank)
{
@@ -2350,7 +2350,7 @@
// ------------------------ Patch ------------------------------
-int tTrack::GetPatch()
+int JZTrack::GetPatch()
{
if (mPatch)
{
@@ -2359,7 +2359,7 @@
return 0;
}
-void tTrack::SetPatch(int PatchNr)
+void JZTrack::SetPatch(int PatchNr)
{
if (mPatch)
{
@@ -2376,7 +2376,7 @@
// ------------------------ VibRate ------------------------------
-int tTrack::GetVibRate()
+int JZTrack::GetVibRate()
{
if (VibRate)
{
@@ -2385,7 +2385,7 @@
return 0;
}
-void tTrack::SetVibRate(int Value)
+void JZTrack::SetVibRate(int Value)
{
if (VibRate)
{
@@ -2403,7 +2403,7 @@
// ------------------------ VibDepth ------------------------------
-int tTrack::GetVibDepth()
+int JZTrack::GetVibDepth()
{
if (VibDepth)
{
@@ -2412,7 +2412,7 @@
return 0;
}
-void tTrack::SetVibDepth(int Value)
+void JZTrack::SetVibDepth(int Value)
{
if (VibDepth)
{
@@ -2429,7 +2429,7 @@
// ------------------------ VibDelay ------------------------------
-int tTrack::GetVibDelay()
+int JZTrack::GetVibDelay()
{
if (VibDelay)
{
@@ -2438,7 +2438,7 @@
return 0;
}
-void tTrack::SetVibDelay(int Value)
+void JZTrack::SetVibDelay(int Value)
{
if (VibDelay)
{
@@ -2456,7 +2456,7 @@
// ------------------------ Cutoff ------------------------------
-int tTrack::GetCutoff()
+int JZTrack::GetCutoff()
{
if (Cutoff)
{
@@ -2465,7 +2465,7 @@
return 0;
}
-void tTrack::SetCutoff(int Value)
+void JZTrack::SetCutoff(int Value)
{
if (Cutoff)
{
@@ -2483,7 +2483,7 @@
// ------------------------ Resonance ------------------------------
-int tTrack::GetResonance()
+int JZTrack::GetResonance()
{
if (Resonance)
{
@@ -2492,7 +2492,7 @@
return 0;
}
-void tTrack::SetResonance(int Value)
+void JZTrack::SetResonance(int Value)
{
if (Resonance)
{
@@ -2510,7 +2510,7 @@
// ------------------------ EnvAttack ------------------------------
-int tTrack::GetEnvAttack()
+int JZTrack::GetEnvAttack()
{
if (EnvAttack)
{
@@ -2519,7 +2519,7 @@
return 0;
}
-void tTrack::SetEnvAttack(int Value)
+void JZTrack::SetEnvAttack(int Value)
{
if (EnvAttack)
{
@@ -2537,7 +2537,7 @@
// ------------------------ EnvDecay ------------------------------
-int tTrack::GetEnvDecay()
+int JZTrack::GetEnvDecay()
{
if (EnvDecay)
{
@@ -2546,7 +2546,7 @@
return 0;
}
-void tTrack::SetEnvDecay(int Value)
+void JZTrack::SetEnvDecay(int Value)
{
if (EnvDecay)
{
@@ -2564,7 +2564,7 @@
// ------------------------ EnvRelease ------------------------------
-int tTrack::GetEnvRelease()
+int JZTrack::GetEnvRelease()
{
if (EnvRelease)
{
@@ -2573,7 +2573,7 @@
return 0;
}
-void tTrack::SetEnvRelease(int Value)
+void JZTrack::SetEnvRelease(int Value)
{
if (EnvRelease)
{
@@ -2591,7 +2591,7 @@
// ------------------------ DrumParam ------------------------------
-int tTrack::GetDrumParam(int pitch, int index)
+int JZTrack::GetDrumParam(int pitch, int index)
{
if (!DrumParams.IsEmpty())
{
@@ -2604,7 +2604,7 @@
return 0;
}
-void tTrack::SetDrumParam(int pitch, int index, int Value)
+void JZTrack::SetDrumParam(int pitch, int index, int Value)
{
DrumParams.DelParam(pitch, index);
if (Value > 0)
@@ -2618,7 +2618,7 @@
// ------------------------ BendPitchSens ------------------------------
-int tTrack::GetBendPitchSens()
+int JZTrack::GetBendPitchSens()
{
if (BendPitchSens)
{
@@ -2627,7 +2627,7 @@
return 0;
}
-void tTrack::SetBendPitchSens(int Value)
+void JZTrack::SetBendPitchSens(int Value)
{
if (BendPitchSens)
{
@@ -2645,7 +2645,7 @@
// ------------------------ Modulation Sysex ------------------------------
-int tTrack::GetModulationSysex(int msp)
+int JZTrack::GetModulationSysex(int msp)
{
unsigned char *valp = gpSynth->GetSysexValPtr(ModulationSettings[msp]);
@@ -2657,7 +2657,7 @@
return 0;
}
-void tTrack::SetModulationSysex(int msp, int Value)
+void JZTrack::SetModulationSysex(int msp, int Value)
{
if (ModulationSettings[msp])
{
@@ -2677,7 +2677,7 @@
// ------------------------ Bender Sysex ------------------------------
-int tTrack::GetBenderSysex(int bsp)
+int JZTrack::GetBenderSysex(int bsp)
{
unsigned char *valp = gpSynth->GetSysexValPtr(BenderSettings[bsp]);
@@ -2689,7 +2689,7 @@
return 0;
}
-void tTrack::SetBenderSysex(int bsp, int Value)
+void JZTrack::SetBenderSysex(int bsp, int Value)
{
if (BenderSettings[bsp])
{
@@ -2709,7 +2709,7 @@
// ------------------------ CAf Sysex ------------------------------
-int tTrack::GetCAfSysex(int csp)
+int JZTrack::GetCAfSysex(int csp)
{
unsigned char *valp = gpSynth->GetSysexValPtr(CAfSettings[csp]);
@@ -2721,7 +2721,7 @@
return 0;
}
-void tTrack::SetCAfSysex(int csp, int Value)
+void JZTrack::SetCAfSysex(int csp, int Value)
{
if (CAfSettings[csp])
{
@@ -2741,7 +2741,7 @@
// ------------------------ PAf Sysex ------------------------------
-int tTrack::GetPAfSysex(int psp)
+int JZTrack::GetPAfSysex(int psp)
{
unsigned char *valp = gpSynth->GetSysexValPtr(PAfSettings[psp]);
@@ -2753,7 +2753,7 @@
return 0;
}
-void tTrack::SetPAfSysex(int psp, int Value)
+void JZTrack::SetPAfSysex(int psp, int Value)
{
if (PAfSettings[psp])
{
@@ -2773,7 +2773,7 @@
// ------------------------ CC1 Sysex ------------------------------
-int tTrack::GetCC1Sysex(int csp)
+int JZTrack::GetCC1Sysex(int csp)
{
unsigned char *valp = gpSynth->GetSysexValPtr(CC1Settings[csp]);
@@ -2785,7 +2785,7 @@
return 0;
}
-void tTrack::SetCC1Sysex(int csp, int Value)
+void JZTrack::SetCC1Sysex(int csp, int Value)
{
if (CC1Settings[csp])
{
@@ -2805,7 +2805,7 @@
// ------------------------ CC2 Sysex ------------------------------
-int tTrack::GetCC2Sysex(int csp)
+int JZTrack::GetCC2Sysex(int csp)
{
unsigned char *valp = gpSynth->GetSysexValPtr(CC2Settings[csp]);
@@ -2817,7 +2817,7 @@
return 0;
}
-void tTrack::SetCC2Sysex(int csp, int Value)
+void JZTrack::SetCC2Sysex(int csp, int Value)
{
if (CC2Settings[csp])
Kill(CC2Settings[csp]);
@@ -2835,7 +2835,7 @@
// ------------------------ CC1ControllerNr Sysex ------------------------------
-int tTrack::GetCC1ControllerNr()
+int JZTrack::GetCC1ControllerNr()
{
unsigned char *valp = gpSynth->GetSysexValPtr(CC1ControllerNr);
@@ -2847,7 +2847,7 @@
return 0;
}
-void tTrack::SetCC1ControllerNr(int Value)
+void JZTrack::SetCC1ControllerNr(int Value)
{
if (CC1ControllerNr)
{
@@ -2867,7 +2867,7 @@
// ------------------------ CC2ControllerNr Sysex ------------------------------
-int tTrack::GetCC2ControllerNr()
+int JZTrack::GetCC2ControllerNr()
{
unsigned char *valp = gpSynth->GetSysexValPtr(CC2ControllerNr);
@@ -2879,7 +2879,7 @@
return 0;
}
-void tTrack::SetCC2ControllerNr(int Value)
+void JZTrack::SetCC2ControllerNr(int Value)
{
if (CC2ControllerNr)
{
@@ -2899,7 +2899,7 @@
// ------------------------ Reverb Type ------------------------------
-int tTrack::GetReverbType(int lsb)
+int JZTrack::GetReverbType(int lsb)
{
unsigned char *valp = gpSynth->GetSysexValPtr(ReverbType);
@@ -2915,7 +2915,7 @@
return 0;
}
-void tTrack::SetReverbType(int Value, int lsb)
+void JZTrack::SetReverbType(int Value, int lsb)
{
if (ReverbType)
{
@@ -2939,7 +2939,7 @@
// ------------------------ Chorus Type ------------------------------
-int tTrack::GetChorusType(int lsb)
+int JZTrack::GetChorusType(int lsb)
{
unsigned char *valp = gpSynth->GetSysexValPtr(ChorusType);
@@ -2956,7 +2956,7 @@
return 0;
}
-void tTrack::SetChorusType(int Value, int lsb)
+void JZTrack::SetChorusType(int Value, int lsb)
{
if (ChorusType)
{
@@ -2980,7 +2980,7 @@
// ----------------------- Equalizer Type ------------------------------
-int tTrack::GetEqualizerType()
+int JZTrack::GetEqualizerType()
{
unsigned char *valp = gpSynth->GetSysexValPtr(EqualizerType);
@@ -2992,7 +2992,7 @@
return 0;
}
-void tTrack::SetEqualizerType(int Value)
+void JZTrack::SetEqualizerType(int Value)
{
if (EqualizerType)
{
@@ -3013,7 +3013,7 @@
// ------------------------ Reverb Parameters Sysex ------------------------------
-int tTrack::GetRevSysex(int rsp)
+int JZTrack::GetRevSysex(int rsp)
{
unsigned char *valp = gpSynth->GetSysexValPtr(ReverbSettings[rsp]);
@@ -3025,7 +3025,7 @@
return 0;
}
-void tTrack::SetRevSysex(int rsp, int Value)
+void JZTrack::SetRevSysex(int rsp, int Value)
{
if (ReverbSettings[rsp])
{
@@ -3049,7 +3049,7 @@
// ------------------------ Chorus Parameters Sysex ------------------------------
-int tTrack::GetChoSysex(int csp)
+int JZTrack::GetChoSysex(int csp)
{
unsigned char *valp = gpSynth->GetSysexValPtr(ChorusSettings[csp]);
@@ -3061,7 +3061,7 @@
return 0;
}
-void tTrack::SetChoSysex(int csp, int Value)
+void JZTrack::SetChoSysex(int csp, int Value)
{
if (ChorusSettings[csp])
{
@@ -3086,7 +3086,7 @@
// ------------------------ Partial Reserve ------------------------------
-int tTrack::GetPartRsrv(int chan)
+int JZTrack::GetPartRsrv(int chan)
{
unsigned char *valp = gpSynth->GetSysexValPtr(PartialReserve);
@@ -3098,7 +3098,7 @@
return 0;
}
-void tTrack::SetPartRsrv(unsigned char *rsrv)
+void JZTrack::SetPartRsrv(unsigned char *rsrv)
{
if (PartialReserve)
{
@@ -3119,7 +3119,7 @@
// ------------------------ Master Volume ------------------------------
-int tTrack::GetMasterVol()
+int JZTrack::GetMasterVol()
{
unsigned char *valp = gpSynth->GetSysexValPtr(MasterVol);
@@ -3137,7 +3137,7 @@
return 0;
}
-void tTrack::SetMasterVol(int Value)
+void JZTrack::SetMasterVol(int Value)
{
if (MasterVol)
{
@@ -3158,7 +3158,7 @@
// ------------------------ Master Pan ------------------------------
-int tTrack::GetMasterPan()
+int JZTrack::GetMasterPan()
{
unsigned char *valp = gpSynth->GetSysexValPtr(MasterPan);
@@ -3170,7 +3170,7 @@
return 0;
}
-void tTrack::SetMasterPan(int Value)
+void JZTrack::SetMasterPan(int Value)
{
if (MasterPan)
{
@@ -3190,7 +3190,7 @@
// ------------------------ Mode Sysex ------------------------------
-int tTrack::GetModeSysex(int param)
+int JZTrack::GetModeSysex(int param)
{
unsigned char *valp = 0;
@@ -3213,7 +3213,7 @@
return 0;
}
-void tTrack::SetModeSysex(int param, int Value)
+void JZTrack::SetModeSysex(int param, int Value)
{
switch (param)
{
@@ -3257,7 +3257,7 @@
// ------------------------ Mtc offset (Time Code Offset) ------------------------------
-tMtcTime* tTrack::GetMtcOffset()
+tMtcTime* JZTrack::GetMtcOffset()
{
if (MtcOffset)
{
@@ -3266,7 +3266,7 @@
return(new tMtcTime(0, Mtc30Ndf));
}
-void tTrack::SetMtcOffset(tMtcTime* mtc)
+void JZTrack::SetMtcOffset(tMtcTime* mtc)
{
if (MtcOffset)
{
@@ -3282,7 +3282,7 @@
// ------------------------ Speed ------------------------------
-int tTrack::GetDefaultSpeed()
+int JZTrack::GetDefaultSpeed()
{
if (Speed)
{
@@ -3292,7 +3292,7 @@
}
-void tTrack::SetDefaultSpeed(int bpm)
+void JZTrack::SetDefaultSpeed(int bpm)
{
JZEvent *e = new tSetTempo(0, bpm);
if (Speed)
@@ -3304,7 +3304,7 @@
Cleanup();
}
-tSetTempo *tTrack::GetCurrentTempo(int clk)
+tSetTempo *JZTrack::GetCurrentTempo(int clk)
{
tEventIterator Iterator(this);
Sort();
@@ -3322,7 +3322,7 @@
return t;
}
-int tTrack::GetCurrentSpeed(int clk)
+int JZTrack::GetCurrentSpeed(int clk)
{
tSetTempo *t = GetCurrentTempo(clk);
if (t)
@@ -3337,7 +3337,7 @@
// ------------------------- State ----------------------------------
-char *tTrack::GetStateChar()
+char *JZTrack::GetStateChar()
{
switch (State)
{
@@ -3351,19 +3351,19 @@
return "?";
}
-void tTrack::SetState(int NewState)
+void JZTrack::SetState(int NewState)
{
State = NewState % 3;
}
-void tTrack::ToggleState(int Direction)
+void JZTrack::ToggleState(int Direction)
{
State = (State + Direction + 3) % 3;
}
// ------------------------- Channel ---------------------------
-void tTrack::SetChannel(int NewChannel)
+void JZTrack::SetChannel(int NewChannel)
{
Channel = NewChannel;
}
Modified: trunk/jazz/src/Track.h
===================================================================
--- trunk/jazz/src/Track.h 2008-03-18 04:25:04 UTC (rev 333)
+++ trunk/jazz/src/Track.h 2008-03-18 14:25:17 UTC (rev 334)
@@ -284,7 +284,7 @@
class tUndoBuffer : public tSimpleEventArray
{
- friend class tTrack;
+ friend class JZTrack;
public:
@@ -305,7 +305,7 @@
{
friend class tEventIterator;
friend class tTrackDlg;
- friend class tTrack;
+ friend class JZTrack;
public:
@@ -398,14 +398,14 @@
#define MaxUndo 20
-class tTrack : public tEventArray
+class JZTrack : public tEventArray
{
public:
static bool changed;
- tTrack();
- ~tTrack() { Clear(); }
+ JZTrack();
+ ~JZTrack() { Clear(); }
bool IsDrumTrack();
Modified: trunk/jazz/src/TrackFrame.cpp
===================================================================
--- trunk/jazz/src/TrackFrame.cpp 2008-03-18 04:25:04 UTC (rev 333)
+++ trunk/jazz/src/TrackFrame.cpp 2008-03-18 14:25:17 UTC (rev 334)
@@ -396,7 +396,7 @@
//-----------------------------------------------------------------------------
bool JZTrackFrame::OnClose()
{
-// if (tTrack::changed)
+// if (JZTrack::changed)
// {
// if (
// ::wxMessageBox(
@@ -444,7 +444,7 @@
// mpTrackWindow->SetScrollPosition(0, 0);
// NextWin->Canvas->SetScrollRanges();
mpTrackWindow->Refresh(false);
-// tTrack::changed = false;
+// JZTrack::changed = false;
}
}
Modified: trunk/jazz/src/TrackWindow.cpp
===================================================================
--- trunk/jazz/src/TrackWindow.cpp 2008-03-18 04:25:04 UTC (rev 333)
+++ trunk/jazz/src/TrackWindow.cpp 2008-03-18 14:25:17 UTC (rev 334)
@@ -287,61 +287,70 @@
{
wxPoint Point = Event.GetPosition();
- // Check to see if the mouse was clicked inside of the number mode
- // indicator.
- if (Point.x < mNumberWidth && Point.y < mTopInfoHeight)
+ // Check to see if the mouse was clicked in the top header.
+ if (Point.y < mTopInfoHeight)
{
- if (mNumberMode == eNmTrackNr)
+ // Check to see if the mouse was clicked inside of the number mode
+ // indicator.
+ if (Point.x < mNumberWidth && Point.y < mTopInfoHeight)
{
- mNumberMode = eNmMidiChannel;
- Refresh(false);
+ if (mNumberMode == eNmTrackNr)
+ {
+ mNumberMode = eNmMidiChannel;
+ Refresh(false);
+ }
+ else
+ {
+ mNumberMode = eNmTrackNr;
+ Refresh(false);
+ }
}
- else
+ // Check to see if the mouse was clicked inside of the track name header.
+ else if (
+ Point.x >= mTrackNameX &&
+ Point.x < mTrackNameX + mTrackNameWidth)
{
- mNumberMode = eNmTrackNr;
+ // Bump up the speed value one tick.
+ int SpeedBpm = gpProject->GetTrack(0)->GetDefaultSpeed();
+ ++SpeedBpm;
+ if (SpeedBpm > 0 && SpeedBpm < 300)
+ {
+ gpProject->GetTrack(0)->SetDefaultSpeed(SpeedBpm);
+ }
Refresh(false);
}
- }
- else if (
- Point.x >= mTrackNameX && Point.x < mTrackNameX + mTrackNameWidth &&
- Point.y < mTopInfoHeight)
- {
- // Bump up the speed value one tick.
- int SpeedBpm = gpProject->GetTrack(0)->GetDefaultSpeed();
- ++SpeedBpm;
- if (SpeedBpm > 0 && SpeedBpm < 300)
+ // Check to see if the mouse was clicked inside of the patch header.
+ else if (Point.x >= mPatchX && Point.x < mPatchX + mPatchWidth)
{
- gpProject->GetTrack(0)->SetDefaultSpeed(SpeedBpm);
+ // Toggle the patch type.
+ switch (mCounterMode)
+ {
+ case eCmProgram:
+ mCounterMode = eCmBank;
+ break;
+ case eCmBank:
+ mCounterMode = eCmVolume;
+ break;
+ case eCmVolume:
+ mCounterMode = eCmPan;
+ break;
+ case eCmPan:
+ mCounterMode = eCmReverb;
+ break;
+ case eCmReverb:
+ mCounterMode = eCmChorus;
+ break;
+ case eCmChorus:
+ default:
+ mCounterMode = eCmProgram;
+ break;
+ }
+ Refresh(false);
}
- Refresh(false);
}
- else if (
- Point.x >= mPatchX && Point.x < mPatchX + mPatchWidth &&
- Point.y < mTopInfoHeight)
+ else if (Point.x >= mStateX && Point.x < mStateX + mStateWidth)
{
- switch (mCounterMode)
- {
- case eCmProgram:
- mCounterMode = eCmBank;
- break;
- case eCmBank:
- mCounterMode = eCmVolume;
- break;
- case eCmVolume:
- mCounterMode = eCmPan;
- break;
- case eCmPan:
- mCounterMode = eCmReverb;
- break;
- case eCmReverb:
- mCounterMode = eCmChorus;
- break;
- case eCmChorus:
- default:
- mCounterMode = eCmProgram;
- break;
- }
- Refresh(false);
+ ToggleTrackState(Point);
}
}
@@ -368,6 +377,18 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
+void JZTrackWindow::ToggleTrackState(const wxPoint& Point)
+{
+ JZTrack* pTrack = y2Track(Point.y);
+ if (pTrack)
+ {
+ pTrack->ToggleState(1);
+ Refresh(false);
+ }
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
void JZTrackWindow::ZoomIn()
{
if (mClocksPerPixel >= 2)
@@ -550,7 +571,10 @@
// For each track show the MIDI channel, name, state, prg.
int TrackNumber = mFromLine;
- for (int y = Track2y(TrackNumber); y < mEventsY + mEventsHeight; y += mTrackHeight)
+ for (
+ int y = TrackIndex2y(TrackNumber);
+ y < mEventsY + mEventsHeight;
+ y += mTrackHeight)
{
LocalDc.SetClippingRegion(
0,
@@ -565,7 +589,7 @@
LocalDc.DestroyClippingRegion();
- tTrack* pTrack = gpProject->GetTrack(TrackNumber);
+ JZTrack* pTrack = gpProject->GetTrack(TrackNumber);
if (pTrack)
{
LocalDc.SetClippingRegion(
@@ -650,12 +674,12 @@
Dc.SetClippingRegion(0, mEventsY, mNumberWidth, mEventsHeight);
for (int i = mFromLine; i < mToLine; ++i)
{
- tTrack* pTrack = gpProject->GetTrack(i);
+ JZTrack* pTrack = gpProject->GetTrack(i);
if (pTrack != 0)
{
if (pTrack->GetAudioMode())
{
- LineText(Dc, 0, Track2y(i), mNumberWidth, "Au");
+ LineText(Dc, 0, TrackIndex2y(i), mNumberWidth, "Au");
}
else
{
@@ -674,12 +698,12 @@
}
ostringstream Oss;
Oss << setw(2) << Value;
- LineText(Dc, 0, Track2y(i), mNumberWidth, Oss.str().c_str());
+ LineText(Dc, 0, TrackIndex2y(i), mNumberWidth, Oss.str().c_str());
}
}
else
{
- LineText(Dc, 0, Track2y(i), mNumberWidth, "");
+ LineText(Dc, 0, TrackIndex2y(i), mNumberWidth, "");
}
}
Dc.DestroyClippingRegion();
@@ -785,17 +809,21 @@
x -= 2;
y -= 2;
}
- wxColor bg = Dc.GetTextBackground();
- Dc.SetTextBackground(*mpGreyColor);
- int TextWidth, TextHeight;
- Dc.GetTextExtent(pString, &TextWidth, &TextHeight);
- int Margin = (Width - TextWidth) / 2;
- if (Margin < mLittleBit)
+
+ if (pString && strlen(pString) > 0)
{
- Margin = mLittleBit;
+ wxColor TextBackgroundColor = Dc.GetTextBackground();
+ Dc.SetTextBackground(*mpGreyColor);
+ int TextWidth, TextHeight;
+ Dc.GetTextExtent(pString, &TextWidth, &TextHeight);
+ int Margin = (Width - TextWidth) / 2;
+ if (Margin < mLittleBit)
+ {
+ Margin = mLittleBit;
+ }
+ Dc.DrawText(pString, x + Margin, y + mLittleBit);
+ Dc.SetTextBackground(TextBackgroundColor);
}
- Dc.DrawText(pString, x + Margin, y + mLittleBit);
- Dc.SetTextBackground(*wxWHITE);
}
//-----------------------------------------------------------------------------
@@ -809,7 +837,7 @@
Dc.SetClippingRegion(mPatchX, mEventsY, mPatchWidth, mEventsHeight);
for (i = mFromLine; i < mToLine; i++)
{
- tTrack* pTrack = gpProject->GetTrack(i);
+ JZTrack* pTrack = gpProject->GetTrack(i);
if (pTrack)
{
int Value;
@@ -839,11 +867,11 @@
}
ostringstream Oss;
Oss << setw(3) << Value;
- LineText(Dc, mPatchX, Track2y(i), mPatchWidth, Oss.str().c_str());
+ LineText(Dc, mPatchX, TrackIndex2y(i), mPatchWidth, Oss.str().c_str());
}
else
{
- LineText(Dc, mPatchX, Track2y(i), mPatchWidth, "?");
+ LineText(Dc, mPatchX, TrackIndex2y(i), mPatchWidth, "?");
}
}
Dc.DestroyClippingRegion();
@@ -865,9 +893,12 @@
Dc.SetClippingRegion(mEventsX, mEventsY, mEventsWidth, mEventsHeight);
int TrackNumber = mFromLine;
- for (int y = Track2y(TrackNumber); y < mEventsY + mEventsHeight; y += mTrackHeight)
+ for (
+ int y = TrackIndex2y(TrackNumber);
+ y < mEventsY + mEventsHeight;
+ y += mTrackHeight)
{
- tTrack *Track = gpProject->GetTrack(TrackNumber...
[truncated message content] |
