From: <pst...@us...> - 2009-01-01 03:32:12
|
Revision: 675 http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=675&view=rev Author: pstieber Date: 2009-01-01 03:32:09 +0000 (Thu, 01 Jan 2009) Log Message: ----------- 1. Changed to use the new versions of ReadString and WriteString. 2. Replaced some char buffers with STL strings. 3. Updated to use the new filter accessor and mutator function. Modified Paths: -------------- trunk/jazz/src/Rhythm.cpp Modified: trunk/jazz/src/Rhythm.cpp =================================================================== --- trunk/jazz/src/Rhythm.cpp 2009-01-01 03:30:55 UTC (rev 674) +++ trunk/jazz/src/Rhythm.cpp 2009-01-01 03:32:09 UTC (rev 675) @@ -188,7 +188,6 @@ void tRhythm::read(istream& Is, int version) { - char buf[200]; Is >> rhythm; Is >> length; Is >> veloc; @@ -213,8 +212,9 @@ } Is >> parm; - ReadString(Is, buf, sizeof(buf)); - SetLabel(buf); + string Label; + ReadString(Is, Label); + SetLabel(Label.c_str()); if (version > 1) { @@ -1077,15 +1077,15 @@ JZFilter* pFilter = mpEventWindow->mpFilter; - if (pFilter->FromTrack != pFilter->ToTrack) + if (pFilter->GetFromTrack() != pFilter->GetToTrack()) { wxMessageBox("you must select exacty 1 track", "Error", wxOK); return; } - long fr_clock = pFilter->FromClock; - long to_clock = pFilter->ToClock; - JZTrack *track = mpSong->GetTrack(pFilter->FromTrack); + long fr_clock = pFilter->GetFromClock(); + long to_clock = pFilter->GetToClock(); + JZTrack *track = mpSong->GetTrack(pFilter->GetFromTrack()); mpSong->NewUndoBuffer(); // remove selection This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |