allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Merge windows+cc branch into cairocanvas branch. Not finished, need to now merge windows branch to get changes from there

Browse Source
This commit is contained in:
Paul Davis
2014-01-10 16:07:57 -05:00
parent d15fda6d75 897fbdc652
commit 3020b224fa
466 changed files with 10821 additions and 1674 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libs/surfaces/osc/interface.cc
View File

@@ -23,7 +23,7 @@
using namespace ARDOUR;
ControlProtocol*
static ControlProtocol*
new_osc_protocol (ControlProtocolDescriptor* /*descriptor*/, Session* s)
{
OSC* osc = new OSC (*s, Config->get_osc_port());
@@ -33,13 +33,13 @@ new_osc_protocol (ControlProtocolDescriptor* /*descriptor*/, Session* s)
return osc;
}
void
static void
delete_osc_protocol (ControlProtocolDescriptor* /*descriptor*/, ControlProtocol* cp)
{
delete cp;
}
bool
static bool
probe_osc_protocol (ControlProtocolDescriptor* /*descriptor*/)
{
return true; // we can always do OSC
@@ -57,10 +57,5 @@ static ControlProtocolDescriptor osc_descriptor = {
destroy : delete_osc_protocol
};
extern "C" {
ControlProtocolDescriptor*
protocol_descriptor () {
return &osc_descriptor;
}
}
extern "C" LIBCONTROLCP_API ControlProtocolDescriptor* protocol_descriptor () { return &osc_descriptor; }