Merged with trunk (painfully)

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

diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
index 4d64c6ce2345cf9888a2bf58fcfdd4b923c8eeea..5eac060fb7da31734d4b3ad344e05a198ee2497e 100644 (file)
--- a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
+++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
@@ -1,3 +1,5 @@
+#include <midi++/port.h>
+
 #include <ardour/route.h>
 #include <ardour/session.h>
 
@@ -10,13 +12,28 @@ using namespace ARDOUR;
 GenericMidiControlProtocol::GenericMidiControlProtocol (Session& s)
        : ControlProtocol  (s, _("GenericMIDI"))
 {
-       _port = 0;
+       _port = s.midi_port();
+       s.MIDI_PortChanged.connect (mem_fun (*this, &GenericMidiControlProtocol::port_change));
+       
 }
 
 GenericMidiControlProtocol::~GenericMidiControlProtocol ()
 {
 }
 
+int
+GenericMidiControlProtocol::set_active (bool yn)
+{
+       /* start delivery/outbound thread */
+       return 0;
+}
+
+void
+GenericMidiControlProtocol::port_change ()
+{
+       _port = session->midi_port ();
+}
+
 void
 GenericMidiControlProtocol::set_port (MIDI::Port* p)
 {
@@ -29,27 +46,20 @@ GenericMidiControlProtocol::send_route_feedback (list<Route*>& routes)
        if (_port != 0) {
 
                const int32_t bufsize = 16 * 1024;
+               MIDI::byte buf[bufsize];
                int32_t bsize = bufsize;
-               MIDI::byte* buf = new MIDI::byte[bufsize];
                MIDI::byte* end = buf;
                
                for (list<Route*>::iterator r = routes.begin(); r != routes.end(); ++r) {
-               end = (*r)->write_midi_feedback (end, bsize);
+                       end = (*r)->write_midi_feedback (end, bsize);
                }
                
                if (end == buf) {
-                       delete [] buf;
                        return;
                } 
                
-               session.deliver_midi (_port, buf, (int32_t) (end - buf));
+               _port->write (buf, 0, (int32_t) (end - buf));
                //cerr << "MIDI feedback: wrote " << (int32_t) (end - buf) << " to midi port\n";
        }
 }
 
-bool
-GenericMidiControlProtocol::active() const
-{
-       return _port && send();
-}
-