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

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

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

Log Message:
-----------
1. Changed mStat to mStatusByte and changed constructor argument version to be clearer.
2. Changed cha to Channel in the ASCII I/O code.

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

Modified: trunk/jazz/src/AsciiMidiFile.cpp
===================================================================
--- trunk/jazz/src/AsciiMidiFile.cpp	2010-04-26 17:22:22 UTC (rev 761)
+++ trunk/jazz/src/AsciiMidiFile.cpp	2010-04-26 23:25:19 UTC (rev 762)
@@ -47,8 +47,15 @@
   JZEvent* pEvent = 0;
 
   long Clock;
-  int sta, cha, Length;
-  if (fscanf(mpFd, "%6lu %02x %2d %d ", &Clock, &sta, &cha, &Length) != 4)
+  int StatusByte, Channel, Length;
+  if (
+    fscanf(
+      mpFd,
+      "%6lu %02x %2d %d ",
+      &Clock,
+      &StatusByte,
+      &Channel,
+      &Length) != 4)
   {
     return pEvent;
   }
@@ -61,29 +68,29 @@
     pBuffer[i] = (unsigned char)d;
   }
 
-  switch (sta)
+  switch (StatusByte)
   {
     case StatUnknown:
       break;
 
     case StatKeyOff:
-      pEvent = new JZKeyOffEvent(Clock, cha, pBuffer[0]);
+      pEvent = new JZKeyOffEvent(Clock, Channel, pBuffer[0]);
       break;
 
     case StatKeyOn:
-      pEvent = new JZKeyOnEvent(Clock, cha, pBuffer[0], pBuffer[1]);
+      pEvent = new JZKeyOnEvent(Clock, Channel, pBuffer[0], pBuffer[1]);
       break;
 
     case StatControl:
-      pEvent = new JZControlEvent(Clock, cha, pBuffer[0], pBuffer[1]);
+      pEvent = new JZControlEvent(Clock, Channel, pBuffer[0], pBuffer[1]);
       break;
 
     case StatPitch:
-      pEvent = new JZPitchEvent(Clock, cha, pBuffer[0], pBuffer[1]);
+      pEvent = new JZPitchEvent(Clock, Channel, pBuffer[0], pBuffer[1]);
       break;
 
     case StatProgram:
-      pEvent = new JZProgramEvent(Clock, cha, pBuffer[0]);
+      pEvent = new JZProgramEvent(Clock, Channel, pBuffer[0]);
       break;
 
     case StatText:

Modified: trunk/jazz/src/Events.h
===================================================================
--- trunk/jazz/src/Events.h	2010-04-26 17:22:22 UTC (rev 761)
+++ trunk/jazz/src/Events.h	2010-04-26 23:25:19 UTC (rev 762)
@@ -317,7 +317,7 @@
 
     unsigned char GetStat() const
     {
-      return mStat;
+      return mStatusByte;
     }
 
     int GetClock() const
@@ -337,8 +337,8 @@
       BROADCAST_DEVICE = 0
     };
 
-    JZEvent(int Clock, unsigned char Stat)
-      : mStat(Stat),
+    JZEvent(int Clock, unsigned char StatusByte)
+      : mStatusByte(StatusByte),
         mClock(Clock),
         mDevice(BROADCAST_DEVICE)
     {
@@ -469,7 +469,7 @@
 
   protected:
 
-    unsigned char mStat;
+    unsigned char mStatusByte;
 
     int mClock;
 
@@ -484,8 +484,8 @@
 {
   public:
 
-    JZChannelEvent(int Clock, unsigned char sta, int Channel)
-      : JZEvent(Clock, sta)
+    JZChannelEvent(int Clock, unsigned char StatusByte, int Channel)
+      : JZEvent(Clock, StatusByte)
     {
       mChannel = Channel;
     }
@@ -909,10 +909,10 @@
 
     JZMetaEvent(
       int Clock,
-      unsigned char sta,
+      unsigned char StatusByte,
       unsigned char* pData,
       unsigned short Length)
-      : JZEvent(Clock, sta),
+      : JZEvent(Clock, StatusByte),
         mpData(0),
         mLength(Length)
     {
@@ -941,7 +941,7 @@
 
     virtual JZEvent* Copy() const
     {
-      return new JZMetaEvent(mClock, mStat, mpData, mLength);
+      return new JZMetaEvent(mClock, mStatusByte, mpData, mLength);
     }
 
     const unsigned char* GetData() const


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