SF.net SVN: jazzplusplus:[976] trunk/jazz/src

[<pst...@us...>]

Revision: 976
          http://sourceforge.net/p/jazzplusplus/code/976
Author:   pstieber
Date:     2013-03-18 18:57:43 +0000 (Mon, 18 Mar 2013)
Log Message:
-----------
Replaced data members for X snap locations with a local std::vector<int>.

Modified Paths:
--------------
    trunk/jazz/src/PianoWindow.cpp
    trunk/jazz/src/PianoWindow.h

Modified: trunk/jazz/src/PianoWindow.cpp
===================================================================
--- trunk/jazz/src/PianoWindow.cpp	2013-03-18 18:56:00 UTC (rev 975)
+++ trunk/jazz/src/PianoWindow.cpp	2013-03-18 18:57:43 UTC (rev 976)
@@ -668,7 +668,6 @@
   : JZEventWindow(pPianoFrame, pProject, Position, Size),
     mpPianoFrame(pPianoFrame),
     mPlayClock(-1),
-    mSnapCount(0),
     mPasteBuffer(),
     mpTrack(0),
     mTrackIndex(0),
@@ -2014,22 +2013,16 @@
 //-----------------------------------------------------------------------------
 void JZPianoWindow::SnapSelectionStart(wxMouseEvent& MouseEvent)
 {
-  mSnapCount = 0;
   int clk = SnapClock(mFromClock, false);
   int qnt = SnapClocks();
-  while (clk <= mToClock && mSnapCount < eMaxSnaps)
+  vector<int> XSnaps;
+  while (clk <= mToClock)
   {
-    mSnapsX[mSnapCount++] = Clock2x(clk);
+    XSnaps.push_back(Clock2x(clk));
     clk += qnt;
   }
-  if (mSnapCount < eMaxSnaps)
-  {
-    mpSnapSel->SetXSnap(mSnapCount, mSnapsX, 0);
-  }
-  else
-  {
-    mpSnapSel->SetXSnap(0, 0, 0);
-  }
+  mpSnapSel->SetXSnap(XSnaps, 0);
+
   mpSnapSel->SetYSnap(
     mFromLine * mTrackHeight + mTopInfoHeight,
     mEventsY + mEventsHeight,

Modified: trunk/jazz/src/PianoWindow.h
===================================================================
--- trunk/jazz/src/PianoWindow.h	2013-03-18 18:56:00 UTC (rev 975)
+++ trunk/jazz/src/PianoWindow.h	2013-03-18 18:57:43 UTC (rev 976)
@@ -206,15 +206,8 @@
 
     int mPlayClock;
 
-    enum TESizes
-    {
-      eMaxSnaps = 500
-    };
+  public:
 
-    int mSnapCount;
-
-    int mSnapsX[eMaxSnaps];
-
     JZEventArray mPasteBuffer;
 
   public:

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.