Menu
▾
▴
SF.net SVN: jazzplusplus: [335] trunk/jazz/src
|
From: <pst...@us...> - 2008-03-21 05:40:30
|
Revision: 335
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=335&view=rev
Author: pstieber
Date: 2008-03-20 22:40:29 -0700 (Thu, 20 Mar 2008)
Log Message:
-----------
1. Changed mScrollLine to mScrollSize.
2. Changed the JZTrackFrame constructor argument to a wxFrame.
3. Added the filter header due to other changes in the piano window.
Modified Paths:
--------------
trunk/jazz/src/Dialogs.cpp
trunk/jazz/src/Dialogs.h
trunk/jazz/src/TrackWindow.cpp
trunk/jazz/src/TrackWindow.h
Modified: trunk/jazz/src/Dialogs.cpp
===================================================================
--- trunk/jazz/src/Dialogs.cpp 2008-03-18 14:25:17 UTC (rev 334)
+++ trunk/jazz/src/Dialogs.cpp 2008-03-21 05:40:29 UTC (rev 335)
@@ -31,6 +31,7 @@
#include "Events.h"
#include "Player.h"
#include "PianoFrame.h"
+#include "PianoWindow.h"
#include "ClockDialog.h"
#include "KeyDialog.h"
#include "PropertyListDialog.h"
@@ -55,7 +56,7 @@
: tPropertyListDlg( "Shift events left/right" )
{
Filter = f;
- Song = f->Song;
+ Song = f->mpSong;
Unit = unit;
EventWin = w;
Steps=0;
@@ -70,7 +71,10 @@
cmd.Execute();
EventWin->Redraw();
if (EventWin->NextWin)
- EventWin->NextWin->Redraw();
+ {
+ EventWin->NextWin->Redraw();
+ }
+
// wxForm::OnOk();
return false;
}
@@ -108,7 +112,7 @@
: tPropertyListDlg( "Clean up events" )
{
Filter = f;
- Song = f->Song;
+ Song = f->mpSong;
EventWin = w;
}
@@ -192,7 +196,7 @@
: tPropertyListDlg("Search and replace controller types" )
{
Filter = f;
- Song = f->Song;
+ Song = f->mpSong;
EventWin = w;
}
@@ -243,7 +247,7 @@
{
EventWin = w;
Filter = f;
- Song = f->Song;
+ Song = f->mpSong;
}
@@ -298,7 +302,7 @@
: tPropertyListDlg("Set MIDI Channel")
{
Filter = f;
- Song = f->Song;
+ Song = f->mpSong;
}
@@ -349,7 +353,7 @@
: tPropertyListDlg( "Velocity" )
{
Filter = f;
- Song = f->Song;
+ Song = f->mpSong;
}
@@ -400,7 +404,7 @@
: tPropertyListDlg("Length")
{
Filter = f;
- Song = f->Song;
+ Song = f->mpSong;
EventWin = w;
}
@@ -465,7 +469,7 @@
: tPropertyListDlg("stretch/contract by scale from start of selected sequence" )
{
Filter = f;
- Song = f->Song;
+ Song = f->mpSong;
EventWin = w;
}
@@ -511,7 +515,7 @@
: tPropertyListDlg("MIDI delay line" )
{
Filter = f;
- Song = f->Song;
+ Song = f->mpSong;
EventWin = w;
}
@@ -609,12 +613,12 @@
// Snap
// *************************************************************************
-tSnapDlg::tSnapDlg(JZPianoFrame* w, int* snapptr)
- : tPropertyListDlg("Snap:quantize cut/paste events")
+tSnapDlg::tSnapDlg(JZPianoWindow* pPianoWindow, int* snapptr)
+ : tPropertyListDlg("Snap:quantize cut/paste events"),
+ mpPianoWindow(pPianoWindow)
{
//, Steps("Snap value", limitSteps, snapptr)
//limitSteps lives in util.cpp
- win = w;
ptr = snapptr;
}
@@ -624,7 +628,7 @@
{
//Steps.GetValue();
// toggle the tool buttons
- win->SetSnapDenom(*ptr);
+ mpPianoWindow->SetSnapDenom(*ptr);
//tPropertyListDlg::OnClose();
return false;
}
@@ -666,7 +670,7 @@
//, Steps("steps", gQntSteps, &gQntStep)
{
Filter = f;
- Song = f->Song;
+ Song = f->mpSong;
EventWin = w;
}
@@ -732,12 +736,12 @@
JZTrack *Track;
tClockDlg ClockDlg;
- JZPianoFrame* Win;
+ JZPianoWindow* Win;
JZEvent *Event;
JZEvent *Copy;
- tEventDlg(JZEvent *e, JZPianoFrame* w, JZTrack *t);
+ tEventDlg(JZEvent *e, JZPianoWindow* w, JZTrack *t);
virtual void AddProperties();
virtual bool OnClose();
virtual void OnHelp();
@@ -745,9 +749,9 @@
};
-tEventDlg::tEventDlg(JZEvent *e, JZPianoFrame* w, JZTrack *t)
+tEventDlg::tEventDlg(JZEvent *e, JZPianoWindow* w, JZTrack *t)
: tPropertyListDlg( "Event" ),
- ClockDlg(w->Song, "Time ", e->GetClock())
+ ClockDlg(w->mpSong, "Time ", e->GetClock())
{
Win = w;
Track = t;
@@ -772,7 +776,7 @@
Track->Kill(Event);
Track->Put(Copy);
Track->Cleanup();
- Win->Redraw();
+ Win->Refresh();
return tPropertyListDlg::OnClose();
}
@@ -790,7 +794,7 @@
int Channel;
- tChEventDlg(tChannelEvent *e, JZPianoFrame* w, JZTrack *t)
+ tChEventDlg(tChannelEvent *e, JZPianoWindow* w, JZTrack *t)
: tEventDlg(e, w, t)
{
Channel = e->Channel + 1; // 1..16
@@ -830,14 +834,14 @@
// SN++
int OffVeloc;
- tKeyOnDlg(tKeyOn *e, JZPianoFrame* w, JZTrack *t);
+ tKeyOnDlg(tKeyOn *e, JZPianoWindow* w, JZTrack *t);
void AddProperties();
bool OnClose();
};
-tKeyOnDlg::tKeyOnDlg(tKeyOn *e, JZPianoFrame* w, JZTrack *t)
+tKeyOnDlg::tKeyOnDlg(tKeyOn *e, JZPianoWindow* w, JZTrack *t)
: tChEventDlg(e, w, t),
PitchDlg("Pitch", e->Key)
{
@@ -901,14 +905,14 @@
int Value;
- tPitchDlg(tPitch *e, JZPianoFrame* w, JZTrack *t);
+ tPitchDlg(tPitch *e, JZPianoWindow* w, JZTrack *t);
void AddProperties();
bool OnClose();
};
-tPitchDlg::tPitchDlg(tPitch *e, JZPianoFrame* w, JZTrack *t)
+tPitchDlg::tPitchDlg(tPitch *e, JZPianoWindow* w, JZTrack *t)
: tChEventDlg(e, w, t)
{
Event = e;
@@ -944,14 +948,14 @@
int Control;
//tNamedChoice Choice;
- tControlDlg(tControl *e, JZPianoFrame* w, JZTrack *t);
+ tControlDlg(tControl *e, JZPianoWindow* w, JZTrack *t);
void AddProperties();
bool OnClose();
};
-tControlDlg::tControlDlg(tControl *e, JZPianoFrame* w, JZTrack *t)
+tControlDlg::tControlDlg(tControl *e, JZPianoWindow* w, JZTrack *t)
: tChEventDlg(e, w, t)
//, Choice("Controller", &gpConfig->CtrlName(0), &Control)
{
@@ -1006,14 +1010,14 @@
tNamedChoice Choice;
- tPlayTrackDlg(tPlayTrack *e, JZPianoFrame* w, JZTrack *t);
+ tPlayTrackDlg(tPlayTrack *e, JZPianoWindow* w, JZTrack *t);
void AddProperties();
bool OnClose();
};
-tPlayTrackDlg::tPlayTrackDlg(tPlayTrack *e, JZPianoFrame* w, JZTrack *t)
+tPlayTrackDlg::tPlayTrackDlg(tPlayTrack *e, JZPianoWindow* w, JZTrack *t)
: tEventDlg(e, w, t),
Choice("playtrack", gpConfig->GetControlNames(), &track)
{
@@ -1065,14 +1069,14 @@
int track;
tNamedChoice Choice;
- tTextDlg(tText *e, JZPianoFrame* w, JZTrack *t);
+ tTextDlg(tText *e, JZPianoWindow* w, JZTrack *t);
void AddProperties();
bool OnClose();
};
-tTextDlg::tTextDlg(tText *e, JZPianoFrame* w, JZTrack *t)
+tTextDlg::tTextDlg(tText *e, JZPianoWindow* w, JZTrack *t)
: tEventDlg(e, w, t),
Choice("text", gpConfig->GetControlNames(), &track)
{
@@ -1112,14 +1116,14 @@
tNamedChoice Choice;
- tEndOfTrackDlg(tEndOfTrack *e, JZPianoFrame* w, JZTrack *t);
+ tEndOfTrackDlg(tEndOfTrack *e, JZPianoWindow* w, JZTrack *t);
void AddProperties();
bool OnClose();
};
-tEndOfTrackDlg::tEndOfTrackDlg(tEndOfTrack *e, JZPianoFrame* w, JZTrack *t)
+tEndOfTrackDlg::tEndOfTrackDlg(tEndOfTrack *e, JZPianoWindow* w, JZTrack *t)
: tEventDlg(e, w, t),
Choice("End Of Track", gpConfig->GetControlNames(), &track)
{
@@ -1149,14 +1153,14 @@
int Program;
// tNamedChoice Choice;
- tProgramDlg(tProgram *e, JZPianoFrame* w, JZTrack *t);
+ tProgramDlg(tProgram *e, JZPianoWindow* w, JZTrack *t);
void AddProperties();
bool OnClose();
};
-tProgramDlg::tProgramDlg(tProgram *e, JZPianoFrame* w, JZTrack *t)
+tProgramDlg::tProgramDlg(tProgram *e, JZPianoWindow* w, JZTrack *t)
: tEventDlg(e, w, t),
Program(e->Program + 1)
//, Choice("Program", &gpConfig->VoiceName(0), &Program)
@@ -1194,14 +1198,14 @@
int Value;
- tSetTempoDlg(tSetTempo *e, JZPianoFrame* w, JZTrack *t);
+ tSetTempoDlg(tSetTempo *e, JZPianoWindow* w, JZTrack *t);
void AddProperties();
bool OnClose();
};
-tSetTempoDlg::tSetTempoDlg(tSetTempo *e, JZPianoFrame* w, JZTrack *t)
+tSetTempoDlg::tSetTempoDlg(tSetTempo *e, JZPianoWindow* w, JZTrack *t)
: tEventDlg(e, w, t)
{
Event = e;
@@ -1234,14 +1238,14 @@
char *str;
- tSysexDlg(tSysEx *s, JZPianoFrame* w, JZTrack *t);
+ tSysexDlg(tSysEx *s, JZPianoWindow* w, JZTrack *t);
void AddProperties();
bool OnClose();
};
-tSysexDlg::tSysexDlg(tSysEx *s, JZPianoFrame* w, JZTrack *t)
+tSysexDlg::tSysexDlg(tSysEx *s, JZPianoWindow* w, JZTrack *t)
: tEventDlg(s, w, t)
{
Event = s;
@@ -1451,7 +1455,7 @@
void EventDialog(
JZEvent* e,
- JZPianoFrame* w,
+ JZPianoWindow* pPianoWindow,
JZTrack* t,
long Clock,
int Channel,
@@ -1473,47 +1477,47 @@
break;
}
str = "Key On";
- dlg = new tKeyOnDlg(e->IsKeyOn(), w, t);
+ dlg = new tKeyOnDlg(e->IsKeyOn(), pPianoWindow, t);
break;
case StatPitch:
str = "Pitch Wheel";
- dlg = new tPitchDlg(e->IsPitch(), w, t);
+ dlg = new tPitchDlg(e->IsPitch(), pPianoWindow, t);
break;
case StatControl:
str = "Controller";
- dlg = new tControlDlg(e->IsControl(), w, t);
+ dlg = new tControlDlg(e->IsControl(), pPianoWindow, t);
break;
case StatProgram:
str = "Program Change";
- dlg = new tProgramDlg(e->IsProgram(), w, t);
+ dlg = new tProgramDlg(e->IsProgram(), pPianoWindow, t);
break;
case StatSetTempo:
str = "Set Tempo (for track 0)";
- dlg = new tSetTempoDlg(e->IsSetTempo(), w, w->Song->GetTrack(0) );
+ dlg = new tSetTempoDlg(e->IsSetTempo(), pPianoWindow, pPianoWindow->mpSong->GetTrack(0) );
break;
case StatSysEx:
str = "System Exclusive";
- dlg = new tSysexDlg(e->IsSysEx(), w, t );
+ dlg = new tSysexDlg(e->IsSysEx(), pPianoWindow, t );
break;
case StatPlayTrack:
str = "Play Track";
- //dlg = new tPlayTrackDlg(e->IsPlayTrack(), w, t );
- dlg = new tPlayTrackDlg(e->IsPlayTrack(), w, t );
+ //dlg = new tPlayTrackDlg(e->IsPlayTrack(), pPianoWindow, t );
+ dlg = new tPlayTrackDlg(e->IsPlayTrack(), pPianoWindow, t );
break;
case StatEndOfTrack:
str = "End Of Track";
- dlg = new tEndOfTrackDlg(e->IsEndOfTrack(), w, t );
+ dlg = new tEndOfTrackDlg(e->IsEndOfTrack(), pPianoWindow, t );
break;
case StatText:
str = "Text";
- dlg = new tTextDlg(e->IsText(), w, t );
+ dlg = new tTextDlg(e->IsText(), pPianoWindow, t );
break;
Modified: trunk/jazz/src/Dialogs.h
===================================================================
--- trunk/jazz/src/Dialogs.h 2008-03-18 14:25:17 UTC (rev 334)
+++ trunk/jazz/src/Dialogs.h 2008-03-21 05:40:29 UTC (rev 335)
@@ -25,7 +25,7 @@
#include "PropertyListDialog.h"
-class JZPianoFrame;
+class JZPianoWindow;
class tFilter;
class JZSong;
class JZEventFrame;
@@ -212,15 +212,20 @@
{
public:
- tSnapDlg(JZPianoFrame *w, int* snapptr);
+ tSnapDlg(JZPianoWindow* pPianoWindow, int* snapptr);
+
void AddProperties();
+
//tNamedChoice Steps;
+
bool OnClose();
+
void OnHelp();
private:
- JZPianoFrame* win;
+ JZPianoWindow* mpPianoWindow;
+
int* ptr;
};
@@ -249,7 +254,7 @@
void EventDialog(
JZEvent*,
- JZPianoFrame*,
+ JZPianoWindow*,
JZTrack*,
long Clock,
int Channel,
Modified: trunk/jazz/src/TrackWindow.cpp
===================================================================
--- trunk/jazz/src/TrackWindow.cpp 2008-03-18 14:25:17 UTC (rev 334)
+++ trunk/jazz/src/TrackWindow.cpp 2008-03-21 05:40:29 UTC (rev 335)
@@ -24,6 +24,7 @@
#include "TrackWindow.h"
#include "TrackFrame.h"
+#include "Filter.h"
#include "Project.h"
#include "Player.h"
#include "RecordingInfo.h"
@@ -48,12 +49,12 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-const int JZTrackWindow::mScrollLine = 50;
+const int JZTrackWindow::mScrollSize = 50;
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
JZTrackWindow::JZTrackWindow(
- JZTrackFrame* pParent,
+ wxFrame* pParent,
JZSong* pSong,
const wxPoint& Position,
const wxSize& Size)
@@ -462,8 +463,8 @@
GetViewStart(&mScrolledX, &mScrolledY);
// Convert scrolling units into pixels.
- mScrolledX *= mScrollLine;
- mScrolledY *= mScrollLine;
+ mScrolledX *= mScrollSize;
+ mScrolledY *= mScrollSize;
GetClientSize(&mCanvasWidth, &mCanvasHeight);
cout
@@ -1171,10 +1172,10 @@
int Width, Height;
GetVirtualEventSize(Width, Height);
SetScrollbars(
- mScrollLine,
- mScrollLine,
- (Width + mScrollLine) / mScrollLine,
- (Height + mScrollLine) / mScrollLine,
+ mScrollSize,
+ mScrollSize,
+ (Width + mScrollSize) / mScrollSize,
+ (Height + mScrollSize) / mScrollSize,
x,
y);
EnableScrolling(false, false);
@@ -1184,8 +1185,8 @@
//-----------------------------------------------------------------------------
void JZTrackWindow::SetScrollPosition(int x, int y)
{
- x /= mScrollLine;
- y /= mScrollLine;
+ x /= mScrollSize;
+ y /= mScrollSize;
Scroll(x, y);
}
Modified: trunk/jazz/src/TrackWindow.h
===================================================================
--- trunk/jazz/src/TrackWindow.h 2008-03-18 14:25:17 UTC (rev 334)
+++ trunk/jazz/src/TrackWindow.h 2008-03-21 05:40:29 UTC (rev 335)
@@ -26,7 +26,6 @@
#include "MouseAction.h"
#include "Rectangle.h"
-class JZTrackFrame;
class JZSong;
class JZTrack;
class tFilter;
@@ -65,7 +64,7 @@
};
JZTrackWindow(
- JZTrackFrame* pParent,
+ wxFrame* pParent,
JZSong* pSong,
const wxPoint& Position,
const wxSize& Size);
@@ -159,7 +158,7 @@
private:
- static const int mScrollLine;
+ static const int mScrollSize;
JZSong* mpSong;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
