Menu
▾
▴
SF.net SVN: jazzplusplus: [371] trunk/jazz/src
|
From: <pst...@us...> - 2008-03-30 14:55:53
|
Revision: 371
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=371&view=rev
Author: pstieber
Date: 2008-03-30 07:55:50 -0700 (Sun, 30 Mar 2008)
Log Message:
-----------
Changed tFilter to JZFilter.
Modified Paths:
--------------
trunk/jazz/src/Command.cpp
trunk/jazz/src/Command.h
trunk/jazz/src/Dialogs.cpp
trunk/jazz/src/Dialogs.h
trunk/jazz/src/EventWindow.cpp
trunk/jazz/src/EventWindow.h
trunk/jazz/src/Filter.cpp
trunk/jazz/src/Filter.h
trunk/jazz/src/HarmonyBrowserAnalyzer.cpp
trunk/jazz/src/HarmonyBrowserAnalyzer.h
trunk/jazz/src/PianoWindow.cpp
trunk/jazz/src/PianoWindow.h
trunk/jazz/src/Project.h
trunk/jazz/src/Rhythm.cpp
trunk/jazz/src/TrackWindow.cpp
trunk/jazz/src/TrackWindow.h
Modified: trunk/jazz/src/Command.cpp
===================================================================
--- trunk/jazz/src/Command.cpp 2008-03-30 14:48:11 UTC (rev 370)
+++ trunk/jazz/src/Command.cpp 2008-03-30 14:55:50 UTC (rev 371)
@@ -39,7 +39,7 @@
//*****************************************************************************
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-tCommand::tCommand(tFilter* pFilter)
+tCommand::tCommand(JZFilter* pFilter)
: mpFilter(pFilter),
mpSong(pFilter->mpSong),
mReverse(0)
@@ -112,7 +112,7 @@
{
public:
- tSelectedKeys(tFilter* pFilter);
+ tSelectedKeys(JZFilter* pFilter);
void ExecuteEvent(JZTrack* pTrack, JZEvent* pEvent);
@@ -123,7 +123,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-tSelectedKeys::tSelectedKeys(tFilter* pFilter)
+tSelectedKeys::tSelectedKeys(JZFilter* pFilter)
: tCommand(pFilter)
{
int i;
@@ -150,7 +150,7 @@
// c d e f g a b
static const int CMajor[12] = { 1, 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1 };
-void tScale::Init(int ScaleNr, tFilter *f)
+void tScale::Init(int ScaleNr, JZFilter *f)
{
int i;
@@ -190,7 +190,7 @@
}
-int tScale::Analyze(tFilter *f)
+int tScale::Analyze(JZFilter *f)
{
long keys[12];
for (int i = 0; i < 12; i++)
@@ -289,7 +289,7 @@
// tCmdShift
// ***********************************************************************
-tCmdShift::tCmdShift(tFilter *f, long dclk)
+tCmdShift::tCmdShift(JZFilter *f, long dclk)
: tCommand(f)
{
DeltaClock = dclk;
@@ -307,7 +307,7 @@
// tCmdErase
// ************************************************************************
-tCmdErase::tCmdErase(tFilter *f, int lvsp)
+tCmdErase::tCmdErase(JZFilter *f, int lvsp)
: tCommand(f)
{
LeaveSpace = lvsp;
@@ -318,7 +318,7 @@
tCommand::Execute(NewUndo);
if (!LeaveSpace)
{
- tFilter f(mpFilter);
+ JZFilter f(mpFilter);
f.FromClock = mpFilter->ToClock;
f.ToClock = mpSong->GetLastClock() + 1;
long DeltaClock = mpFilter->FromClock - mpFilter->ToClock;
@@ -336,7 +336,7 @@
// tCmdQuantize
// ************************************************************************
-tCmdQuantize::tCmdQuantize(tFilter *f, long clks, int grov, int dly)
+tCmdQuantize::tCmdQuantize(JZFilter *f, long clks, int grov, int dly)
: tCommand(f)
{
QntClocks = clks;
@@ -380,7 +380,7 @@
// tCmdTranspose
// ************************************************************************
-tCmdTranspose::tCmdTranspose(tFilter *f, int notes, int ScaleNr, int fit)
+tCmdTranspose::tCmdTranspose(JZFilter *f, int notes, int ScaleNr, int fit)
: tCommand(f)
{
Scale.Init(ScaleNr, mpFilter);
@@ -426,7 +426,7 @@
// tCmdSetChannel
// ************************************************************************
-tCmdSetChannel::tCmdSetChannel(tFilter *f, int chan)
+tCmdSetChannel::tCmdSetChannel(JZFilter *f, int chan)
: tCommand(f)
{
NewChannel = chan;
@@ -449,7 +449,7 @@
// tCmdVelocity
// ************************************************************************
-tCmdVelocity::tCmdVelocity(tFilter *f, int from, int to, int m)
+tCmdVelocity::tCmdVelocity(JZFilter *f, int from, int to, int m)
: tCommand(f)
{
FromValue = from;
@@ -484,7 +484,7 @@
// tCmdLength
// ************************************************************************
-tCmdLength::tCmdLength(tFilter *f, int from, int to, int m)
+tCmdLength::tCmdLength(JZFilter *f, int from, int to, int m)
: tCommand(f)
{
FromValue = from;
@@ -524,7 +524,7 @@
// by factor "scale" from starting point "startClock"
// ************************************************************************
-tCmdSeqLength::tCmdSeqLength(tFilter *f, double scale)
+tCmdSeqLength::tCmdSeqLength(JZFilter *f, double scale)
: tCommand(f)
{
this->scale=scale;
@@ -559,7 +559,7 @@
// to a pitch bend/volume control sequence instead
// ************************************************************************
-tCmdConvertToModulation::tCmdConvertToModulation(tFilter *f)
+tCmdConvertToModulation::tCmdConvertToModulation(JZFilter *f)
: tCommand(f)
{
}
@@ -639,7 +639,7 @@
// JAVE this is a simple midi delay line
// ************************************************************************
-tCmdMidiDelay::tCmdMidiDelay(tFilter *f, double scale, long clockDelay, int repeat)
+tCmdMidiDelay::tCmdMidiDelay(JZFilter *f, double scale, long clockDelay, int repeat)
: tCommand(f)
{
this->scale=scale;
@@ -669,7 +669,7 @@
// tCmdCleanup
// ************************************************************************
-tCmdCleanup::tCmdCleanup(tFilter *f, long clks, int so)
+tCmdCleanup::tCmdCleanup(JZFilter *f, long clks, int so)
: tCommand(f)
{
lengthLimit = clks;
@@ -711,7 +711,7 @@
// tCmdSearchReplace
// ************************************************************************
-tCmdSearchReplace::tCmdSearchReplace(tFilter *f, short sf, short st)
+tCmdSearchReplace::tCmdSearchReplace(JZFilter *f, short sf, short st)
: tCommand(f)
{
fr = sf;
@@ -738,7 +738,7 @@
// ************************************************************************
tCmdCopyToBuffer::tCmdCopyToBuffer(
- tFilter* pFilter,
+ JZFilter* pFilter,
tEventArray* pBuffer)
: tCommand(pFilter)
{
@@ -756,7 +756,7 @@
-tCmdCopy::tCmdCopy(tFilter *f, long dt, long dc)
+tCmdCopy::tCmdCopy(JZFilter *f, long dt, long dc)
: tCommand(f)
{
DestTrack = dt;
@@ -893,7 +893,7 @@
// tCmdExchLeftRight
// ************************************************************************
-tCmdExchLeftRight::tCmdExchLeftRight(tFilter *f)
+tCmdExchLeftRight::tCmdExchLeftRight(JZFilter *f)
: tCommand(f)
{
}
@@ -914,7 +914,7 @@
// tCmdExchUpDown
// ************************************************************************
-tCmdExchUpDown::tCmdExchUpDown(tFilter *f)
+tCmdExchUpDown::tCmdExchUpDown(JZFilter *f)
: tCommand(f)
{
}
@@ -972,7 +972,7 @@
// ************************************************************************
//enum prop { veloc, length, key, rhythm, random, pan, modul, cc1, cc2, pitch, clock };
-tCmdMapper::tCmdMapper(tFilter *f, prop src, prop dst, JZRndArray &arr, int nb, int ad)
+tCmdMapper::tCmdMapper(JZFilter *f, prop src, prop dst, JZRndArray &arr, int nb, int ad)
: tCommand(f),
array(arr)
{
Modified: trunk/jazz/src/Command.h
===================================================================
--- trunk/jazz/src/Command.h 2008-03-30 14:48:11 UTC (rev 370)
+++ trunk/jazz/src/Command.h 2008-03-30 14:55:50 UTC (rev 371)
@@ -23,7 +23,7 @@
#ifndef JZ_COMMAND_H
#define JZ_COMMAND_H
-class tFilter;
+class JZFilter;
class JZEvent;
class JZTrack;
class JZSong;
@@ -35,7 +35,7 @@
class tScale
{
public:
- void Init(int ScaleNr, tFilter *f = 0);
+ void Init(int ScaleNr, JZFilter *f = 0);
int ScaleKeys[12];
int Member(int Key)
@@ -47,7 +47,7 @@
int Prev(int Key);
int Transpose(int Key, int Steps);
int FitInto(int Key);
- static int Analyze(tFilter *f); // returns ScaleNr
+ static int Analyze(JZFilter *f); // returns ScaleNr
};
@@ -55,7 +55,7 @@
{
public:
- tCommand(tFilter* pFilter);
+ tCommand(JZFilter* pFilter);
virtual ~tCommand();
@@ -69,7 +69,7 @@
public:
- tFilter* mpFilter;
+ JZFilter* mpFilter;
JZSong* mpSong;
int mReverse;
};
@@ -79,7 +79,7 @@
{
long DeltaClock;
public:
- tCmdShift(tFilter *f, long DeltaClock);
+ tCmdShift(JZFilter *f, long DeltaClock);
virtual void ExecuteEvent(JZTrack *t, JZEvent *e);
};
@@ -88,7 +88,7 @@
{
public:
int LeaveSpace;
- tCmdErase(tFilter *f, int LeaveSpace = 1);
+ tCmdErase(JZFilter *f, int LeaveSpace = 1);
virtual void Execute(int NewUndo = 1);
virtual void ExecuteEvent(JZTrack *t, JZEvent *e);
};
@@ -97,7 +97,7 @@
{
public:
int FromValue, ToValue, Mode;
- tCmdVelocity(tFilter *f, int From, int To, int Mode);
+ tCmdVelocity(JZFilter *f, int From, int To, int Mode);
virtual void ExecuteEvent(JZTrack *t, JZEvent *e);
};
@@ -106,7 +106,7 @@
{
public:
int FromValue, ToValue, Mode;
- tCmdLength(tFilter *f, int From, int To, int Mode);
+ tCmdLength(JZFilter *f, int From, int To, int Mode);
virtual void ExecuteEvent(JZTrack *t, JZEvent *e);
};
@@ -116,7 +116,7 @@
public:
double scale;
long startClock;
- tCmdSeqLength(tFilter *f, double scale);
+ tCmdSeqLength(JZFilter *f, double scale);
virtual void ExecuteEvent(JZTrack *t, JZEvent *e);
};
@@ -129,7 +129,7 @@
long clockDelay;
int repeat;
- tCmdMidiDelay(tFilter *f, double scale, long clockDelay, int repeat);
+ tCmdMidiDelay(JZFilter *f, double scale, long clockDelay, int repeat);
virtual void ExecuteEvent(JZTrack *t, JZEvent *e);
};
@@ -137,7 +137,7 @@
{
public:
- tCmdConvertToModulation(tFilter *f);
+ tCmdConvertToModulation(JZFilter *f);
virtual void ExecuteTrack(JZTrack *t);
};
@@ -151,7 +151,7 @@
int shortenOverlaps;
tKeyOn *prev_note[16][128];
public:
- tCmdCleanup(tFilter *f, long limitClocks, int shortenOverlaps);
+ tCmdCleanup(JZFilter *f, long limitClocks, int shortenOverlaps);
virtual void ExecuteTrack(JZTrack *t);
virtual void ExecuteEvent(JZTrack *t, JZEvent *e);
};
@@ -161,7 +161,7 @@
{
short fr, to;
public:
- tCmdSearchReplace(tFilter *f, short fr, short to);
+ tCmdSearchReplace(JZFilter *f, short fr, short to);
virtual void ExecuteEvent(JZTrack *t, JZEvent *e);
};
@@ -175,7 +175,7 @@
int NoteLength; // no
int Delay; // zero
int Groove; // zero
- tCmdQuantize(tFilter *f, long QntClocks, int groove, int delay);
+ tCmdQuantize(JZFilter *f, long QntClocks, int groove, int delay);
virtual void ExecuteEvent(JZTrack *t, JZEvent *e);
};
@@ -186,7 +186,7 @@
int Notes;
int FitIntoScale;
tScale Scale;
- tCmdTranspose(tFilter *f, int Notes, int ScaleNr = 0, int FitIntoScale = 0);
+ tCmdTranspose(JZFilter *f, int Notes, int ScaleNr = 0, int FitIntoScale = 0);
virtual void ExecuteEvent(JZTrack *t, JZEvent *e);
};
@@ -195,7 +195,7 @@
{
public:
int NewChannel; // 0
- tCmdSetChannel(tFilter *f, int NewChannel);
+ tCmdSetChannel(JZFilter *f, int NewChannel);
virtual void ExecuteEvent(JZTrack *t, JZEvent *e);
};
@@ -204,7 +204,7 @@
{
public:
- tCmdCopyToBuffer(tFilter* pFilter, tEventArray *Buffer);
+ tCmdCopyToBuffer(JZFilter* pFilter, tEventArray *Buffer);
virtual void ExecuteEvent(JZTrack *t, JZEvent *e);
@@ -226,7 +226,7 @@
int InsertSpace; // no
long RepeatClock; // -1L
- tCmdCopy(tFilter *f, long DestTrack, long DestClock);
+ tCmdCopy(JZFilter *f, long DestTrack, long DestClock);
virtual void ExecuteTrack(JZTrack *t);
};
@@ -235,14 +235,14 @@
class tCmdExchLeftRight : public tCommand
{
public:
- tCmdExchLeftRight(tFilter *f);
+ tCmdExchLeftRight(JZFilter *f);
virtual void ExecuteEvent(JZTrack *t, JZEvent *e);
};
class tCmdExchUpDown : public tCommand
{
public:
- tCmdExchUpDown(tFilter *f);
+ tCmdExchUpDown(JZFilter *f);
virtual void ExecuteTrack(JZTrack *t);
};
@@ -250,7 +250,7 @@
{
public:
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(JZFilter *f, prop src, prop dst, JZRndArray &array, int nbars, int add);
~tCmdMapper();
virtual void ExecuteEvent(JZTrack *t, JZEvent *e);
private:
Modified: trunk/jazz/src/Dialogs.cpp
===================================================================
--- trunk/jazz/src/Dialogs.cpp 2008-03-30 14:48:11 UTC (rev 370)
+++ trunk/jazz/src/Dialogs.cpp 2008-03-30 14:55:50 UTC (rev 371)
@@ -52,7 +52,7 @@
//long tShiftDlg::Steps = 0;
-tShiftDlg::tShiftDlg(JZEventFrame *w, tFilter *f, long unit)
+tShiftDlg::tShiftDlg(JZEventFrame *w, JZFilter *f, long unit)
: tPropertyListDlg( "Shift events left/right" )
{
Filter = f;
@@ -108,7 +108,7 @@
-tCleanupDlg::tCleanupDlg(JZEventFrame *w, tFilter *f)
+tCleanupDlg::tCleanupDlg(JZEventFrame *w, JZFilter *f)
: tPropertyListDlg( "Clean up events" )
{
Filter = f;
@@ -192,7 +192,7 @@
int tSearchReplaceDlg::frCtrl = 1;
int tSearchReplaceDlg::toCtrl = 1;
-tSearchReplaceDlg::tSearchReplaceDlg(JZEventFrame *w, tFilter *f)
+tSearchReplaceDlg::tSearchReplaceDlg(JZEventFrame *w, JZFilter *f)
: tPropertyListDlg("Search and replace controller types" )
{
Filter = f;
@@ -242,7 +242,7 @@
int tTransposeDlg::Scale = gScaleChromatic;
bool tTransposeDlg::FitIntoScale = 0;
-tTransposeDlg::tTransposeDlg(JZEventFrame *w, tFilter *f)
+tTransposeDlg::tTransposeDlg(JZEventFrame *w, JZFilter *f)
: tPropertyListDlg("Transpose")
{
EventWin = w;
@@ -298,7 +298,7 @@
int tSetChannelDlg::NewChannel = 1;
-tSetChannelDlg::tSetChannelDlg(tFilter *f)
+tSetChannelDlg::tSetChannelDlg(JZFilter *f)
: tPropertyListDlg("Set MIDI Channel")
{
Filter = f;
@@ -349,7 +349,7 @@
int tVelocityDlg::Mode = 0;
-tVelocityDlg::tVelocityDlg(tFilter *f)
+tVelocityDlg::tVelocityDlg(JZFilter *f)
: tPropertyListDlg( "Velocity" )
{
Filter = f;
@@ -400,7 +400,7 @@
int tLengthDlg::Mode;
-tLengthDlg::tLengthDlg(JZEventFrame *w, tFilter *f)
+tLengthDlg::tLengthDlg(JZEventFrame *w, JZFilter *f)
: tPropertyListDlg("Length")
{
Filter = f;
@@ -465,7 +465,7 @@
-tSeqLengthDlg::tSeqLengthDlg(JZEventFrame *w, tFilter *f)
+tSeqLengthDlg::tSeqLengthDlg(JZEventFrame *w, JZFilter *f)
: tPropertyListDlg("stretch/contract by scale from start of selected sequence" )
{
Filter = f;
@@ -511,7 +511,7 @@
long tMidiDelayDlg::clockDelay = 10;
int tMidiDelayDlg::repeat = 6;
-tMidiDelayDlg::tMidiDelayDlg(JZEventFrame *w, tFilter *f)
+tMidiDelayDlg::tMidiDelayDlg(JZEventFrame *w, JZFilter *f)
: tPropertyListDlg("MIDI delay line" )
{
Filter = f;
@@ -572,7 +572,7 @@
bool tDeleteDlg::LeaveSpace = 1;
-tDeleteDlg::tDeleteDlg(JZEventFrame *w, tFilter *f)
+tDeleteDlg::tDeleteDlg(JZEventFrame *w, JZFilter *f)
: tPropertyListDlg("Delete" )
{
Filter = f;
@@ -665,7 +665,7 @@
int tQuantizeDlg::Delay = 0;
int tQuantizeDlg::Groove = 0;
-tQuantizeDlg::tQuantizeDlg(JZEventFrame *w, tFilter *f)
+tQuantizeDlg::tQuantizeDlg(JZEventFrame *w, JZFilter *f)
: tPropertyListDlg("Quantize" )
//, Steps("steps", gQntSteps, &gQntStep)
{
Modified: trunk/jazz/src/Dialogs.h
===================================================================
--- trunk/jazz/src/Dialogs.h 2008-03-30 14:48:11 UTC (rev 370)
+++ trunk/jazz/src/Dialogs.h 2008-03-30 14:55:50 UTC (rev 371)
@@ -26,7 +26,7 @@
#include "PropertyListDialog.h"
class JZPianoWindow;
-class tFilter;
+class JZFilter;
class JZSong;
class JZEventFrame;
class JZTrack;
@@ -38,11 +38,11 @@
long Steps; // 0 was static
long Unit;
- tFilter* Filter;
+ JZFilter* Filter;
JZSong* Song;
JZEventFrame* EventWin;
- tShiftDlg(JZEventFrame *w, tFilter *f, long Unit);
+ tShiftDlg(JZEventFrame *w, JZFilter *f, long Unit);
void AddProperties();
bool OnClose();
void OnHelp();
@@ -55,11 +55,11 @@
static int lowLimit; // 1/32
static bool shortenOverlaps;
- tFilter *Filter;
+ JZFilter *Filter;
JZSong *Song;
JZEventFrame *EventWin;
- tCleanupDlg(JZEventFrame *w, tFilter *f);
+ tCleanupDlg(JZEventFrame *w, JZFilter *f);
void AddProperties();
//tNamedChoice Steps;
bool OnClose();
@@ -75,11 +75,11 @@
/* tNamedChoice frList; */
/* tNamedChoice toList; */
- tFilter *Filter;
+ JZFilter *Filter;
JZSong *Song;
JZEventFrame *EventWin;
- tSearchReplaceDlg(JZEventFrame *w, tFilter *f);
+ tSearchReplaceDlg(JZEventFrame *w, JZFilter *f);
void AddProperties();
bool OnClose();
void OnHelp();
@@ -95,11 +95,11 @@
static int Scale;
JZEventFrame *EventWin;
- tFilter *Filter;
+ JZFilter *Filter;
JZSong *Song;
//tNamedChoice ScaleDlg;
- tTransposeDlg(JZEventFrame *w, tFilter *f);
+ tTransposeDlg(JZEventFrame *w, JZFilter *f);
void AddProperties();
bool OnClose();
void OnHelp();
@@ -112,10 +112,10 @@
static int NewChannel; // 0
- tFilter *Filter;
+ JZFilter *Filter;
JZSong *Song;
- tSetChannelDlg(tFilter *f);
+ tSetChannelDlg(JZFilter *f);
void AddProperties();
bool OnClose();
void OnHelp();
@@ -129,10 +129,10 @@
static int FromValue, ToValue, Mode;
static char *mode_str;
- tFilter *Filter;
+ JZFilter *Filter;
JZSong *Song;
- tVelocityDlg(tFilter *f);
+ tVelocityDlg(JZFilter *f);
void AddProperties();
bool OnClose();
void OnHelp();
@@ -146,11 +146,11 @@
static int FromValue, ToValue, Mode;
static char *mode_str;
- tFilter *Filter;
+ JZFilter *Filter;
JZSong *Song;
JZEventFrame *EventWin;
- tLengthDlg(JZEventFrame *win, tFilter *f);
+ tLengthDlg(JZEventFrame *win, JZFilter *f);
void AddProperties();
bool OnClose();
void OnHelp();
@@ -164,11 +164,11 @@
static double scale;
- tFilter *Filter;
+ JZFilter *Filter;
JZSong *Song;
JZEventFrame *EventWin;
- tSeqLengthDlg(JZEventFrame *win, tFilter *f);
+ tSeqLengthDlg(JZEventFrame *win, JZFilter *f);
void AddProperties();
bool OnClose();
void OnHelp();
@@ -183,11 +183,11 @@
static long clockDelay;
static int repeat;
- tFilter *Filter;
+ JZFilter *Filter;
JZSong *Song;
JZEventFrame *EventWin;
- tMidiDelayDlg(JZEventFrame *win, tFilter *f);
+ tMidiDelayDlg(JZEventFrame *win, JZFilter *f);
void AddProperties();
bool OnClose();
void OnHelp();
@@ -195,13 +195,13 @@
class tDeleteDlg : public tPropertyListDlg
{
- tFilter *Filter;
+ JZFilter *Filter;
JZEventFrame *EventWin;
public:
static bool LeaveSpace; // 1
- tDeleteDlg(JZEventFrame *w, tFilter *f);
+ tDeleteDlg(JZEventFrame *w, JZFilter *f);
void AddProperties();
bool OnClose();
void OnHelp();
@@ -239,13 +239,13 @@
static int Groove; // -x .. +x
static int Delay; // -x .. +x
- tFilter *Filter;
+ JZFilter *Filter;
JZSong *Song;
JZEventFrame *EventWin;
long Quantize(long);
- tQuantizeDlg(JZEventFrame *w, tFilter *f);
+ tQuantizeDlg(JZEventFrame *w, JZFilter *f);
void AddProperties();
//tNamedChoice Steps;
bool OnClose();
Modified: trunk/jazz/src/EventWindow.cpp
===================================================================
--- trunk/jazz/src/EventWindow.cpp 2008-03-30 14:48:11 UTC (rev 370)
+++ trunk/jazz/src/EventWindow.cpp 2008-03-30 14:55:50 UTC (rev 371)
@@ -190,7 +190,7 @@
#endif
mpGreyBrush = new wxBrush(*mpGreyColor, wxSOLID);
- mpFilter = new tFilter(Song);
+ mpFilter = new JZFilter(Song);
}
Modified: trunk/jazz/src/EventWindow.h
===================================================================
--- trunk/jazz/src/EventWindow.h 2008-03-30 14:48:11 UTC (rev 370)
+++ trunk/jazz/src/EventWindow.h 2008-03-30 14:55:50 UTC (rev 371)
@@ -87,7 +87,7 @@
JZSong* Song;
- tFilter* mpFilter;
+ JZFilter* mpFilter;
JZPianoFrame* NextWin;
Modified: trunk/jazz/src/Filter.cpp
===================================================================
--- trunk/jazz/src/Filter.cpp 2008-03-30 14:48:11 UTC (rev 370)
+++ trunk/jazz/src/Filter.cpp 2008-03-30 14:55:50 UTC (rev 371)
@@ -47,7 +47,7 @@
-tFilter::tFilter(JZSong *s)
+JZFilter::JZFilter(JZSong *s)
{
mpSong = s;
FltEvents = new tFltEvent [nFltEvents];
@@ -67,24 +67,24 @@
}
-tFilter::tFilter(tFilter *f)
+JZFilter::JZFilter(JZFilter *f)
{
copy (*f);
}
-tFilter::tFilter(tFilter const &o) {
+JZFilter::JZFilter(JZFilter const &o) {
copy(o);
}
-tFilter& tFilter::operator=(tFilter const &o) {
+JZFilter& JZFilter::operator=(JZFilter const &o) {
delete FltEvents;
copy(o);
return *this;
}
-void tFilter::copy(tFilter const &o)
+void JZFilter::copy(JZFilter const &o)
{
mpSong = o.mpSong;
FromClock = o.FromClock;
@@ -98,7 +98,7 @@
}
-tFilter::~tFilter()
+JZFilter::~JZFilter()
{
delete FltEvents;
}
@@ -112,11 +112,11 @@
class tFilterDlg : public tPropertyListDlg
{
- tFilter *Filter;
+ JZFilter *Filter;
tClockDlg FromClockDlg, ToClockDlg;
public:
- tFilterDlg(tFilter *f, JZSong *s, int ShowEventStats);
+ tFilterDlg(JZFilter *f, JZSong *s, int ShowEventStats);
void AddProperties();
bool OnClose();
void OnHelp();
@@ -124,7 +124,7 @@
};
-tFilterDlg::tFilterDlg(tFilter *f, JZSong *Song, int ShowEventStats)
+tFilterDlg::tFilterDlg(JZFilter *f, JZSong *Song, int ShowEventStats)
: tPropertyListDlg("Filter"),
FromClockDlg(Song, "From Time: ", f->FromClock),
ToClockDlg(Song, "To Time: ", f->ToClock)
@@ -188,7 +188,7 @@
-void tFilter::Dialog(wxFrame *parent, int ShowEventStats)
+void JZFilter::Dialog(wxFrame *parent, int ShowEventStats)
{
tFilterDlg *dlg;
// DialogBox = new wxDialogBox(parent, "Event Filter", FALSE );
@@ -208,7 +208,7 @@
-tTrackIterator::tTrackIterator(tFilter *f, int rev)
+tTrackIterator::tTrackIterator(JZFilter *f, int rev)
{
Filter = f;
Song = Filter->mpSong;
Modified: trunk/jazz/src/Filter.h
===================================================================
--- trunk/jazz/src/Filter.h 2008-03-30 14:48:11 UTC (rev 370)
+++ trunk/jazz/src/Filter.h 2008-03-30 14:55:50 UTC (rev 371)
@@ -53,11 +53,11 @@
-class tFilter : public wxObject
+class JZFilter : public wxObject
{
friend class tFilterDlg;
wxDialog *DialogBox;
- void copy(tFilter const &o);
+ void copy(JZFilter const &o);
public:
@@ -72,11 +72,11 @@
void Dialog(wxFrame *parent, int ShowEventStats = 1);
- tFilter(JZSong* pSong);
- tFilter(tFilter* pOtherFilter);
- tFilter(tFilter const &o);
- tFilter& operator=(tFilter const &o);
- virtual ~tFilter();
+ JZFilter(JZSong* pSong);
+ JZFilter(JZFilter* pOtherFilter);
+ JZFilter(JZFilter const &o);
+ JZFilter& operator=(JZFilter const &o);
+ virtual ~JZFilter();
int IsSelected(JZEvent *e)
{
@@ -109,7 +109,7 @@
};
-// extern tFilter *GlobalFilter;
+// extern JZFilter *GlobalFilter;
// void GlobalFilterDlg(wxButton& but, wxMouseEvent& event);
// void GlobalFilterDlgNoStats(wxButton& but, wxMouseEvent& event);
@@ -122,12 +122,12 @@
class tTrackIterator
{
- tFilter *Filter;
+ JZFilter *Filter;
JZSong *Song;
int TrackNr;
int Reverse;
public:
- tTrackIterator(tFilter *f, int Reverse = 0);
+ tTrackIterator(JZFilter *f, int Reverse = 0);
JZTrack *First();
JZTrack *Next();
int Count() const;
Modified: trunk/jazz/src/HarmonyBrowserAnalyzer.cpp
===================================================================
--- trunk/jazz/src/HarmonyBrowserAnalyzer.cpp 2008-03-30 14:48:11 UTC (rev 370)
+++ trunk/jazz/src/HarmonyBrowserAnalyzer.cpp 2008-03-30 14:55:50 UTC (rev 371)
@@ -51,7 +51,7 @@
}
-void HBAnalyzer::Init(tFilter* pFilter, int epc)
+void HBAnalyzer::Init(JZFilter* pFilter, int epc)
{
Exit(); // cleanup from previous run
@@ -104,7 +104,7 @@
}
-int HBAnalyzer::Analyze(tFilter* pFilter, int qbc)
+int HBAnalyzer::Analyze(JZFilter* pFilter, int qbc)
{
Init(pFilter, qbc);
if (mSteps < max_seq)
@@ -116,7 +116,7 @@
return 0;
}
-int HBAnalyzer::Transpose(tFilter* pFilter, int qbc)
+int HBAnalyzer::Transpose(JZFilter* pFilter, int qbc)
{
pFilter->mpSong->NewUndoBuffer();
Init(pFilter, qbc);
Modified: trunk/jazz/src/HarmonyBrowserAnalyzer.h
===================================================================
--- trunk/jazz/src/HarmonyBrowserAnalyzer.h 2008-03-30 14:48:11 UTC (rev 370)
+++ trunk/jazz/src/HarmonyBrowserAnalyzer.h 2008-03-30 14:55:50 UTC (rev 371)
@@ -23,7 +23,7 @@
#ifndef JZ_HARMONYBROWSERANALYZER_H
#define JZ_HARMONYBROWSERANALYZER_H
-class tFilter;
+class JZFilter;
class JZTrack;
class HBContext;
class tKeyOn;
@@ -37,11 +37,11 @@
~HBAnalyzer();
- int Analyze(tFilter *f, int eighth_per_chord = 8);
+ int Analyze(JZFilter *f, int eighth_per_chord = 8);
- int Transpose(tFilter *f, int eighth_per_chord = 8);
+ int Transpose(JZFilter *f, int eighth_per_chord = 8);
- void Init(tFilter *f, int steps_per_bar);
+ void Init(JZFilter *f, int steps_per_bar);
void Exit();
@@ -69,7 +69,7 @@
int start_clock, stop_clock;
int eighths_per_chord;
int mSteps;
- tFilter* mpFilter;
+ JZFilter* mpFilter;
JZTrack* mpTrack;
int** count;
Modified: trunk/jazz/src/PianoWindow.cpp
===================================================================
--- trunk/jazz/src/PianoWindow.cpp 2008-03-30 14:48:11 UTC (rev 370)
+++ trunk/jazz/src/PianoWindow.cpp 2008-03-30 14:55:50 UTC (rev 371)
@@ -601,7 +601,7 @@
{
InitColors();
- mpFilter = new tFilter(mpSong);
+ mpFilter = new JZFilter(mpSong);
mpTrack = mpSong->GetTrack(mTrackIndex);
Modified: trunk/jazz/src/PianoWindow.h
===================================================================
--- trunk/jazz/src/PianoWindow.h 2008-03-30 14:48:11 UTC (rev 370)
+++ trunk/jazz/src/PianoWindow.h 2008-03-30 14:55:50 UTC (rev 371)
@@ -31,7 +31,7 @@
class JZSong;
class JZTrack;
class JZEvent;
-class tFilter;
+class JZFilter;
class tCtrlEditBase;
class tSnapSelection;
class JZGuitarFrame;
@@ -76,7 +76,7 @@
virtual ~JZPianoWindow();
- tFilter* GetFilter();
+ JZFilter* GetFilter();
void CreateGuitarWindow();
@@ -321,7 +321,7 @@
int mTrackIndex;
- tFilter* mpFilter;
+ JZFilter* mpFilter;
tCtrlEditBase* mpCtrlEdit;
@@ -379,7 +379,7 @@
};
inline
-tFilter* JZPianoWindow::GetFilter()
+JZFilter* JZPianoWindow::GetFilter()
{
return mpFilter;
}
Modified: trunk/jazz/src/Project.h
===================================================================
--- trunk/jazz/src/Project.h 2008-03-30 14:48:11 UTC (rev 370)
+++ trunk/jazz/src/Project.h 2008-03-30 14:55:50 UTC (rev 371)
@@ -25,7 +25,7 @@
class JZPlayer;
class JZSynth;
-class tFilter;
+class JZFilter;
#include "Song.h"
#include "Metronome.h"
@@ -65,7 +65,7 @@
bool mRecord;
// Not yet sure what this does
- tFilter *Filter;
+ JZFilter* Filter;
// Stores metrome information
tMetronomeInfo mMetronomeInfo;
Modified: trunk/jazz/src/Rhythm.cpp
===================================================================
--- trunk/jazz/src/Rhythm.cpp 2008-03-30 14:48:11 UTC (rev 370)
+++ trunk/jazz/src/Rhythm.cpp 2008-03-30 14:55:50 UTC (rev 371)
@@ -1025,7 +1025,7 @@
if (!event_win->EventsSelected("please mark destination track in trackwin"))
return;
- tFilter* pFilter = event_win->mpFilter;
+ JZFilter* pFilter = event_win->mpFilter;
if (pFilter->FromTrack != pFilter->ToTrack)
{
Modified: trunk/jazz/src/TrackWindow.cpp
===================================================================
--- trunk/jazz/src/TrackWindow.cpp 2008-03-30 14:48:11 UTC (rev 370)
+++ trunk/jazz/src/TrackWindow.cpp 2008-03-30 14:55:50 UTC (rev 371)
@@ -117,7 +117,7 @@
mpSnapSel = new tSnapSelection(this);
- mpFilter = new tFilter(mpSong);
+ mpFilter = new JZFilter(mpSong);
SetBackgroundColour(*wxWHITE);
Modified: trunk/jazz/src/TrackWindow.h
===================================================================
--- trunk/jazz/src/TrackWindow.h 2008-03-30 14:48:11 UTC (rev 370)
+++ trunk/jazz/src/TrackWindow.h 2008-03-30 14:55:50 UTC (rev 371)
@@ -28,7 +28,7 @@
class JZSong;
class JZTrack;
-class tFilter;
+class JZFilter;
class tSnapSelection;
class wxFont;
@@ -54,7 +54,7 @@
{
public:
- tFilter* mpFilter;
+ JZFilter* mpFilter;
tSnapSelection* mpSnapSel;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
