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

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

Revision: 337
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=337&view=rev
Author:   pstieber
Date:     2008-03-20 22:44:12 -0700 (Thu, 20 Mar 2008)

Log Message:
-----------
1. Prefixed the Song data member with mp.
2. Made some cosmetic changes.

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

Modified: trunk/jazz/src/Filter.cpp
===================================================================
--- trunk/jazz/src/Filter.cpp	2008-03-21 05:42:08 UTC (rev 336)
+++ trunk/jazz/src/Filter.cpp	2008-03-21 05:44:12 UTC (rev 337)
@@ -35,21 +35,21 @@
 
 const tFltEvent FltEvents[nFltEvents] =
 {
-  { StatKeyOn,                "Note",         1,        0,        127},
-  { StatKeyPressure,    "Poly Aftertouch",1,    0,      127},
-  { StatControl,         "Controller",         1,        0,        127},
-  { StatProgram,         "Patch",        1,        0,        127},
-  { StatPitch,                "Pitch",         1,        -8192,        8192},
-  { StatTimeSignat,        "Meter",        1,        0,        0},
-  { StatChnPressure,    "Channel Aftertouch",1, 0,      0},
-  { StatSysEx,          "SysEx",        1,      0,      0}
+  { StatKeyOn,          "Note",               1,     0,  127},
+  { StatKeyPressure,    "Poly Aftertouch",    1,     0,  127},
+  { StatControl,        "Controller",         1,     0,  127},
+  { StatProgram,        "Patch",              1,     0,  127},
+  { StatPitch,          "Pitch",              1, -8192, 8192},
+  { StatTimeSignat,     "Meter",              1,     0,    0},
+  { StatChnPressure,    "Channel Aftertouch", 1,     0,    0},
+  { StatSysEx,          "SysEx",              1,     0,    0}
 };
 
 
 
 tFilter::tFilter(JZSong *s)
 {
-  Song = s;
+  mpSong = s;
   FltEvents = new tFltEvent [nFltEvents];
   memcpy(FltEvents, ::FltEvents, sizeof(::FltEvents));
 
@@ -84,8 +84,9 @@
   return *this;
 }
 
-void tFilter::copy(tFilter const &o) {
-  Song          = o.Song;
+void tFilter::copy(tFilter const &o)
+{
+  mpSong        = o.mpSong;
   FromClock     = o.FromClock;
   ToClock       = o.ToClock;
   FromTrack     = o.FromTrack;
@@ -191,7 +192,7 @@
 {
   tFilterDlg *dlg;
   //  DialogBox = new wxDialogBox(parent, "Event Filter", FALSE );
-  dlg = new tFilterDlg(this, Song,  ShowEventStats);
+  dlg = new tFilterDlg(this, mpSong, ShowEventStats);
   dlg->Create();
 //   dlg->EditForm(DialogBox, ShowEventStats);
 //   DialogBox->Fit();
@@ -210,7 +211,7 @@
 tTrackIterator::tTrackIterator(tFilter *f, int rev)
 {
   Filter = f;
-  Song   = Filter->Song;
+  Song   = Filter->mpSong;
   Reverse = rev;
 }
 

Modified: trunk/jazz/src/Filter.h
===================================================================
--- trunk/jazz/src/Filter.h	2008-03-21 05:42:08 UTC (rev 336)
+++ trunk/jazz/src/Filter.h	2008-03-21 05:44:12 UTC (rev 337)
@@ -64,14 +64,16 @@
     tFltEvent *FltEvents;
     bool      OtherSelected;
 
-    JZSong *Song;
+    JZSong* mpSong;
+
     int FromClock, ToClock;        // einschl .. ausschl
+
     int FromTrack, ToTrack;        // 1..n einschl .. einschl
 
     void Dialog(wxFrame *parent, int ShowEventStats = 1);
 
-    tFilter(JZSong *);
-    tFilter(tFilter *o);
+    tFilter(JZSong* pSong);
+    tFilter(tFilter* pOtherFilter);
     tFilter(tFilter const &o);
     tFilter& operator=(tFilter const &o);
     virtual ~tFilter();


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