smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-15 19:16:40 +01:00
Code Issues Projects Releases Wiki Activity

Refactor Ctrl Surface API

Browse source 
* reserve "probe" to actually probe for devices
* use separate probe for libusb and MIDI port devices
* use "available" to check if surface can be used
* allow both methods to be NULL
* remove unused ControlProtocolDescriptor* argument

Most surface just return `true` for available.
This commit is contained in:
Robin Gareus 2023-05-01 03:32:00 +02:00
parent 7c02ab9937
commit 65346496f5
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
38 changed files with 203 additions and 321 deletions
Download patch file Download diff file Expand all files Collapse all files

30
libs/surfaces/launch_control_xl/interface.cc
View file

@ -32,7 +32,7 @@ using namespace std;
using namespace ArdourSurface;
static ControlProtocol*
new_launch_control_xl (ControlProtocolDescriptor*, Session* s)
new_launch_control_xl (Session* s)
{
LaunchControlXL * lcxl = 0;
@ -50,7 +50,7 @@ new_launch_control_xl (ControlProtocolDescriptor*, Session* s)
}
static void
delete_launch_control_xl (ControlProtocolDescriptor*, ControlProtocol* cp)
delete_launch_control_xl (ControlProtocol* cp)
{
try
{
@ -62,25 +62,15 @@ delete_launch_control_xl (ControlProtocolDescriptor*, ControlProtocol* cp)
}
}
/**
This is called on startup to check whether the lib should be loaded.
So anything that can be changed in the UI should not be used here to
prevent loading of the lib.
*/
static bool
probe_launch_control_xl (ControlProtocolDescriptor*)
{
return LaunchControlXL::probe();
}
static ControlProtocolDescriptor launch_control_xl_descriptor = {
/*name : */ "Novation Launch Control XL",
/*id : */ "uri://ardour.org/surfaces/launch_control_xl:0",
/*module : */ 0,
/*probe : */ probe_launch_control_xl,
/*initialize : */ new_launch_control_xl,
/*destroy : */ delete_launch_control_xl,
/* name */ "Novation Launch Control XL",
/* id */ "uri://ardour.org/surfaces/launch_control_xl:0",
/* module */ 0,
/* available */ 0,
/* probe_port */ 0,
/* match usb */ 0,
/* initialize */ new_launch_control_xl,
/* destroy */ delete_launch_control_xl,
};
extern "C" ARDOURSURFACE_API ControlProtocolDescriptor* protocol_descriptor () { return &launch_control_xl_descriptor; }

6
libs/surfaces/launch_control_xl/launch_control_xl.cc
View file

@ -421,12 +421,6 @@ LaunchControlXL::init_knobs ()
}
}
bool
LaunchControlXL::probe ()
{
return true;
}
void
LaunchControlXL::do_request (LaunchControlRequest * req)
{

3
libs/surfaces/launch_control_xl/launch_control_xl.h
View file

@ -356,9 +356,6 @@ public:
LaunchControlXL(ARDOUR::Session &);
~LaunchControlXL();
static bool probe();
std::list<std::shared_ptr<ARDOUR::Bundle> > bundles();
bool has_editor() const { return true; }