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

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

Revision: 552
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=552&view=rev
Author:   pstieber
Date:     2008-05-21 22:26:26 -0700 (Wed, 21 May 2008)

Log Message:
-----------
Started using accessors in the tProgram event class.

Modified Paths:
--------------
    trunk/jazz/src/AlsaPlayer.cpp
    trunk/jazz/src/Dialogs.cpp
    trunk/jazz/src/Events.h
    trunk/jazz/src/Player.cpp
    trunk/jazz/src/Track.cpp
    trunk/jazz/src/mswin/WindowsPlayer.cpp

Modified: trunk/jazz/src/AlsaPlayer.cpp
===================================================================
--- trunk/jazz/src/AlsaPlayer.cpp	2008-05-21 15:51:25 UTC (rev 551)
+++ trunk/jazz/src/AlsaPlayer.cpp	2008-05-22 05:26:26 UTC (rev 552)
@@ -433,10 +433,10 @@
 
     case StatProgram:
       {
-        tProgram *k = pEvent->IsProgram();
+        tProgram* pProgram = pEvent->IsProgram();
         set_event_header(&ev, pEvent->GetClock(), SND_SEQ_EVENT_PGMCHANGE);
-        ev.data.control.channel = k->GetChannel();
-        ev.data.control.value = k->Program;
+        ev.data.control.channel = pProgram->GetChannel();
+        ev.data.control.value = pProgram->GetProgram();
         rc = write(&ev, now);
       }
       break;

Modified: trunk/jazz/src/Dialogs.cpp
===================================================================
--- trunk/jazz/src/Dialogs.cpp	2008-05-21 15:51:25 UTC (rev 551)
+++ trunk/jazz/src/Dialogs.cpp	2008-05-22 05:26:26 UTC (rev 552)
@@ -1053,21 +1053,23 @@
 };
 
 
-tProgramDlg::tProgramDlg(tProgram *e, JZPianoWindow* w, JZTrack *t)
-  : tEventDlg(e, w, t),
-    Program(e->Program + 1)//,
+tProgramDlg::tProgramDlg(tProgram* pProgram, JZPianoWindow* w, JZTrack *t)
+  : tEventDlg(pProgram, w, t),
+    Program(pProgram->GetProgram() + 1)//,
 //    Choice("Program", &gpConfig->GetVoiceName(0), &Program)
 {
-  Event = e;
+  Event = pProgram;
 }
 
 
 bool tProgramDlg::OnClose()
 {
-  //Choice.GetValue();
+//  Choice.GetValue();
   if (Program <= 0)
+  {
     Program = 1;
-  ((tProgram *)Copy)->Program = Program - 1;
+  }
+  ((tProgram *)Copy)->SetProgram(Program - 1);
   return tEventDlg::OnClose();
 }
 

Modified: trunk/jazz/src/Events.h
===================================================================
--- trunk/jazz/src/Events.h	2008-05-21 15:51:25 UTC (rev 551)
+++ trunk/jazz/src/Events.h	2008-05-22 05:26:26 UTC (rev 552)
@@ -851,17 +851,15 @@
 {
   public:
 
-    unsigned char Program;
-
-    tProgram(int clk, int cha, unsigned char prg)
-      : tChannelEvent(clk, StatProgram, cha)
+    tProgram(int clk, int Channel, unsigned char Program)
+      : tChannelEvent(clk, StatProgram, Channel)
     {
-      Program = prg;
+      mProgram = Program;
     }
 
     virtual int Write(JZWriteBase &io)
     {
-      edb(); return io.Write(this, Program);
+      edb(); return io.Write(this, mProgram);
     }
 
     virtual tProgram* IsProgram()
@@ -879,19 +877,19 @@
     virtual int GetValue() const
     {
       edb();
-      return Program;
+      return mProgram;
     }
 
     virtual int GetPitch() const
     {
       edb();
-      return Program;
+      return mProgram;
     }
 
-    virtual void SetPitch(int p)
+    virtual void SetPitch(int Pitch)
     {
       edb();
-      Program = p;
+      mProgram = Pitch;
     }
 
     virtual const wxPen* GetPen() const
@@ -903,6 +901,20 @@
     {
       return wxGREEN_BRUSH;
     }
+
+    unsigned char GetProgram() const
+    {
+      return mProgram;
+    }
+
+    void SetProgram(unsigned char Program)
+    {
+      mProgram = Program;
+    }
+
+  private:
+
+    unsigned char mProgram;
 };
 
 

Modified: trunk/jazz/src/Player.cpp
===================================================================
--- trunk/jazz/src/Player.cpp	2008-05-21 15:51:25 UTC (rev 551)
+++ trunk/jazz/src/Player.cpp	2008-05-22 05:26:26 UTC (rev 552)
@@ -1650,8 +1650,8 @@
       break;
     case StatProgram:
       {
-        tProgram *k = pEvent->IsProgram();
-        SEQ_SET_PATCH(mididev, k->GetChannel(), k->Program);
+        tProgram* pProgram = pEvent->IsProgram();
+        SEQ_SET_PATCH(mididev, pProgram->GetChannel(), pProgram->GetProgram());
         if (now) seqbuf_flush_last_event();
       }
       break;

Modified: trunk/jazz/src/Track.cpp
===================================================================
--- trunk/jazz/src/Track.cpp	2008-05-21 15:51:25 UTC (rev 551)
+++ trunk/jazz/src/Track.cpp	2008-05-22 05:26:26 UTC (rev 552)
@@ -2411,7 +2411,7 @@
 {
   if (mPatch)
   {
-    return mPatch->Program + 1;
+    return mPatch->GetProgram() + 1;
   }
   return 0;
 }

Modified: trunk/jazz/src/mswin/WindowsPlayer.cpp
===================================================================
--- trunk/jazz/src/mswin/WindowsPlayer.cpp	2008-05-21 15:51:25 UTC (rev 551)
+++ trunk/jazz/src/mswin/WindowsPlayer.cpp	2008-05-22 05:26:26 UTC (rev 552)
@@ -285,15 +285,15 @@
 
     case StatProgram:
       {
-        tProgram *k = pEvent->IsProgram();
-        u.c[0] = 0xC0 | k->GetChannel();
-        u.c[1] = k->Program;
+        tProgram* pProgram = pEvent->IsProgram();
+        u.c[0] = 0xC0 | pProgram->GetChannel();
+        u.c[1] = pProgram->GetProgram();
       }
       break;
 
     case StatChnPressure:
       {
-        tChnPressure *k = pEvent->IsChnPressure();
+        tChnPressure* k = pEvent->IsChnPressure();
         u.c[0] = 0xC0 | k->GetChannel();
         u.c[1] = k->Value;
       }


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