X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fosc%2Finterface.cc;h=35b313945d9e5da08bfd81d2632be49f3b485a1f;hb=5ae72d574c27bfb4412ba8161918fb3c5d5745db;hp=f20d89841809017b742cea2d68c8621dd39fa031;hpb=848e75aaeaa04a81883ed30bcd04abd862f9d1fd;p=ardour.git diff --git a/libs/surfaces/osc/interface.cc b/libs/surfaces/osc/interface.cc index f20d898418..35b313945d 100644 --- 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; @@ -45,16 +46,23 @@ probe_osc_protocol (ControlProtocolDescriptor* /*descriptor*/) return true; // we can always do OSC } +static void* +osc_request_buffer_factory (uint32_t num_requests) +{ + return OSC::request_factory (num_requests); +} + 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, + /*request_buffer_factory */ osc_request_buffer_factory }; extern "C" ARDOURSURFACE_API ControlProtocolDescriptor* protocol_descriptor () { return &osc_descriptor; }