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

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

Revision: 761
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=761&view=rev
Author:   pstieber
Date:     2010-04-26 17:22:22 +0000 (Mon, 26 Apr 2010)

Log Message:
-----------
Updated the naming convention for JZGetMidiBytes data members.

Modified Paths:
--------------
    trunk/jazz/src/Events.cpp
    trunk/jazz/src/Events.h
    trunk/jazz/src/Player.cpp

Modified: trunk/jazz/src/Events.cpp
===================================================================
--- trunk/jazz/src/Events.cpp	2010-04-26 17:06:32 UTC (rev 760)
+++ trunk/jazz/src/Events.cpp	2010-04-26 17:22:22 UTC (rev 761)
@@ -167,12 +167,12 @@
     case StatProgram:
     case StatChnPressure:
     case StatPitch:
-      nBytes = 0;
+      mByteCount = 0;
 
-      Buffer[nBytes++] = Stat | ((JZChannelEvent *)pEvent)->GetChannel();
+      mBuffer[mByteCount++] = Stat | ((JZChannelEvent *)pEvent)->GetChannel();
       while (Length--)
       {
-        Buffer[nBytes++] = *pData++;
+        mBuffer[mByteCount++] = *pData++;
       }
       return 0;
 

Modified: trunk/jazz/src/Events.h
===================================================================
--- trunk/jazz/src/Events.h	2010-04-26 17:06:32 UTC (rev 760)
+++ trunk/jazz/src/Events.h	2010-04-26 17:22:22 UTC (rev 761)
@@ -229,8 +229,8 @@
     // Get JZEvent's bytes.
     int Write(JZEvent* pEvent, unsigned char* pString, int Length);
 
-    unsigned char Buffer[10];
-    int nBytes;
+    unsigned char mBuffer[10];
+    int mByteCount;
 };
 
 // ********************************************************************

Modified: trunk/jazz/src/Player.cpp
===================================================================
--- trunk/jazz/src/Player.cpp	2010-04-26 17:06:32 UTC (rev 760)
+++ trunk/jazz/src/Player.cpp	2010-04-26 17:22:22 UTC (rev 761)
@@ -941,7 +941,7 @@
       JZChannelEvent *c;
 
       pEvent->Write(midi);
-      Stat = midi.Buffer[0]; // Status + Channel
+      Stat = midi.mBuffer[0]; // Status + Channel
 
       OutBreak(pEvent->GetClock());
 
@@ -995,7 +995,7 @@
 
       if (Stat != TrackRunningStatus[ActiveTrack])
       {
-        PlyBytes.Put(TRK + midi.nBytes + 1 + 1);
+        PlyBytes.Put(TRK + midi.mByteCount + 1 + 1);
         PlyBytes.Put(ActiveTrack);
         PlyBytes.Put(Time);
         PlyBytes.Put(Stat);
@@ -1003,12 +1003,12 @@
       }
       else
       {
-        PlyBytes.Put(TRK + midi.nBytes + 1);
+        PlyBytes.Put(TRK + midi.mByteCount + 1);
         PlyBytes.Put(ActiveTrack);
         PlyBytes.Put(Time);
       }
-      for (i = 1; i < midi.nBytes; i++)
-        PlyBytes.Put(midi.Buffer[i]);
+      for (i = 1; i < midi.mByteCount; i++)
+        PlyBytes.Put(midi.mBuffer[i]);
 
       TrackClock[ActiveTrack] = pEvent->GetClock();
       return 0;
@@ -1078,13 +1078,13 @@
   JZGetMidiBytes midi;
   if (pEvent->Write(midi) == 0)
   {
-    char* buf = new char[midi.nBytes + 3];
+    char* buf = new char[midi.mByteCount + 3];
     buf[n++] = CMD+1;
     buf[n++] = 0xd7;
-    buf[n++] = DAT+midi.nBytes;
-    for (i = 0; i < midi.nBytes; i++)
+    buf[n++] = DAT + midi.mByteCount;
+    for (i = 0; i < midi.mByteCount; i++)
     {
-      buf[n++] = midi.Buffer[i];
+      buf[n++] = midi.mBuffer[i];
     }
     write_noack_mpu(buf, n);
     delete[] buf;


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