Menu
▾
▴
SF.net SVN: jazzplusplus:[679] trunk/jazz/src
|
From: <pst...@us...> - 2009-01-01 08:46:42
|
Revision: 679
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=679&view=rev
Author: pstieber
Date: 2009-01-01 08:46:37 +0000 (Thu, 01 Jan 2009)
Log Message:
-----------
1. Changed the return type of JZEventWindow::EventsSelected from int to bool.
2. Added ID_SHIFT.
3. Moved ... nect to menu entries.
4. Removed MEN_SHIFT from the piano frame and used ID_SHIFT instead.
5. Changed framesPerSecond to gFramesPerSecond in Track.cpp and made come
cosmetic indentation changes.
6. Added an unimplemented shift entry to the Edit menu of the track frame.
7. Added AreEventsSelected to the track window.
Happy New Year.
Modified Paths:
--------------
trunk/jazz/src/ControlEdit.cpp
trunk/jazz/src/EventWindow.cpp
trunk/jazz/src/EventWindow.h
trunk/jazz/src/PianoFrame.cpp
trunk/jazz/src/Resources.h
trunk/jazz/src/Sample.h
trunk/jazz/src/SampleWindow.cpp
trunk/jazz/src/Track.cpp
trunk/jazz/src/TrackFrame.cpp
trunk/jazz/src/TrackFrame.h
trunk/jazz/src/TrackWindow.cpp
trunk/jazz/src/TrackWindow.h
Modified: trunk/jazz/src/ControlEdit.cpp
===================================================================
--- trunk/jazz/src/ControlEdit.cpp 2009-01-01 06:20:59 UTC (rev 678)
+++ trunk/jazz/src/ControlEdit.cpp 2009-01-01 08:46:37 UTC (rev 679)
@@ -75,7 +75,7 @@
// PORTING: changed the calls a bit so it would compile, need to remake the layout and do the event bindings
- ctrlmode = 0; // edit seems stupid to me ...
+ ctrlmode = 0; // Edit seems stupid to me.
wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
Modified: trunk/jazz/src/EventWindow.cpp
===================================================================
--- trunk/jazz/src/EventWindow.cpp 2009-01-01 06:20:59 UTC (rev 678)
+++ trunk/jazz/src/EventWindow.cpp 2009-01-01 08:46:37 UTC (rev 679)
@@ -106,14 +106,14 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-int JZEventWindow::EventsSelected(const wxString& Message) const
+bool JZEventWindow::EventsSelected(const wxString& Message) const
{
if (!mpSnapSel->IsSelected())
{
wxMessageBox(Message, "Error", wxOK);
- return 0;
+ return false;
}
- return 1;
+ return true;
}
//-----------------------------------------------------------------------------
Modified: trunk/jazz/src/EventWindow.h
===================================================================
--- trunk/jazz/src/EventWindow.h 2009-01-01 06:20:59 UTC (rev 678)
+++ trunk/jazz/src/EventWindow.h 2009-01-01 08:46:37 UTC (rev 679)
@@ -57,7 +57,7 @@
// WARNING: non-constant access.
JZSong* GetSong() const;
- int EventsSelected(const wxString& Message) const;
+ bool EventsSelected(const wxString& Message) const;
void LineText(
wxDC& Dc,
Modified: trunk/jazz/src/PianoFrame.cpp
===================================================================
--- trunk/jazz/src/PianoFrame.cpp 2009-01-01 06:20:59 UTC (rev 678)
+++ trunk/jazz/src/PianoFrame.cpp 2009-01-01 08:46:37 UTC (rev 679)
@@ -58,7 +58,6 @@
#define MEN_METERCH 8
#define ACT_HELP_MOUSE 9
-#define MEN_SHIFT 11
#define MEN_QUANTIZE 12
#define MEN_SETCHAN 14
#define MEN_TRANSP 15
@@ -174,7 +173,7 @@
EVT_MENU(wxID_DELETE, JZPianoFrame::OnErase)
EVT_MENU(wxID_CUT, JZPianoFrame::OnCut)
EVT_MENU(wxID_COPY, JZPianoFrame::OnCopy)
- EVT_MENU(MEN_SHIFT, JZPianoFrame::OnShift)
+ EVT_MENU(ID_SHIFT, JZPianoFrame::OnShift)
EVT_MENU(MEN_SHIFTL, JZPianoFrame::OnShiftLeft)
EVT_MENU(MEN_SHIFTR, JZPianoFrame::OnShiftRight)
EVT_MENU(MEN_LERI, JZPianoFrame::OnExchangeLeftRight)
@@ -336,28 +335,28 @@
edit_menu->Append(wxID_DELETE, "&Delete");
edit_menu->Append(wxID_COPY, "&Copy");
edit_menu->Append(wxID_CUT, "&Cut");
- edit_menu->Append(MEN_SHIFT, "&Shift ...");
- edit_menu->Append(MEN_QUANTIZE, "&Quantize ...");
- edit_menu->Append(MEN_SETCHAN, "&Set MIDI Channel ...");
- edit_menu->Append(MEN_TRANSP, "&Transpose ...");
- edit_menu->Append(MEN_VELOC, "&Velocity ...");
- edit_menu->Append(MEN_LENGTH, "&Length ...");
+ edit_menu->Append(ID_SHIFT, "&Shift...");
+ edit_menu->Append(MEN_QUANTIZE, "&Quantize...");
+ edit_menu->Append(MEN_SETCHAN, "&Set MIDI Channel...");
+ edit_menu->Append(MEN_TRANSP, "&Transpose...");
+ edit_menu->Append(MEN_VELOC, "&Velocity...");
+ edit_menu->Append(MEN_LENGTH, "&Length...");
- edit_menu->Append(MEN_SEQLENGTH, "&Sequence Length ...");
- edit_menu->Append(MEN_MIDIDELAY, "&Midi Delay ...");
+ edit_menu->Append(MEN_SEQLENGTH, "&Sequence Length...");
+ edit_menu->Append(MEN_MIDIDELAY, "&Midi Delay...");
edit_menu->Append(MEN_CONVERT_TO_MODULATION, "&Convert to Modulation(experimental)");
edit_menu->Append(MEN_LERI, "&Left <-> Right");
edit_menu->Append(MEN_UPDN, "&Up <-> Down");
- edit_menu->Append(MEN_CLEANUP, "&Cleanup ...");
- edit_menu->Append(MEN_SEARCHREP, "&Search Replace ...");
+ edit_menu->Append(MEN_CLEANUP, "&Cleanup...");
+ edit_menu->Append(MEN_SEARCHREP, "&Search Replace...");
wxMenu *setting_menu = new wxMenu("",wxMENU_TEAROFF);
- setting_menu->Append(MEN_FILTER, "&Filter ...");
- setting_menu->Append(ACT_SETTINGS, "&Window ...");
+ setting_menu->Append(MEN_FILTER, "&Filter...");
+ setting_menu->Append(ACT_SETTINGS, "&Window...");
setting_menu->Append(MEN_VISIBLE, "&Events...");
- setting_menu->Append(MEN_SNAP, "&Snap ...");
- setting_menu->Append(MEN_METERCH, "&Meterchange ...");
+ setting_menu->Append(MEN_SNAP, "&Snap...");
+ setting_menu->Append(MEN_METERCH, "&Meterchange...");
wxMenu *misc_menu = new wxMenu("",wxMENU_TEAROFF);
misc_menu->Append(wxID_UNDO, "&Undo");
@@ -369,7 +368,7 @@
misc_menu->Append(MEN_CTRL_POLY_AFTER, "Edit &Key Aftertouch");
misc_menu->Append(MEN_CTRL_CHANNEL_AFTER, "Edit &Chn Aftertouch");
- misc_menu->Append(MEN_CTRL_CONTR, "Edit &Controller ...");
+ misc_menu->Append(MEN_CTRL_CONTR, "Edit &Controller...");
misc_menu->Append(MEN_CTRL_TEMPO, "Edit &Tempo");
misc_menu->Append(MEN_CTRL_NONE, "Edit &None");
misc_menu->Append(MEN_GUITAR, "&Guitar board");
Modified: trunk/jazz/src/Resources.h
===================================================================
--- trunk/jazz/src/Resources.h 2009-01-01 06:20:59 UTC (rev 678)
+++ trunk/jazz/src/Resources.h 2009-01-01 08:46:37 UTC (rev 679)
@@ -46,15 +46,16 @@
#define ID_TRIM wxID_HIGHEST + 30
#define ID_QUANTIZE wxID_HIGHEST + 31
-#define ID_SHIFT_LEFT wxID_HIGHEST + 32
-#define ID_SHIFT_RIGHT wxID_HIGHEST + 33
-#define ID_SNAP_8 wxID_HIGHEST + 34
-#define ID_SNAP_8D wxID_HIGHEST + 35
-#define ID_SNAP_16 wxID_HIGHEST + 36
-#define ID_SNAP_16D wxID_HIGHEST + 37
-#define ID_MIXER wxID_HIGHEST + 38
-#define ID_PIANOWIN wxID_HIGHEST + 39
-#define ID_METRONOME_TOGGLE wxID_HIGHEST + 40
+#define ID_SHIFT wxID_HIGHEST + 32
+#define ID_SHIFT_LEFT wxID_HIGHEST + 33
+#define ID_SHIFT_RIGHT wxID_HIGHEST + 34
+#define ID_SNAP_8 wxID_HIGHEST + 35
+#define ID_SNAP_8D wxID_HIGHEST + 36
+#define ID_SNAP_16 wxID_HIGHEST + 37
+#define ID_SNAP_16D wxID_HIGHEST + 38
+#define ID_MIXER wxID_HIGHEST + 39
+#define ID_PIANOWIN wxID_HIGHEST + 40
+#define ID_METRONOME_TOGGLE wxID_HIGHEST + 41
#define ID_PLAY wxID_HIGHEST + 50
#define ID_PLAY_LOOP wxID_HIGHEST + 51
Modified: trunk/jazz/src/Sample.h
===================================================================
--- trunk/jazz/src/Sample.h 2009-01-01 06:20:59 UTC (rev 678)
+++ trunk/jazz/src/Sample.h 2009-01-01 08:46:37 UTC (rev 679)
@@ -270,7 +270,7 @@
void Clear();
void GotoRAM() {
- // try to swap this sample into memory ...
+ // Try to swap this sample into memory.
volatile short dummy;
for (int i = 0; i < length; i++)
dummy = data[i];
Modified: trunk/jazz/src/SampleWindow.cpp
===================================================================
--- trunk/jazz/src/SampleWindow.cpp 2009-01-01 06:20:59 UTC (rev 678)
+++ trunk/jazz/src/SampleWindow.cpp 2009-01-01 08:46:37 UTC (rev 679)
@@ -322,7 +322,7 @@
wxDC* pDc = new wxClientDC(this);
- // tSnapSel is strange ...
+ // tSnapSel is strange.
if (e.LeftDown())
{
mouse_up_sets_insertion_point = 0;
@@ -739,11 +739,11 @@
menu_bar->Append(menu, "&Edit");
menu = new wxMenu;
- menu->Append(MEN_VOLUME_PNT, "&Volume ...");
- menu->Append(MEN_PAN_PNT, "&Panpot ...");
- menu->Append(MEN_TRANSP_PNT, "&Pitch ...");
- menu->Append(MEN_WAHWAH, "&Filter ...");
- menu->Append(MEN_CANCEL, "&None ...");
+ menu->Append(MEN_VOLUME_PNT, "&Volume...");
+ menu->Append(MEN_PAN_PNT, "&Panpot...");
+ menu->Append(MEN_TRANSP_PNT, "&Pitch...");
+ menu->Append(MEN_WAHWAH, "&Filter...");
+ menu->Append(MEN_CANCEL, "&None...");
menu_bar->Append(menu, "&Painters");
menu = new wxMenu;
@@ -760,8 +760,8 @@
menu_bar->Append(menu, "&Effects");
menu = new wxMenu;
- menu->Append(MEN_TRANSP_SET, "&Pitch Painter ...");
- menu->Append(MEN_WAHSETTINGS, "&Filter Painter ...");
+ menu->Append(MEN_TRANSP_SET, "&Pitch Painter...");
+ menu->Append(MEN_WAHSETTINGS, "&Filter Painter...");
// menu->Append(wxID_ZOOM_IN, "Zoom &In");
// menu->Append(wxID_ZOOM_OUT, "Zoom &Out");
menu->Append(MEN_SETTINGS, "&View Settings...");
@@ -955,7 +955,7 @@
return;
}
- // player crashes if data disappear ...
+ // Player crashes if data disappear.
if (id != MEN_PLAY)
{
cnvs->playpos->StopListen();
Modified: trunk/jazz/src/Track.cpp
===================================================================
--- trunk/jazz/src/Track.cpp 2009-01-01 06:20:59 UTC (rev 678)
+++ trunk/jazz/src/Track.cpp 2009-01-01 08:46:37 UTC (rev 679)
@@ -90,7 +90,13 @@
}
*/
-static double framesPerSecond[] = { 24.0, 25.0, 30.0, 30.0 };
+static double gFramesPerSecond[] =
+{
+ 24.0,
+ 25.0,
+ 30.0,
+ 30.0
+};
tMtcTime::tMtcTime(tMtcOffset* pMtcOffset)
{
@@ -127,7 +133,7 @@
sec = sec % 60;
hour = min / 60;
min = min % 60;
- double frametime = 1000.0 / framesPerSecond[type];
+ double frametime = 1000.0 / gFramesPerSecond[type];
fm = (int) ((double) msec / frametime);
}
@@ -147,9 +153,9 @@
type = Mtc30Ndf;
}
sscanf(str, "%d:%d:%d.%d", &hour, &min, &sec, &fm);
- if (fm >= framesPerSecond[type])
+ if (fm >= gFramesPerSecond[type])
{
- fm = (int) framesPerSecond[type] - 1;
+ fm = (int) gFramesPerSecond[type] - 1;
}
}
@@ -193,7 +199,7 @@
int tMtcTime::ToMillisec()
{
int msec = (((((hour * 60L) + min) * 60L) + sec) * 1000L) +
- ((fm * 1000L) / (int) framesPerSecond[type]);
+ ((fm * 1000L) / (int) gFramesPerSecond[type]);
return msec;
}
Modified: trunk/jazz/src/TrackFrame.cpp
===================================================================
--- trunk/jazz/src/TrackFrame.cpp 2009-01-01 06:20:59 UTC (rev 678)
+++ trunk/jazz/src/TrackFrame.cpp 2009-01-01 08:46:37 UTC (rev 679)
@@ -85,6 +85,9 @@
EVT_MENU(wxID_EXIT, JZTrackFrame::OnFileExit)
+ EVT_UPDATE_UI(ID_SHIFT, JZTrackFrame::OnUpdateEditShift)
+ EVT_MENU(ID_SHIFT, JZTrackFrame::OnEditShift)
+
EVT_MENU(ID_PLAY, JZTrackFrame::OnPlay)
EVT_MENU(ID_PLAY_LOOP, JZTrackFrame::OnPlayLoop)
@@ -236,6 +239,17 @@
mpEditMenu->AppendSeparator();
+// mpEditMenu->Append(MEN_QUANTIZE, "&Quantize...");
+// mpEditMenu->Append(MEN_SETCHAN, "&Set MIDI Channel...");
+// mpEditMenu->Append(MEN_TRANSP, "&Transpose...");
+// mpEditMenu->Append(MEN_VELOC, "&Velocity...");
+// mpEditMenu->Append(MEN_LENGTH, "&Length...");
+ mpEditMenu->Append(ID_SHIFT, "Shi&ft...");
+// mpEditMenu->Append(MEN_CLEANUP, "C&leanup...");
+// mpEditMenu->Append(MEN_SEARCHREP, "Search Re&place...");
+
+ mpEditMenu->AppendSeparator();
+
mpEditMenu->Append(wxID_DELETE, "&Delete");
mpEditMenu->Append(wxID_DELETE, "&Silence");
@@ -251,16 +265,6 @@
mpEditMenu->AppendSeparator();
- /* Move Elsewhere
- mpEditMenu->Append(MEN_QUANTIZE, "&Quantize...");
- mpEditMenu->Append(MEN_SETCHAN, "&Set MIDI Channel...");
- mpEditMenu->Append(MEN_TRANSP, "&Transpose...");
- mpEditMenu->Append(MEN_VELOC, "&Velocity...");
- mpEditMenu->Append(MEN_LENGTH, "&Length...");
- mpEditMenu->Append(MEN_SHIFT, "Shi&ft...");
- mpEditMenu->Append(MEN_CLEANUP, "C&leanup...");
- mpEditMenu->Append(MEN_SEARCHREP, "Search Re&place...");
- */
// Miscellaneous Menu is Stupid.
// Now it's a View Menu
@@ -521,6 +525,19 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
+void JZTrackFrame::OnUpdateEditShift(wxUpdateUIEvent& Event)
+{
+ Event.Enable(mpTrackWindow->AreEventsSelected());
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+void JZTrackFrame::OnEditShift(wxCommandEvent& Event)
+{
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
void JZTrackFrame::OnPlay(wxCommandEvent& Event)
{
wxMouseEvent MouseEvent;
Modified: trunk/jazz/src/TrackFrame.h
===================================================================
--- trunk/jazz/src/TrackFrame.h 2009-01-01 06:20:59 UTC (rev 678)
+++ trunk/jazz/src/TrackFrame.h 2009-01-01 08:46:37 UTC (rev 679)
@@ -82,6 +82,9 @@
void OnZoomOut(wxCommandEvent& Event);
+ void OnUpdateEditShift(wxUpdateUIEvent& Event);
+ void OnEditShift(wxCommandEvent& Event);
+
void OnPlay(wxCommandEvent& Event);
void OnPlayLoop(wxCommandEvent& Event);
Modified: trunk/jazz/src/TrackWindow.cpp
===================================================================
--- trunk/jazz/src/TrackWindow.cpp 2009-01-01 06:20:59 UTC (rev 678)
+++ trunk/jazz/src/TrackWindow.cpp 2009-01-01 08:46:37 UTC (rev 679)
@@ -1229,6 +1229,13 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
+bool JZTrackWindow::AreEventsSelected()
+{
+ return mpSnapSel->IsSelected();
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
int JZTrackWindow::EventsSelected(const wxString& Message)
{
if (!mpSnapSel->IsSelected())
Modified: trunk/jazz/src/TrackWindow.h
===================================================================
--- trunk/jazz/src/TrackWindow.h 2009-01-01 06:20:59 UTC (rev 678)
+++ trunk/jazz/src/TrackWindow.h 2009-01-01 08:46:37 UTC (rev 679)
@@ -75,6 +75,8 @@
void MousePlay(wxMouseEvent& Event, TEMousePlayMode Mode);
+ bool AreEventsSelected();
+
int EventsSelected(const wxString& Message);
void ZoomIn();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
