start tweaks to make Shift sticky; remove Shift-press combobox from gui since we...

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

diff --git a/libs/surfaces/osc/interface.cc b/libs/surfaces/osc/interface.cc
index f20d89841809017b742cea2d68c8621dd39fa031..d26a31788e877144c9b84baf21d348a8d10b6325 100644 (file)
--- a/libs/surfaces/osc/interface.cc
+++ b/libs/surfaces/osc/interface.cc
@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2009 Paul Davis 
+ *   Copyright (C) 2009 Paul Davis
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -14,7 +14,7 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *  
+ *
  *   */
 
 #include "ardour/rc_configuration.h"
@@ -22,12 +22,13 @@
 #include "osc.h"
 
 using namespace ARDOUR;
+using namespace ArdourSurface;
 
 static ControlProtocol*
 new_osc_protocol (ControlProtocolDescriptor* /*descriptor*/, Session* s)
 {
        OSC* osc = new OSC (*s, Config->get_osc_port());
-       
+
        osc->set_active (true);
 
        return osc;
@@ -46,15 +47,15 @@ probe_osc_protocol (ControlProtocolDescriptor* /*descriptor*/)
 }
 
 static ControlProtocolDescriptor osc_descriptor = {
-       name : "Open Sound Control (OSC)",
-       id : "uri://ardour.org/surfaces/osc:0",
-       ptr : 0,
-       module : 0,
-       mandatory : 0,
-       supports_feedback : true,
-       probe : probe_osc_protocol,
-       initialize : new_osc_protocol,
-       destroy : delete_osc_protocol
+       /*name :              */   "Open Sound Control (OSC)",
+       /*id :                */   "uri://ardour.org/surfaces/osc:0",
+       /*ptr :               */   0,
+       /*module :            */   0,
+       /*mandatory :         */   0,
+       /*supports_feedback : */   true,
+       /*probe :             */   probe_osc_protocol,
+       /*initialize :        */   new_osc_protocol,
+       /*destroy :           */   delete_osc_protocol
 };
 
 extern "C" ARDOURSURFACE_API ControlProtocolDescriptor* protocol_descriptor () { return &osc_descriptor; }