Merging from trunk

[ardour.git] / libs / surfaces / tranzport / interface.cc

diff --git a/libs/surfaces/tranzport/interface.cc b/libs/surfaces/tranzport/interface.cc
index f2160c3144a715449354cb6c7335cfcb53fab75a..29a0fde043d62f5fd7e922f962186f16d878297f 100644 (file)
--- a/libs/surfaces/tranzport/interface.cc
+++ b/libs/surfaces/tranzport/interface.cc
@@ -1,5 +1,4 @@
-#include <ardour/control_protocol.h>
-
+#include <control_protocol/control_protocol.h>
 #include "tranzport_control_protocol.h"
 
 using namespace ARDOUR;
@@ -9,7 +8,7 @@ new_tranzport_protocol (ControlProtocolDescriptor* descriptor, Session* s)
 {
        TranzportControlProtocol* tcp = new TranzportControlProtocol (*s);
 
-       if (tcp->init ()) {
+       if (tcp->set_active (true)) {
                delete tcp;
                return 0;
        }
@@ -24,14 +23,21 @@ delete_tranzport_protocol (ControlProtocolDescriptor* descriptor, ControlProtoco
        delete cp;
 }
 
+bool
+probe_tranzport_protocol (ControlProtocolDescriptor* descriptor)
+{
+       return TranzportControlProtocol::probe();
+}
+
 static ControlProtocolDescriptor tranzport_descriptor = {
        name : "Tranzport",
        id : "uri://ardour.org/surfaces/tranzport:0",
        ptr : 0,
        module : 0,
+       mandatory : 0,
+       probe : probe_tranzport_protocol,
        initialize : new_tranzport_protocol,
        destroy : delete_tranzport_protocol
-
 };