cue monitoring for MIDI

[ardour.git] / libs / ardour / midi_scene_changer.cc

diff --git a/libs/ardour/midi_scene_changer.cc b/libs/ardour/midi_scene_changer.cc
index f586206ba742d06289a61642d3321bc770e25284..ce2559180f9baa777bceb39c8f2fd0871b3b16b2 100644 (file)
--- a/libs/ardour/midi_scene_changer.cc
+++ b/libs/ardour/midi_scene_changer.cc
@@ -17,7 +17,7 @@
 
 */
 
-#include "evoral/MIDIEvent.hpp"
+#include "evoral/Event.hpp"
 #include "midi++/channel.h"
 #include "midi++/parser.h"
 #include "midi++/port.h"
@@ -30,7 +30,7 @@
 #include "ardour/midi_scene_changer.h"
 #include "ardour/session.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 
@@ -226,13 +226,16 @@ MIDISceneChanger::locate (framepos_t pos)
 }
 
 void
-MIDISceneChanger::set_input_port (MIDI::Port* mp)
+MIDISceneChanger::set_input_port (boost::shared_ptr<MidiPort> mp)
 {
-       input_port = mp;
-
        incoming_connections.drop_connections();
+       input_port.reset ();
+
+       boost::shared_ptr<AsyncMIDIPort> async = boost::dynamic_pointer_cast<AsyncMIDIPort> (mp);
+
+       if (async) {
 
-       if (input_port) {
+               input_port = mp;
 
                /* midi port is asynchronous. MIDI parsing will be carried out
                 * by the MIDI UI thread which will emit the relevant signals
@@ -240,8 +243,8 @@ MIDISceneChanger::set_input_port (MIDI::Port* mp)
                 */
 
                for (int channel = 0; channel < 16; ++channel) {
-                       input_port->parser()->channel_bank_change[channel].connect_same_thread (incoming_connections, boost::bind (&MIDISceneChanger::bank_change_input, this, _1, _2, channel));
-                       input_port->parser()->channel_program_change[channel].connect_same_thread (incoming_connections, boost::bind (&MIDISceneChanger::program_change_input, this, _1, _2, channel));
+                       async->parser()->channel_bank_change[channel].connect_same_thread (incoming_connections, boost::bind (&MIDISceneChanger::bank_change_input, this, _1, _2, channel));
+                       async->parser()->channel_program_change[channel].connect_same_thread (incoming_connections, boost::bind (&MIDISceneChanger::program_change_input, this, _1, _2, channel));
                }
        }
 }
@@ -286,7 +289,7 @@ MIDISceneChanger::program_change_input (MIDI::Parser& parser, MIDI::byte program
 
                int bank = -1;
                if (have_seen_bank_changes) {
-                       bank = input_port->channel (channel)->bank();
+                       bank = boost::dynamic_pointer_cast<AsyncMIDIPort>(input_port)->channel (channel)->bank();
                }
 
                jump_to (bank, program);
@@ -311,13 +314,13 @@ MIDISceneChanger::program_change_input (MIDI::Parser& parser, MIDI::byte program
                        return;
                }
 
-               loc = new Location (_session, time, time, new_name, Location::IsMark);
+               loc = new Location (_session, time, time, new_name, Location::IsMark, 0);
                new_mark = true;
        }
 
        int bank = -1;
        if (have_seen_bank_changes) {
-               bank = input_port->channel (channel)->bank();
+               bank = boost::dynamic_pointer_cast<AsyncMIDIPort>(input_port)->channel (channel)->bank();
        }
 
        MIDISceneChange* msc =new MIDISceneChange (channel, bank, program & 0x7f);