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 61a8b7974e194655be4d84d5c1f709b9a678b1f1..5eac060fb7da31734d4b3ad344e05a198ee2497e 100644 (file)
--- a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
+++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
@@ -22,16 +22,16 @@ GenericMidiControlProtocol::~GenericMidiControlProtocol ()
 }
 
 int
-GenericMidiControlProtocol::init ()
+GenericMidiControlProtocol::set_active (bool yn)
 {
        /* start delivery/outbound thread */
-       return init_thread ();
+       return 0;
 }
 
 void
 GenericMidiControlProtocol::port_change ()
 {
-       _port = session.midi_port ();
+       _port = session->midi_port ();
 }
 
 void
@@ -58,14 +58,8 @@ GenericMidiControlProtocol::send_route_feedback (list<Route*>& routes)
                        return;
                } 
                
-               _port->write (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();
-}
-