summaryrefslogtreecommitdiff
path: root/muse2/synti/libsynti/mess.cpp
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2011-10-08 13:47:24 +0000
committerFlorian Jung <flo@windfisch.org>2011-10-08 13:47:24 +0000
commita347445db32f51562aee5c6a786c312d1f612d2f (patch)
treeba3dc9a6e03eec2edf2c213b7f4d7e5e49903edc /muse2/synti/libsynti/mess.cpp
parent375d6a53630f364c6560eb40255a8cc4c0496b8c (diff)
parent5367067f7a36dce8a362dcc000d41ac581bffdfe (diff)
merged namespace changes. HOPEFULLY the last one.
Diffstat (limited to 'muse2/synti/libsynti/mess.cpp')
-rw-r--r--muse2/synti/libsynti/mess.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/muse2/synti/libsynti/mess.cpp b/muse2/synti/libsynti/mess.cpp
index 62a281e1..027a30c1 100644
--- a/muse2/synti/libsynti/mess.cpp
+++ b/muse2/synti/libsynti/mess.cpp
@@ -32,7 +32,7 @@ static const int FIFO_SIZE = 32;
struct MessP {
// Event Fifo synti -> Host:
- MidiPlayEvent fifo[FIFO_SIZE];
+ MusECore::MidiPlayEvent fifo[FIFO_SIZE];
volatile int fifoSize;
int fifoWindex;
int fifoRindex;
@@ -92,7 +92,7 @@ void Mess::getNativeGeometry(int* x, int* y, int* w, int* h) const
// send Event synti -> host
//---------------------------------------------------------
-void Mess::sendEvent(MidiPlayEvent ev)
+void Mess::sendEvent(MusECore::MidiPlayEvent ev)
{
if (d->fifoSize == FIFO_SIZE) {
printf("event synti->host fifo overflow\n");
@@ -108,9 +108,9 @@ void Mess::sendEvent(MidiPlayEvent ev)
// called from host
//---------------------------------------------------------
-MidiPlayEvent Mess::receiveEvent()
+MusECore::MidiPlayEvent Mess::receiveEvent()
{
- MidiPlayEvent ev = d->fifo[d->fifoRindex];
+ MusECore::MidiPlayEvent ev = d->fifo[d->fifoRindex];
d->fifoRindex = (d->fifoRindex + 1) % FIFO_SIZE;
--(d->fifoSize);
return ev;
@@ -134,19 +134,19 @@ int Mess::eventsPending() const
// return true if synti is busy
//---------------------------------------------------------
-bool Mess::processEvent(const MidiPlayEvent& ev)
+bool Mess::processEvent(const MusECore::MidiPlayEvent& ev)
{
switch(ev.type()) {
- case ME_NOTEON:
+ case MusECore::ME_NOTEON:
return playNote(ev.channel(), ev.dataA(), ev.dataB());
- case ME_NOTEOFF:
+ case MusECore::ME_NOTEOFF:
return playNote(ev.channel(), ev.dataA(), 0);
- case ME_SYSEX:
+ case MusECore::ME_SYSEX:
return sysex(ev.len(), ev.data());
- case ME_CONTROLLER:
+ case MusECore::ME_CONTROLLER:
return setController(ev.channel(), ev.dataA(), ev.dataB());
- case ME_PITCHBEND: // Tim.
- return setController(ev.channel(), CTRL_PITCH, ev.dataA());
+ case MusECore::ME_PITCHBEND: // Tim.
+ return setController(ev.channel(), MusECore::CTRL_PITCH, ev.dataA());
}
return false;
}