From: <pst...@us...> - 2008-05-21 15:47:42
|
Revision: 550 http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=550&view=rev Author: pstieber Date: 2008-05-21 08:47:39 -0700 (Wed, 21 May 2008) Log Message: ----------- Updated the ALSA driver for the latest event encapsulation changes. Modified Paths: -------------- trunk/jazz/src/AlsaPlayer.cpp Modified: trunk/jazz/src/AlsaPlayer.cpp =================================================================== --- trunk/jazz/src/AlsaPlayer.cpp 2008-05-21 01:47:00 UTC (rev 549) +++ trunk/jazz/src/AlsaPlayer.cpp 2008-05-21 15:47:39 UTC (rev 550) @@ -413,7 +413,7 @@ { tKeyOn* pKeyOn = pEvent->IsKeyOn(); set_event_header(&ev, pEvent->GetClock(), SND_SEQ_EVENT_NOTEON); - ev.data.note.channel = pKeyOn->Channel; + ev.data.note.channel = pKeyOn->GetChannel(); ev.data.note.note = pKeyOn->GetKey(); ev.data.note.velocity = pKeyOn->GetVelocity(); rc = write(&ev, now); @@ -424,7 +424,7 @@ { tKeyOff* pKeyOff = pEvent->IsKeyOff(); set_event_header(&ev, pEvent->GetClock(), SND_SEQ_EVENT_NOTEOFF); - ev.data.note.channel = pKeyOff->Channel; + ev.data.note.channel = pKeyOff->GetChannel(); ev.data.note.note = pKeyOff->Key; ev.data.note.velocity = pKeyOff->OffVeloc; rc = write(&ev, now); @@ -435,7 +435,7 @@ { tProgram *k = pEvent->IsProgram(); set_event_header(&ev, pEvent->GetClock(), SND_SEQ_EVENT_PGMCHANGE); - ev.data.control.channel = k->Channel; + ev.data.control.channel = k->GetChannel(); ev.data.control.value = k->Program; rc = write(&ev, now); } @@ -445,7 +445,7 @@ { tKeyPressure *k = pEvent->IsKeyPressure(); set_event_header(&ev, pEvent->GetClock(), SND_SEQ_EVENT_KEYPRESS); - ev.data.note.channel = k->Channel; + ev.data.note.channel = k->GetChannel(); ev.data.note.note = k->Key; ev.data.note.velocity = k->Value; rc = write(&ev, now); @@ -456,7 +456,7 @@ { tChnPressure *k = pEvent->IsChnPressure(); set_event_header(&ev, pEvent->GetClock(), SND_SEQ_EVENT_CHANPRESS); - ev.data.control.channel = k->Channel; + ev.data.control.channel = k->GetChannel(); ev.data.control.value = k->Value; rc = write(&ev, now); } @@ -466,7 +466,7 @@ { tControl *k = pEvent->IsControl(); set_event_header(&ev, pEvent->GetClock(), SND_SEQ_EVENT_CONTROLLER); - ev.data.control.channel = k->Channel; + ev.data.control.channel = k->GetChannel(); ev.data.control.param = k->mControl; ev.data.control.value = k->mValue; rc = write(&ev, now); @@ -477,7 +477,7 @@ { tPitch *k = pEvent->IsPitch(); set_event_header(&ev, pEvent->GetClock(), SND_SEQ_EVENT_PITCHBEND); - ev.data.control.channel = k->Channel; + ev.data.control.channel = k->GetChannel(); ev.data.control.value = k->Value; rc = write(&ev, now); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |