jazzplusplus-updates

SF.net SVN: jazzplusplus: [397] trunk/jazz/src/Player.cpp

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

Revision: 397
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=397&view=rev
Author:   pstieber
Date:     2008-04-04 22:23:55 -0700 (Fri, 04 Apr 2008)

Log Message:
-----------
Removed some debug output.

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

Modified: trunk/jazz/src/Player.cpp
===================================================================
--- trunk/jazz/src/Player.cpp	2008-04-05 05:19:53 UTC (rev 396)
+++ trunk/jazz/src/Player.cpp	2008-04-05 05:23:55 UTC (rev 397)
@@ -205,9 +205,7 @@
 
 JZPlayer::~JZPlayer()
 {
-  cout << "JZPlayer delete start..." << endl;
   delete PlayLoop;
-  cout << "JZPlayer delete end..." << endl;
 }
 
 


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

SF.net SVN: jazzplusplus: [551] trunk/jazz/src/Player.cpp

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

Revision: 551
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=551&view=rev
Author:   pstieber
Date:     2008-05-21 08:51:25 -0700 (Wed, 21 May 2008)

Log Message:
-----------
Updated the ALSA specific portion of the player code for the latest event encapsulation changes.

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

Modified: trunk/jazz/src/Player.cpp
===================================================================
--- trunk/jazz/src/Player.cpp	2008-05-21 15:47:39 UTC (rev 550)
+++ trunk/jazz/src/Player.cpp	2008-05-21 15:51:25 UTC (rev 551)
@@ -1630,7 +1630,7 @@
         tKeyOn* pKeyOn = pEvent->IsKeyOn();
         SEQ_START_NOTE(
           mididev,
-          pKeyOn->Channel,
+          pKeyOn->GetChannel(),
           pKeyOn->GetKey(),
           pKeyOn->GetVelocity());
         if (now) seqbuf_flush_last_event();
@@ -1642,7 +1642,7 @@
         tKeyOff* pKeyOff = pEvent->IsKeyOff();
         SEQ_STOP_NOTE(
           mididev,
-          pKeyOff->Channel,
+          pKeyOff->GetChannel(),
           pKeyOff->Key,
           pKeyOff->OffVeloc);
         if (now) seqbuf_flush_last_event();
@@ -1651,7 +1651,7 @@
     case StatProgram:
       {
         tProgram *k = pEvent->IsProgram();
-        SEQ_SET_PATCH(mididev, k->Channel, k->Program);
+        SEQ_SET_PATCH(mididev, k->GetChannel(), k->Program);
         if (now) seqbuf_flush_last_event();
       }
       break;
@@ -1660,7 +1660,7 @@
     case StatKeyPressure:
       {
          tKeyPressure *k = pEvent->IsKeyPressure();
-         SEQ_KEY_PRESSURE(mididev, k->Channel, k->Key, k->Value);
+         SEQ_KEY_PRESSURE(mididev, k->GetChannel(), k->Key, k->Value);
          if (now) seqbuf_flush_last_event();
       }
       break;
@@ -1669,7 +1669,7 @@
     case StatChnPressure:
       {
          tChnPressure *k = pEvent->IsChnPressure();
-         SEQ_CHN_PRESSURE(mididev, k->Channel, k->Value);
+         SEQ_CHN_PRESSURE(mididev, k->GetChannel(), k->Value);
          if (now) seqbuf_flush_last_event();
       }
       break;
@@ -1677,7 +1677,7 @@
     case StatControl:
       {
         tControl *k = pEvent->IsControl();
-        SEQ_CONTROL(mididev, k->Channel, k->mControl, k->mValue);
+        SEQ_CONTROL(mididev, k->GetChannel(), k->mControl, k->mValue);
         if (now) seqbuf_flush_last_event();
       }
       break;
@@ -1685,7 +1685,7 @@
     case StatPitch:
       {
         tPitch *k = pEvent->IsPitch();
-        SEQ_BENDER(mididev, k->Channel, k->Value + 8192);
+        SEQ_BENDER(mididev, k->GetChannel(), k->Value + 8192);
         if (now) seqbuf_flush_last_event();
       }
       break;


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

SF.net SVN: jazzplusplus: [554] trunk/jazz/src/Player.cpp

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

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

Log Message:
-----------
Updated to the new key off interface.

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

Modified: trunk/jazz/src/Player.cpp
===================================================================
--- trunk/jazz/src/Player.cpp	2008-05-22 05:38:45 UTC (rev 553)
+++ trunk/jazz/src/Player.cpp	2008-05-22 05:42:06 UTC (rev 554)
@@ -1643,8 +1643,8 @@
         SEQ_STOP_NOTE(
           mididev,
           pKeyOff->GetChannel(),
-          pKeyOff->Key,
-          pKeyOff->OffVeloc);
+          pKeyOff->GetKey(),
+          pKeyOff->GetOffVelocity());
         if (now) seqbuf_flush_last_event();
       }
       break;


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

SF.net SVN: jazzplusplus: [563] trunk/jazz/src/Player.cpp

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

Revision: 563
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=563&view=rev
Author:   pstieber
Date:     2008-05-24 12:10:41 -0700 (Sat, 24 May 2008)

Log Message:
-----------
Updated to handle the latest tMetaEvent encapsulation changes on Linux.

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

Modified: trunk/jazz/src/Player.cpp
===================================================================
--- trunk/jazz/src/Player.cpp	2008-05-24 19:03:32 UTC (rev 562)
+++ trunk/jazz/src/Player.cpp	2008-05-24 19:10:41 UTC (rev 563)
@@ -1734,13 +1734,14 @@
          {
             // todo
             tSysEx *s = pEvent->IsSysEx();
-            struct sysex_info *sysex = (struct sysex_info *)new char [sizeof(struct sysex_info) + s->Length + 1];
+            struct sysex_info *sysex = (struct sysex_info *)new char [
+              sizeof(struct sysex_info) + s->GetDataLength() + 1];
 
             sysex->key = SYSEX_PATCH;
             sysex->device_no = mididev;
-            sysex->len = s->Length + 1;
+            sysex->len = s->GetDataLength() + 1;
             sysex->data[0] = 0xf0;
-            memcpy(sysex->data + 1, s->mpData, s->Length);
+            memcpy(sysex->data + 1, s->GetData(), s->GetDataLength());
             SEQ_WRPATCH(sysex, sizeof(*sysex) + sysex->len - 1);
 
             delete [] (char *)sysex;
@@ -1749,19 +1750,23 @@
          {
            // OSS wants small packets with max 6 bytes
            tSysEx *sx = pEvent->IsSysEx();
+           const unsigned char* pData = pEvent->IsSysEx()->GetData();
            const int N = 6;
            int i, j;
            char buf[N];
            buf[0] = (char)0xf0;
            i = 1;
-           for (j = 0; j < sx->Length; j++) {
-             if (i == N) {
+           for (j = 0; j < sx->GetDataLength(); j++)
+           {
+             if (i == N)
+             {
                SEQ_SYSEX(mididev, (unsigned char *)buf, N);
                i = 0;
              }
-             buf[i++] = sx->mpData[j];
+             buf[i++] = pData[j];
            }
-           if (i > 0) {
+           if (i > 0)
+           {
              SEQ_SYSEX(mididev, (unsigned char *)buf, i);
            }
          }


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