summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Schweer <ws.seh.de>2006-11-04 12:01:11 +0000
committerWerner Schweer <ws.seh.de>2006-11-04 12:01:11 +0000
commit6adc7e70da1fbbe98cc9492d36556b9d0f0a1b76 (patch)
treeb2554fe0b66a7bf685de692348cb371d5e761c7f
parentb6c114cd8626e0cfd5256154d8d41bf5ae87098f (diff)
midiplugin updates
-rw-r--r--muse/midiplugins/dump/dump.cpp4
-rw-r--r--muse/midiplugins/dump/dump.h2
-rw-r--r--muse/midiplugins/filter/filter.cpp4
-rw-r--r--muse/midiplugins/filter/filter.h2
-rw-r--r--muse/midiplugins/metronom/metronom.cpp2
-rw-r--r--muse/midiplugins/metronom/metronom.h2
-rw-r--r--muse/midiplugins/transform/transform.cpp4
-rw-r--r--muse/midiplugins/transform/transform.h2
-rw-r--r--muse/midiplugins/trigg/trigg.cpp4
-rw-r--r--muse/midiplugins/trigg/trigg.h2
10 files changed, 14 insertions, 14 deletions
diff --git a/muse/midiplugins/dump/dump.cpp b/muse/midiplugins/dump/dump.cpp
index 8c27e114..e346a642 100644
--- a/muse/midiplugins/dump/dump.cpp
+++ b/muse/midiplugins/dump/dump.cpp
@@ -15,9 +15,9 @@
// process
//---------------------------------------------------------
-void Dump::process(unsigned, unsigned, MPEventList* il, MPEventList* ol)
+void Dump::process(unsigned, unsigned, MidiEventList* il, MidiEventList* ol)
{
- for (iMPEvent i = il->begin(); i != il->end(); ++i) {
+ for (iMidiEvent i = il->begin(); i != il->end(); ++i) {
printf("Event %6d ch:%2d type:%2d 0x%02x 0x%02x\n", i->time(), i->channel(),
i->type(), i->dataA(), i->dataB());
ol->insert(*i);
diff --git a/muse/midiplugins/dump/dump.h b/muse/midiplugins/dump/dump.h
index 3a739c1f..2194e30f 100644
--- a/muse/midiplugins/dump/dump.h
+++ b/muse/midiplugins/dump/dump.h
@@ -18,7 +18,7 @@
//---------------------------------------------------------
class Dump : public Mempi {
- virtual void process(unsigned, unsigned, MPEventList*, MPEventList*);
+ virtual void process(unsigned, unsigned, MidiEventList*, MidiEventList*);
public:
Dump(const char* name, const MempiHost* h) :Mempi(name, h) {}
diff --git a/muse/midiplugins/filter/filter.cpp b/muse/midiplugins/filter/filter.cpp
index 696d7c61..ac99449e 100644
--- a/muse/midiplugins/filter/filter.cpp
+++ b/muse/midiplugins/filter/filter.cpp
@@ -75,9 +75,9 @@ void Filter::setGeometry(int x, int y, int w, int h)
// process
//---------------------------------------------------------
-void Filter::process(unsigned, unsigned, MPEventList* il, MPEventList* ol)
+void Filter::process(unsigned, unsigned, MidiEventList* il, MidiEventList* ol)
{
- for (iMPEvent i = il->begin(); i != il->end(); ++i) {
+ for (iMidiEvent i = il->begin(); i != il->end(); ++i) {
if (!filterEvent(*i))
ol->insert(*i);
}
diff --git a/muse/midiplugins/filter/filter.h b/muse/midiplugins/filter/filter.h
index 423eb225..c8a357b4 100644
--- a/muse/midiplugins/filter/filter.h
+++ b/muse/midiplugins/filter/filter.h
@@ -25,7 +25,7 @@ class Filter : public Mempi {
FilterGui* gui;
bool filterEvent(const MidiEvent& event);
- virtual void process(unsigned, unsigned, MPEventList*, MPEventList*);
+ virtual void process(unsigned, unsigned, MidiEventList*, MidiEventList*);
public:
Filter(const char* name, const MempiHost*);
diff --git a/muse/midiplugins/metronom/metronom.cpp b/muse/midiplugins/metronom/metronom.cpp
index 7b845e91..ece1e466 100644
--- a/muse/midiplugins/metronom/metronom.cpp
+++ b/muse/midiplugins/metronom/metronom.cpp
@@ -81,7 +81,7 @@ void Metronom::setGeometry(int x, int y, int w, int h)
// process
//---------------------------------------------------------
-void Metronom::process(unsigned from, unsigned to, MPEventList* /*il*/, MPEventList* ol)
+void Metronom::process(unsigned from, unsigned to, MidiEventList* /*il*/, MidiEventList* ol)
{
if (from == to) {
nextTick = 0;
diff --git a/muse/midiplugins/metronom/metronom.h b/muse/midiplugins/metronom/metronom.h
index 89ffb69b..3d570613 100644
--- a/muse/midiplugins/metronom/metronom.h
+++ b/muse/midiplugins/metronom/metronom.h
@@ -32,7 +32,7 @@ class Metronom : public Mempi {
unsigned int nextTick;
unsigned int lastTo;
- virtual void process(unsigned, unsigned, MPEventList*, MPEventList*);
+ virtual void process(unsigned, unsigned, MidiEventList*, MidiEventList*);
public:
Metronom(const char* name, const MempiHost*);
diff --git a/muse/midiplugins/transform/transform.cpp b/muse/midiplugins/transform/transform.cpp
index 2a4e7b4d..1376d2fc 100644
--- a/muse/midiplugins/transform/transform.cpp
+++ b/muse/midiplugins/transform/transform.cpp
@@ -134,9 +134,9 @@ static bool filterValOp(ValOp op, int val, int val1, int val2)
// 2 - event changed
//---------------------------------------------------------
-void Transform::process(unsigned, unsigned, MPEventList* il, MPEventList* ol)
+void Transform::process(unsigned, unsigned, MidiEventList* il, MidiEventList* ol)
{
- for (iMPEvent i = il->begin(); i != il->end(); ++i) {
+ for (iMidiEvent i = il->begin(); i != il->end(); ++i) {
MidiEvent event(*i);
if (filterEvent(event) == 1)
continue;
diff --git a/muse/midiplugins/transform/transform.h b/muse/midiplugins/transform/transform.h
index bc91c9c0..6f68698d 100644
--- a/muse/midiplugins/transform/transform.h
+++ b/muse/midiplugins/transform/transform.h
@@ -109,7 +109,7 @@ class Transform : public Mempi {
} data;
TransformDialog* gui;
- virtual void process(unsigned, unsigned, MPEventList*, MPEventList*);
+ virtual void process(unsigned, unsigned, MidiEventList*, MidiEventList*);
Transform(const char* name, const MempiHost*);
virtual bool init();
diff --git a/muse/midiplugins/trigg/trigg.cpp b/muse/midiplugins/trigg/trigg.cpp
index 0d13daca..fb3703cb 100644
--- a/muse/midiplugins/trigg/trigg.cpp
+++ b/muse/midiplugins/trigg/trigg.cpp
@@ -75,10 +75,10 @@ void Trigg::setGeometry(int x, int y, int w, int h)
// process
//---------------------------------------------------------
-void Trigg::process(unsigned , unsigned , MPEventList* il, MPEventList* ol)
+void Trigg::process(unsigned , unsigned , MidiEventList* il, MidiEventList* ol)
{
- for (iMPEvent i = il->begin(); i != il->end(); ++i) {
+ for (iMidiEvent i = il->begin(); i != il->end(); ++i) {
MidiEvent temp=*i;
if (temp.isNote() || temp.isNoteOff())
{
diff --git a/muse/midiplugins/trigg/trigg.h b/muse/midiplugins/trigg/trigg.h
index b7635287..c29a06a0 100644
--- a/muse/midiplugins/trigg/trigg.h
+++ b/muse/midiplugins/trigg/trigg.h
@@ -25,7 +25,7 @@ class Trigg : public Mempi {
TriggGui* gui;
- virtual void process(unsigned, unsigned, MPEventList*, MPEventList*);
+ virtual void process(unsigned, unsigned, MidiEventList*, MidiEventList*);
public:
Trigg(const char* name, const MempiHost*);