merge with master and fix 4 conflicts by hand

[ardour.git] / libs / surfaces / generic_midi / midicontrollable.cc

diff --git a/libs/surfaces/generic_midi/midicontrollable.cc b/libs/surfaces/generic_midi/midicontrollable.cc
index a12b20b1a87b6cf994a1905335f09da64c1de6d6..1d96a073b0f971837ab63133326155ebf11239af 100644 (file)
--- a/libs/surfaces/generic_midi/midicontrollable.cc
+++ b/libs/surfaces/generic_midi/midicontrollable.cc
@@ -27,6 +27,8 @@
 #include "pbd/xml++.h"
 #include "pbd/stacktrace.h"
 
+#include "midi++/types.h" // Added by JE - 06-01-2009. All instances of 'byte' changed to 'MIDI::byte' (for clarification)
+#include "midi++/port.h"
 #include "midi++/channel.h"
 
 #include "ardour/async_midi_port.h"
@@ -55,7 +57,7 @@ MIDIControllable::MIDIControllable (GenericMidiControlProtocol* s, MIDI::Parser&
        last_controllable_value = 0.0f;
        control_type = none;
        _control_description = "MIDI Control: none";
-       control_additional = (byte) -1;
+       control_additional = (MIDI::byte) -1;
        feedback = true; // for now
 }
 
@@ -73,7 +75,7 @@ MIDIControllable::MIDIControllable (GenericMidiControlProtocol* s, MIDI::Parser&
        last_controllable_value = 0.0f;
        control_type = none;
        _control_description = "MIDI Control: none";
-       control_additional = (byte) -1;
+       control_additional = (MIDI::byte) -1;
        feedback = true; // for now
 }
 
@@ -108,7 +110,7 @@ MIDIControllable::drop_external_control ()
 {
        midi_forget ();
        control_type = none;
-       control_additional = (byte) -1;
+       control_additional = (MIDI::byte) -1;
 }
 
 void
@@ -330,7 +332,7 @@ MIDIControllable::midi_sense_controller (Parser &, EventTwoBytes *msg)
 }
 
 void
-MIDIControllable::midi_sense_program_change (Parser &, byte msg)
+MIDIControllable::midi_sense_program_change (Parser &, MIDI::byte msg)
 {
        if (!controllable) { 
                if (lookup_controllable ()) {
@@ -366,7 +368,7 @@ MIDIControllable::midi_sense_pitchbend (Parser &, pitchbend_t pb)
 }
 
 void
-MIDIControllable::midi_receiver (Parser &, byte *msg, size_t /*len*/)
+MIDIControllable::midi_receiver (Parser &, MIDI::byte *msg, size_t /*len*/)
 {
        /* we only respond to channel messages */