|
From: <pst...@us...> - 2008-03-30 03:05:57
|
Revision: 357
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=357&view=rev
Author: pstieber
Date: 2008-03-29 20:05:55 -0700 (Sat, 29 Mar 2008)
Log Message:
-----------
1. Added code to initiate loop play.
2. Removed some debug output.
Modified Paths:
--------------
trunk/jazz/src/TrackFrame.cpp
trunk/jazz/src/TrackFrame.h
Modified: trunk/jazz/src/TrackFrame.cpp
===================================================================
--- trunk/jazz/src/TrackFrame.cpp 2008-03-30 03:04:51 UTC (rev 356)
+++ trunk/jazz/src/TrackFrame.cpp 2008-03-30 03:05:55 UTC (rev 357)
@@ -76,6 +76,8 @@
EVT_MENU(ID_PLAY, JZTrackFrame::OnPlay)
+ EVT_MENU(ID_PLAY_LOOP, JZTrackFrame::OnPlayLoop)
+
EVT_MENU(ID_PIANOWIN, JZTrackFrame::OnPianoWindow)
EVT_MENU(ID_METRONOME_ON, JZTrackFrame::OnMetroOn)
@@ -463,13 +465,20 @@
//-----------------------------------------------------------------------------
void JZTrackFrame::OnPlay(wxCommandEvent& Event)
{
- cout << "JZTrackFrame::OnPlay" << endl;
wxMouseEvent MouseEvent;
MousePlay(MouseEvent, ePlayButton);
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
+void JZTrackFrame::OnPlayLoop(wxCommandEvent& Event)
+{
+ wxMouseEvent MouseEvent;
+ MousePlay(MouseEvent, ePlayLoopButton);
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
void JZTrackFrame::OnPianoWindow(wxCommandEvent& Event)
{
JZPianoFrame* pPianoFrame = new JZPianoFrame(
@@ -547,8 +556,6 @@
//-----------------------------------------------------------------------------
void JZTrackFrame::MousePlay(wxMouseEvent& Event, TEMousePlayMode Mode)
{
- cout << "JZTrackFrame::MousePlay" << endl;
-
mpTrackWindow->MousePlay(Event, Mode);
/*
@@ -585,7 +592,6 @@
break;
case ePlayButton:
- cout << "JZTrackFrame::PlayButton" << endl;
gpProject->SetLoop(false);
gpProject->SetRecord(false);
break;
@@ -665,16 +671,11 @@
loop_clock = mpFilter->ToClock;
}
- // GO!
- cout << "Go!" << endl;
-
//if (pRecInfo->Track) // recording?
//gpProject->Midi->SetRecordInfo(pRecInfo);
//else
//gpProject->Midi->SetRecordInfo(0);
- cout << "Midi->StartPlay" << endl;
-
gpProject->mStartTime = mPreviousClock;
gpProject->mStopTime = loop_clock;
gpProject->Play();
Modified: trunk/jazz/src/TrackFrame.h
===================================================================
--- trunk/jazz/src/TrackFrame.h 2008-03-30 03:04:51 UTC (rev 356)
+++ trunk/jazz/src/TrackFrame.h 2008-03-30 03:05:55 UTC (rev 357)
@@ -78,6 +78,8 @@
void OnPlay(wxCommandEvent& Event);
+ void OnPlayLoop(wxCommandEvent& Event);
+
void OnPianoWindow(wxCommandEvent& Event);
void OnToolsHarmonyBrowser(wxCommandEvent& Event);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|