diff options
28 files changed, 41 insertions, 38 deletions
diff --git a/muse/midiplugins/libmidiplugin/mempi.h b/muse/midiplugins/libmidiplugin/mempi.h index 3d8ef68e..122b5a17 100644 --- a/muse/midiplugins/libmidiplugin/mempi.h +++ b/muse/midiplugins/libmidiplugin/mempi.h @@ -18,7 +18,7 @@ #include <set> #include "evdata.h" #include "memory.h" -#include "mpevent.h" +#include "midievent.h" class MempiP; diff --git a/muse/midiplugins/libmidiplugin/mpevent.cpp b/muse/midiplugins/libmidiplugin/midievent.cpp index 872261e1..972bc8a2 100644 --- a/muse/midiplugins/libmidiplugin/mpevent.cpp +++ b/muse/midiplugins/libmidiplugin/midievent.cpp @@ -6,7 +6,7 @@ // (C) Copyright 2002-2004 Werner Schweer (ws@seh.de) //========================================================= -#include "mpevent.h" +#include "midievent.h" //--------------------------------------------------------- // MEvent diff --git a/muse/midiplugins/libmidiplugin/mpevent.h b/muse/midiplugins/libmidiplugin/midievent.h index b7bdee60..86a7e734 100644 --- a/muse/midiplugins/libmidiplugin/mpevent.h +++ b/muse/midiplugins/libmidiplugin/midievent.h @@ -6,8 +6,8 @@ // (C) Copyright 1999-2002 Werner Schweer (ws@seh.de) //========================================================= -#ifndef __MPEVENT_H__ -#define __MPEVENT_H__ +#ifndef __MIDIEVENT_H__ +#define __MIDIEVENT_H__ #include <set> #include "evdata.h" diff --git a/muse/midiplugins/metronom/metronom.cpp b/muse/midiplugins/metronom/metronom.cpp index 28fb00a1..7b845e91 100644 --- a/muse/midiplugins/metronom/metronom.cpp +++ b/muse/midiplugins/metronom/metronom.cpp @@ -11,7 +11,7 @@ #include "metronomgui.h" #include "metronom.h" #include "midi.h" -#include "mpevent.h" +#include "midievent.h" //--------------------------------------------------------- // Metronom @@ -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, MPEventList* /*il*/, MPEventList* ol) { if (from == to) { nextTick = 0; diff --git a/muse/midiplugins/transform/transform.cpp b/muse/midiplugins/transform/transform.cpp index 6c2b2968..2a4e7b4d 100644 --- a/muse/midiplugins/transform/transform.cpp +++ b/muse/midiplugins/transform/transform.cpp @@ -6,7 +6,7 @@ // (C) Copyright 2001-2005 Werner Schweer (ws@seh.de) //========================================================= -#include "mpevent.h" +#include "midievent.h" #include "transform.h" static int eventTypeTable[] = { diff --git a/muse/midiplugins/trigg/trigg.cpp b/muse/midiplugins/trigg/trigg.cpp index 612b9c6b..0d13daca 100644 --- a/muse/midiplugins/trigg/trigg.cpp +++ b/muse/midiplugins/trigg/trigg.cpp @@ -11,7 +11,7 @@ #include "trigggui.h" #include "trigg.h" #include "midi.h" -#include "mpevent.h" +#include "midievent.h" //--------------------------------------------------------- // Trigg diff --git a/muse/muse/CMakeLists.txt b/muse/muse/CMakeLists.txt index e01af72f..54b6146e 100644 --- a/muse/muse/CMakeLists.txt +++ b/muse/muse/CMakeLists.txt @@ -110,9 +110,9 @@ add_executable ( muse icons.cpp event.cpp eventlist.cpp - midievent.cpp + midieventbase.cpp waveevent.cpp - mpevent.cpp + midievent.cpp wave.cpp seqmsg.cpp help.cpp diff --git a/muse/muse/audio.cpp b/muse/muse/audio.cpp index e6e84ab6..ede753f1 100644 --- a/muse/muse/audio.cpp +++ b/muse/muse/audio.cpp @@ -462,7 +462,7 @@ void Audio::process(unsigned frames) MidiOutPortList* mol = song->midiOutPorts(); for (iMidiOutPort i = mol->begin(); i != mol->end(); ++i) - audioDriver->startMidiCycle(mol->jackPort(0)); + audioDriver->startMidiCycle((*i)->jackPort(0)); GroupList* gl = song->groups(); SynthIList* sl = song->syntis(); diff --git a/muse/muse/audio.h b/muse/muse/audio.h index afcd092b..985466dd 100644 --- a/muse/muse/audio.h +++ b/muse/muse/audio.h @@ -22,7 +22,7 @@ #define __AUDIO_H__ #include "thread.h" -#include "mpevent.h" +#include "midievent.h" #include "route.h" #include "al/pos.h" #include "event.h" diff --git a/muse/muse/driver/jack.cpp b/muse/muse/driver/jack.cpp index 57a5348f..56d78de5 100644 --- a/muse/muse/driver/jack.cpp +++ b/muse/muse/driver/jack.cpp @@ -798,19 +798,22 @@ bool initJackAudio() // putEvent //--------------------------------------------------------- -void JackAudio::putEvent(Port p, const MidiEvent& e) +void JackAudio::putEvent(Port port, const MidiEvent& e) { if (midiOutputTrace) { - printf("MidiOut<%s>: jackMidi: ", portName(p).toLatin1().data()); + printf("MidiOut<%s>: jackMidi: ", portName(port).toLatin1().data()); e.dump(); } + void* pb = jack_port_get_buffer((jack_port_t*)port, segmentSize); + int pos = 0; unsigned char* p = jack_midi_event_reserve(pb, pos, 3, segmentSize); if (p == 0) { fprintf(stderr, "JackMidi: buffer overflow, event lost\n"); return; } - p[0] = e.dataA(); - p[1] + p[0] = e.type() | e.channel(); + p[1] = e.dataA(); + p[2] = e.dataB(); } //--------------------------------------------------------- @@ -819,7 +822,7 @@ void JackAudio::putEvent(Port p, const MidiEvent& e) void JackAudio::startMidiCycle(Port port) { - void* port_buf = jack_port_get_buffer(port, segmentSize); + void* port_buf = jack_port_get_buffer((jack_port_t*)port, segmentSize); jack_midi_clear_buffer(port_buf, segmentSize); } diff --git a/muse/muse/driver/jackaudio.h b/muse/muse/driver/jackaudio.h index c4d0cdaa..c4611ac6 100644 --- a/muse/muse/driver/jackaudio.h +++ b/muse/muse/driver/jackaudio.h @@ -22,6 +22,7 @@ #define __JACKAUDIO_H__ #include <jack/jack.h> +#include <jack/midiport.h> #include "audiodev.h" //--------------------------------------------------------- @@ -79,7 +80,7 @@ class JackAudio : public AudioDriver { void graphChanged(); virtual bool equal(Port a, Port b) { return a == b; } virtual void putEvent(Port, const MidiEvent&); - virutal void startMidiCycle(Port); + virtual void startMidiCycle(Port); }; #endif diff --git a/muse/muse/mpevent.cpp b/muse/muse/midievent.cpp index 573302c0..573302c0 100644 --- a/muse/muse/mpevent.cpp +++ b/muse/muse/midievent.cpp diff --git a/muse/muse/midievent.h b/muse/muse/midievent.h index 3712a607..6bfdcb6d 100644 --- a/muse/muse/midievent.h +++ b/muse/muse/midievent.h @@ -18,8 +18,8 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. //============================================================================= -#ifndef __MPEVENT_H__ -#define __MPEVENT_H__ +#ifndef __MIDIEVENT_H__ +#define __MIDIEVENT_H__ #include <set> #include "evdata.h" diff --git a/muse/muse/midieventbase.h b/muse/muse/midieventbase.h index 93cb5529..5eee7fbe 100644 --- a/muse/muse/midieventbase.h +++ b/muse/muse/midieventbase.h @@ -18,8 +18,8 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. //============================================================================= -#ifndef __MIDI_EVENT_H__ -#define __MIDI_EVENT_H__ +#ifndef __MIDI_EVENT_BASE_H__ +#define __MIDI_EVENT_BASE_H__ #include "eventbase.h" diff --git a/muse/muse/midififo.h b/muse/muse/midififo.h index 5572f882..282e0e7d 100644 --- a/muse/muse/midififo.h +++ b/muse/muse/midififo.h @@ -21,7 +21,7 @@ #ifndef __MIDIFIFO_H__ #define __MIDIFIFO_H__ -#include "mpevent.h" +#include "midievent.h" #define MIDI_FIFO_SIZE 512 diff --git a/muse/muse/midifile.h b/muse/muse/midifile.h index d88b58ac..c17fb9f7 100644 --- a/muse/muse/midifile.h +++ b/muse/muse/midifile.h @@ -22,7 +22,7 @@ #define __MIDIFILE_H__ #include "globaldefs.h" -#include "mpevent.h" +#include "midievent.h" struct MPEventList; class MidiEvent; diff --git a/muse/muse/midirc.h b/muse/muse/midirc.h index a992f198..670fca63 100644 --- a/muse/muse/midirc.h +++ b/muse/muse/midirc.h @@ -22,7 +22,7 @@ #define __MIDIRC_H__ #include "event.h" -#include "mpevent.h" +#include "midievent.h" enum { RC_STOP, RC_PLAY, RC_RECORD, RC_GOTO_LEFT_MARK diff --git a/muse/muse/midiseq.h b/muse/muse/midiseq.h index 3cadc737..8f29a292 100644 --- a/muse/muse/midiseq.h +++ b/muse/muse/midiseq.h @@ -22,7 +22,7 @@ #define __MIDISEQ_H__ #include "thread.h" -#include "mpevent.h" +#include "midievent.h" #include "driver/timerdev.h" namespace AL { diff --git a/muse/muse/preferences.h b/muse/muse/preferences.h index 13aaf252..69cc49a2 100644 --- a/muse/muse/preferences.h +++ b/muse/muse/preferences.h @@ -22,7 +22,7 @@ #define __PREFERENCES_H__ #include "ui_preferences.h" -#include "mpevent.h" +#include "midievent.h" class MusE; class Arranger; diff --git a/muse/muse/track.h b/muse/muse/track.h index 278a2105..0dcc3410 100644 --- a/muse/muse/track.h +++ b/muse/muse/track.h @@ -25,7 +25,7 @@ #include "route.h" #include "ctrl.h" #include "globaldefs.h" -#include "mpevent.h" +#include "midievent.h" #include "midififo.h" namespace AL { diff --git a/muse/synti/fluidsynth/fluidsynti.h b/muse/synti/fluidsynth/fluidsynti.h index 41ca2dc4..f41d4322 100644 --- a/muse/synti/fluidsynth/fluidsynti.h +++ b/muse/synti/fluidsynth/fluidsynti.h @@ -11,13 +11,12 @@ #define __MUSE_FLUIDSYNTI_H__ #include <fluidsynth.h> -// #include <qstring.h> #include <pthread.h> #include <string> #include "fluidsynthgui.h" #include "libsynti/mess.h" #include "muse/debug.h" -#include "libsynti/mpevent.h" +#include "libsynti/midievent.h" #include "muse/midictrl.h" #define FS_DEBUG_DATA 0 //Turn on/off debug print of midi data sent to fluidsynth diff --git a/muse/synti/libsynti/CMakeLists.txt b/muse/synti/libsynti/CMakeLists.txt index 3cd62bed..70dc7dc3 100644 --- a/muse/synti/libsynti/CMakeLists.txt +++ b/muse/synti/libsynti/CMakeLists.txt @@ -18,7 +18,7 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #============================================================================= -add_library(synti mess.cpp gui.cpp mono.cpp poly.cpp mpevent.cpp) +add_library(synti mess.cpp gui.cpp mono.cpp poly.cpp midievent.cpp) # # -fPIC is necessary for 64 bit systems diff --git a/muse/synti/libsynti/gui.h b/muse/synti/libsynti/gui.h index 24d7fe52..27bebe3f 100644 --- a/muse/synti/libsynti/gui.h +++ b/muse/synti/libsynti/gui.h @@ -10,7 +10,7 @@ #ifndef __SYNTH_GUI_H__ #define __SYNTH_GUI_H__ -#include "mpevent.h" +#include "midievent.h" const int EVENT_FIFO_SIZE = 256; class QWidget; diff --git a/muse/synti/libsynti/mess.h b/muse/synti/libsynti/mess.h index 8187a3f3..33a43af5 100644 --- a/muse/synti/libsynti/mess.h +++ b/muse/synti/libsynti/mess.h @@ -11,7 +11,7 @@ #define MESS_MAJOR_VERSION 2 #define MESS_MINOR_VERSION 1 -#include "mpevent.h" +#include "midievent.h" class QWidget; class MessP; diff --git a/muse/synti/libsynti/mpevent.cpp b/muse/synti/libsynti/midievent.cpp index c1d44c91..7c1e14fd 100644 --- a/muse/synti/libsynti/mpevent.cpp +++ b/muse/synti/libsynti/midievent.cpp @@ -6,7 +6,7 @@ // (C) Copyright 2002-2004 Werner Schweer (ws@seh.de) //========================================================= -#include "mpevent.h" +#include "midievent.h" //--------------------------------------------------------- // MidiEvent diff --git a/muse/synti/libsynti/mpevent.h b/muse/synti/libsynti/midievent.h index 67af3a88..a435d257 100644 --- a/muse/synti/libsynti/mpevent.h +++ b/muse/synti/libsynti/midievent.h @@ -6,8 +6,8 @@ // (C) Copyright 1999-2002 Werner Schweer (ws@seh.de) //========================================================= -#ifndef __MPEVENT_H__ -#define __MPEVENT_H__ +#ifndef __MIDIEVENT_H__ +#define __MIDIEVENT_H__ #include "evdata.h" diff --git a/muse/synti/organ/organ.cpp b/muse/synti/organ/organ.cpp index f2196493..0bdcc6a4 100644 --- a/muse/synti/organ/organ.cpp +++ b/muse/synti/organ/organ.cpp @@ -11,7 +11,7 @@ //========================================================= #include "muse/midi.h" -#include "libsynti/mpevent.h" +#include "libsynti/midievent.h" #include "organ.h" #include "organgui.h" diff --git a/muse/synti/organ/organgui.h b/muse/synti/organ/organgui.h index f58bb4aa..f8e1b5b7 100644 --- a/muse/synti/organ/organgui.h +++ b/muse/synti/organ/organgui.h @@ -12,7 +12,7 @@ #include "ui_organgui.h" #include "organ.h" #include "libsynti/gui.h" -#include "libsynti/mpevent.h" +#include "libsynti/midievent.h" class QSignalMapper; |