diff --git a/libs/ardour/midi_ui.cc b/libs/ardour/midi_ui.cc index 97c4f314a1..81a865934e 100644 --- a/libs/ardour/midi_ui.cc +++ b/libs/ardour/midi_ui.cc @@ -62,17 +62,6 @@ MidiControlUI::~MidiControlUI () _instance = 0; } -void* -MidiControlUI::request_factory (uint32_t num_requests) -{ - /* AbstractUI::request_buffer_factory() is a template method only - instantiated in this source module. To provide something visible for - use when registering the factory, we have this static method that is - template-free. - */ - return request_buffer_factory (num_requests); -} - void MidiControlUI::do_request (MidiUIRequest* req) { diff --git a/libs/ctrl-interface/control_protocol/control_protocol/control_protocol.h b/libs/ctrl-interface/control_protocol/control_protocol/control_protocol.h index 20bc49b309..02150feef1 100644 --- a/libs/ctrl-interface/control_protocol/control_protocol/control_protocol.h +++ b/libs/ctrl-interface/control_protocol/control_protocol/control_protocol.h @@ -180,15 +180,6 @@ public: bool (*probe) (ControlProtocolDescriptor*); ControlProtocol* (*initialize) (ControlProtocolDescriptor*, Session*); void (*destroy) (ControlProtocolDescriptor*, ControlProtocol*); - /* this is required if the control protocol connects to signals - * from libardour. they all do. It should allocate a - * type-specific request buffer for the calling thread, and - * store it in a thread-local location that will be used to - * find it when sending the event loop a message - * (e.g. call_slot()). It should also return the allocated - * buffer as a void*. - */ - void* (*request_buffer_factory) (uint32_t); }; } } diff --git a/libs/ctrl-interface/midi_surface/midi_surface.cc b/libs/ctrl-interface/midi_surface/midi_surface.cc index 05e24d7157..9fe93fb555 100644 --- a/libs/ctrl-interface/midi_surface/midi_surface.cc +++ b/libs/ctrl-interface/midi_surface/midi_surface.cc @@ -437,14 +437,3 @@ MIDISurface::bundles () return b; } -void* -MIDISurface::request_factory (uint32_t num_requests) -{ - /* AbstractUI::request_buffer_factory() is a template method only - instantiated in this source module. To provide something visible for - use in the interface/descriptor, we have this static method that is - template-free. - */ - return request_buffer_factory (num_requests); -} - diff --git a/libs/ctrl-interface/midi_surface/midi_surface/midi_surface.h b/libs/ctrl-interface/midi_surface/midi_surface/midi_surface.h index e257e69cae..727f63853b 100644 --- a/libs/ctrl-interface/midi_surface/midi_surface/midi_surface.h +++ b/libs/ctrl-interface/midi_surface/midi_surface/midi_surface.h @@ -48,8 +48,6 @@ class MIDISurface : public ARDOUR::ControlProtocol MIDISurface (ARDOUR::Session&, std::string const & name, std::string const & port_name_prefix, bool use_pad_filter); ~MIDISurface (); - static void* request_factory (uint32_t num_requests); - std::shared_ptr input_port(); std::shared_ptr output_port(); diff --git a/libs/pbd/pbd/abstract_ui.cc b/libs/pbd/pbd/abstract_ui.cc index aa6126615c..bff57b503d 100644 --- a/libs/pbd/pbd/abstract_ui.cc +++ b/libs/pbd/pbd/abstract_ui.cc @@ -513,9 +513,3 @@ AbstractUI::call_slot (InvalidationRecord* invalidation, const bo return true; } -template void* -AbstractUI::request_buffer_factory (uint32_t num_requests) -{ - RequestBuffer* mcr = new RequestBuffer (num_requests); // XXX leaks - return mcr; -} diff --git a/libs/pbd/pbd/abstract_ui.h b/libs/pbd/pbd/abstract_ui.h index c877c3a83c..cb1dc41ba8 100644 --- a/libs/pbd/pbd/abstract_ui.h +++ b/libs/pbd/pbd/abstract_ui.h @@ -65,8 +65,6 @@ public: Glib::Threads::RWLock request_buffer_map_lock; - static void* request_buffer_factory (uint32_t num_requests); - protected: struct RequestBuffer : public PBD::RingBufferNPT { bool dead; diff --git a/libs/surfaces/cc121/cc121.cc b/libs/surfaces/cc121/cc121.cc index 0615774b97..3d85cb8c37 100644 --- a/libs/surfaces/cc121/cc121.cc +++ b/libs/surfaces/cc121/cc121.cc @@ -202,17 +202,6 @@ CC121::~CC121 () BaseUI::quit (); } -void* -CC121::request_factory (uint32_t num_requests) -{ - /* AbstractUI::request_buffer_factory() is a template method only - instantiated in this source module. To provide something visible for - use in the interface/descriptor, we have this static method that is - template-free. - */ - return request_buffer_factory (num_requests); -} - void CC121::start_midi_handling () { diff --git a/libs/surfaces/cc121/cc121.h b/libs/surfaces/cc121/cc121.h index c7a5218ecf..50a783f6cd 100644 --- a/libs/surfaces/cc121/cc121.h +++ b/libs/surfaces/cc121/cc121.h @@ -87,7 +87,6 @@ class CC121 : public ARDOUR::ControlProtocol, public AbstractUI { there's no way to know if the device exists or not. */ static bool probe() { return true; } - static void* request_factory (uint32_t); XMLNode& get_state () const; int set_state (const XMLNode&, int version); diff --git a/libs/surfaces/cc121/cc121_interface.cc b/libs/surfaces/cc121/cc121_interface.cc index 6fcfd38699..d80b666d3c 100644 --- a/libs/surfaces/cc121/cc121_interface.cc +++ b/libs/surfaces/cc121/cc121_interface.cc @@ -56,12 +56,6 @@ probe_cc121_midi_protocol (ControlProtocolDescriptor* /*descriptor*/) return CC121::probe (); } -static void* -cc121_request_buffer_factory (uint32_t num_requests) -{ - return CC121::request_factory (num_requests); -} - static ControlProtocolDescriptor cc121_midi_descriptor = { /*name : */ "Steinberg CC121", /*id : */ "uri://ardour.org/surfaces/cc121:0", @@ -72,7 +66,6 @@ static ControlProtocolDescriptor cc121_midi_descriptor = { /*probe : */ probe_cc121_midi_protocol, /*initialize : */ new_cc121_midi_protocol, /*destroy : */ delete_cc121_midi_protocol, - /*request_buffer_factory */ cc121_request_buffer_factory }; extern "C" ARDOURSURFACE_API ControlProtocolDescriptor* protocol_descriptor () { return &cc121_midi_descriptor; } diff --git a/libs/surfaces/contourdesign/contourdesign.cc b/libs/surfaces/contourdesign/contourdesign.cc index 8a7c049e69..7809ada0cd 100644 --- a/libs/surfaces/contourdesign/contourdesign.cc +++ b/libs/surfaces/contourdesign/contourdesign.cc @@ -97,17 +97,6 @@ ContourDesignControlProtocol::probe () return rv; } -void* -ContourDesignControlProtocol::request_factory (uint32_t num_requests) -{ - /* AbstractUI::request_buffer_factory() is a template method only - * instantiated in this source module. To provide something visible for - * use in the interface/descriptor, we have this static method that is - * template-free. - */ - return request_buffer_factory (num_requests); -} - int ContourDesignControlProtocol::set_active (bool yn) { diff --git a/libs/surfaces/contourdesign/contourdesign.h b/libs/surfaces/contourdesign/contourdesign.h index dec728a059..784a0c440e 100644 --- a/libs/surfaces/contourdesign/contourdesign.h +++ b/libs/surfaces/contourdesign/contourdesign.h @@ -85,7 +85,6 @@ public: DeviceType device_type() const { return _device_type; } static bool probe (); - static void* request_factory (uint32_t); int set_active (bool yn); diff --git a/libs/surfaces/contourdesign/interface.cc b/libs/surfaces/contourdesign/interface.cc index 1fe21337e1..0734cdc9c6 100644 --- a/libs/surfaces/contourdesign/interface.cc +++ b/libs/surfaces/contourdesign/interface.cc @@ -49,12 +49,6 @@ probe_contourdesign_protocol (ControlProtocolDescriptor*) return ContourDesignControlProtocol::probe (); } -static void* -contourdesign_request_buffer_factory (uint32_t num_requests) -{ - return ContourDesignControlProtocol::request_factory (num_requests); -} - static ControlProtocolDescriptor contourdesign_descriptor = { /* name : */ "ContourDesign", /* id : */ "uri://ardour.org/surfaces/contourdesign:0", @@ -65,7 +59,6 @@ static ControlProtocolDescriptor contourdesign_descriptor = { /* probe : */ probe_contourdesign_protocol, /* initialize : */ new_contourdesign_protocol, /* destroy : */ delete_contourdesign_protocol, - /* request_buffer_factory : */ contourdesign_request_buffer_factory }; extern "C" ARDOURSURFACE_API ControlProtocolDescriptor* protocol_descriptor () { return &contourdesign_descriptor; } diff --git a/libs/surfaces/faderport/faderport_interface.cc b/libs/surfaces/faderport/faderport_interface.cc index afb3bafdcd..d537b7328a 100644 --- a/libs/surfaces/faderport/faderport_interface.cc +++ b/libs/surfaces/faderport/faderport_interface.cc @@ -56,13 +56,6 @@ probe_faderport_midi_protocol (ControlProtocolDescriptor* /*descriptor*/) return FaderPort::probe (); } -static void* -faderport_request_buffer_factory (uint32_t num_requests) -{ - return MIDISurface::request_factory (num_requests); -} - - static ControlProtocolDescriptor faderport_midi_descriptor = { /*name : */ "PreSonus FaderPort", /*id : */ "uri://ardour.org/surfaces/faderport:0", @@ -73,7 +66,6 @@ static ControlProtocolDescriptor faderport_midi_descriptor = { /*probe : */ probe_faderport_midi_protocol, /*initialize : */ new_faderport_midi_protocol, /*destroy : */ delete_faderport_midi_protocol, - /*request_buffer_factory */ faderport_request_buffer_factory }; extern "C" ARDOURSURFACE_API ControlProtocolDescriptor* protocol_descriptor () { return &faderport_midi_descriptor; } diff --git a/libs/surfaces/faderport8/faderport16_interface.cc b/libs/surfaces/faderport8/faderport16_interface.cc index bbf09219c7..57d34d140e 100644 --- a/libs/surfaces/faderport8/faderport16_interface.cc +++ b/libs/surfaces/faderport8/faderport16_interface.cc @@ -55,12 +55,6 @@ probe_faderport16_midi_protocol (ControlProtocolDescriptor* /*descriptor*/) return FaderPort8::probe (); } -static void* -faderport16_request_buffer_factory (uint32_t num_requests) -{ - return FaderPort8::request_factory (num_requests); -} - static ControlProtocolDescriptor faderport16_midi_descriptor = { /*name : */ "PreSonus FaderPort16", /*id : */ "uri://ardour.org/surfaces/faderport16:0", @@ -71,7 +65,6 @@ static ControlProtocolDescriptor faderport16_midi_descriptor = { /*probe : */ probe_faderport16_midi_protocol, /*initialize : */ new_faderport16_midi_protocol, /*destroy : */ delete_faderport16_midi_protocol, - /*request_buffer_factory */ faderport16_request_buffer_factory }; extern "C" ARDOURSURFACE_API diff --git a/libs/surfaces/faderport8/faderport2_interface.cc b/libs/surfaces/faderport8/faderport2_interface.cc index 938befc629..20fed9a566 100644 --- a/libs/surfaces/faderport8/faderport2_interface.cc +++ b/libs/surfaces/faderport8/faderport2_interface.cc @@ -55,12 +55,6 @@ probe_faderport2_midi_protocol (ControlProtocolDescriptor* /*descriptor*/) return FaderPort8::probe (); } -static void* -faderport2_request_buffer_factory (uint32_t num_requests) -{ - return FaderPort8::request_factory (num_requests); -} - static ControlProtocolDescriptor faderport2_midi_descriptor = { /*name : */ "PreSonus FaderPort2", /*id : */ "uri://ardour.org/surfaces/faderport2:0", @@ -71,7 +65,6 @@ static ControlProtocolDescriptor faderport2_midi_descriptor = { /*probe : */ probe_faderport2_midi_protocol, /*initialize : */ new_faderport2_midi_protocol, /*destroy : */ delete_faderport2_midi_protocol, - /*request_buffer_factory */ faderport2_request_buffer_factory }; extern "C" ARDOURSURFACE_API diff --git a/libs/surfaces/faderport8/faderport8.cc b/libs/surfaces/faderport8/faderport8.cc index ad760cac7b..9474a5349a 100644 --- a/libs/surfaces/faderport8/faderport8.cc +++ b/libs/surfaces/faderport8/faderport8.cc @@ -215,17 +215,6 @@ FaderPort8::~FaderPort8 () * Event Loop */ -void* -FaderPort8::request_factory (uint32_t num_requests) -{ - /* AbstractUI::request_buffer_factory() is a template method only - * instantiated in this source module. To provide something visible for - * use in the interface/descriptor, we have this static method that is - * template-free. - */ - return request_buffer_factory (num_requests); -} - void FaderPort8::do_request (FaderPort8Request* req) { diff --git a/libs/surfaces/faderport8/faderport8.h b/libs/surfaces/faderport8/faderport8.h index e39f8c1f78..b19c4c41bd 100644 --- a/libs/surfaces/faderport8/faderport8.h +++ b/libs/surfaces/faderport8/faderport8.h @@ -73,7 +73,6 @@ public: * there's no way to know if the device exists or not. */ static bool probe() { return true; } - static void* request_factory (uint32_t); XMLNode& get_state () const; int set_state (const XMLNode&, int version); diff --git a/libs/surfaces/faderport8/faderport8_interface.cc b/libs/surfaces/faderport8/faderport8_interface.cc index dd4032c52d..b09e2e1d7b 100644 --- a/libs/surfaces/faderport8/faderport8_interface.cc +++ b/libs/surfaces/faderport8/faderport8_interface.cc @@ -55,12 +55,6 @@ probe_faderport8_midi_protocol (ControlProtocolDescriptor* /*descriptor*/) return FaderPort8::probe (); } -static void* -faderport8_request_buffer_factory (uint32_t num_requests) -{ - return FaderPort8::request_factory (num_requests); -} - static ControlProtocolDescriptor faderport8_midi_descriptor = { /*name : */ "PreSonus FaderPort8", /*id : */ "uri://ardour.org/surfaces/faderport8:0", @@ -71,7 +65,6 @@ static ControlProtocolDescriptor faderport8_midi_descriptor = { /*probe : */ probe_faderport8_midi_protocol, /*initialize : */ new_faderport8_midi_protocol, /*destroy : */ delete_faderport8_midi_protocol, - /*request_buffer_factory */ faderport8_request_buffer_factory }; extern "C" ARDOURSURFACE_API diff --git a/libs/surfaces/generic_midi/interface.cc b/libs/surfaces/generic_midi/interface.cc index c6b97a4e51..cc8ba76ba5 100644 --- a/libs/surfaces/generic_midi/interface.cc +++ b/libs/surfaces/generic_midi/interface.cc @@ -66,10 +66,6 @@ static ControlProtocolDescriptor generic_midi_descriptor = { /*probe : */ probe_generic_midi_protocol, /*initialize : */ new_generic_midi_protocol, /*destroy : */ delete_generic_midi_protocol, - /*request_buffer_factory : */ 0 /* no buffer factory because this runs - * in the midiUI event loop (which has - * its own request buffer factory. - */ }; extern "C" ARDOURSURFACE_API ControlProtocolDescriptor* protocol_descriptor () { return &generic_midi_descriptor; } diff --git a/libs/surfaces/launch_control_xl/interface.cc b/libs/surfaces/launch_control_xl/interface.cc index a7e5b7dac6..8fcc074c4a 100644 --- a/libs/surfaces/launch_control_xl/interface.cc +++ b/libs/surfaces/launch_control_xl/interface.cc @@ -74,12 +74,6 @@ probe_launch_control_xl (ControlProtocolDescriptor*) return LaunchControlXL::probe(); } -static void* -lcxl_request_buffer_factory (uint32_t num_requests) -{ - return LaunchControlXL::request_factory (num_requests); -} - static ControlProtocolDescriptor launch_control_xl_descriptor = { /*name : */ "Novation Launch Control XL", /*id : */ "uri://ardour.org/surfaces/launch_control_xl:0", @@ -94,7 +88,6 @@ static ControlProtocolDescriptor launch_control_xl_descriptor = { /*probe : */ probe_launch_control_xl, /*initialize : */ new_launch_control_xl, /*destroy : */ delete_launch_control_xl, - /*request_buffer_factory */ lcxl_request_buffer_factory }; extern "C" ARDOURSURFACE_API ControlProtocolDescriptor* protocol_descriptor () { return &launch_control_xl_descriptor; } diff --git a/libs/surfaces/launch_control_xl/launch_control_xl.cc b/libs/surfaces/launch_control_xl/launch_control_xl.cc index 17e5983c16..ad3757367e 100644 --- a/libs/surfaces/launch_control_xl/launch_control_xl.cc +++ b/libs/surfaces/launch_control_xl/launch_control_xl.cc @@ -427,17 +427,6 @@ LaunchControlXL::probe () return true; } -void* -LaunchControlXL::request_factory (uint32_t num_requests) -{ - /* AbstractUI::request_buffer_factory() is a template method only - instantiated in this source module. To provide something visible for - use in the interface/descriptor, we have this static method that is - template-free. - */ - return request_buffer_factory (num_requests); -} - void LaunchControlXL::do_request (LaunchControlRequest * req) { diff --git a/libs/surfaces/launch_control_xl/launch_control_xl.h b/libs/surfaces/launch_control_xl/launch_control_xl.h index c35ede6557..2c400347d4 100644 --- a/libs/surfaces/launch_control_xl/launch_control_xl.h +++ b/libs/surfaces/launch_control_xl/launch_control_xl.h @@ -358,7 +358,6 @@ public: static bool probe(); - static void *request_factory(uint32_t); std::list > bundles(); diff --git a/libs/surfaces/mackie/interface.cc b/libs/surfaces/mackie/interface.cc index b39caec4cd..5a5ff0dfef 100644 --- a/libs/surfaces/mackie/interface.cc +++ b/libs/surfaces/mackie/interface.cc @@ -77,12 +77,6 @@ probe_mackie_protocol (ControlProtocolDescriptor*) return MackieControlProtocol::probe(); } -static void* -mackie_request_buffer_factory (uint32_t num_requests) -{ - return MackieControlProtocol::request_factory (num_requests); -} - // Field names commented out by JE - 06-01-2010 static ControlProtocolDescriptor mackie_descriptor = { /*name : */ "Mackie", @@ -98,7 +92,6 @@ static ControlProtocolDescriptor mackie_descriptor = { /*probe : */ probe_mackie_protocol, /*initialize : */ new_mackie_protocol, /*destroy : */ delete_mackie_protocol, - /*request_buffer_factory */ mackie_request_buffer_factory }; extern "C" ARDOURSURFACE_API ControlProtocolDescriptor* protocol_descriptor () { return &mackie_descriptor; } diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc index 41636b18e3..8ef8e19f8e 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.cc +++ b/libs/surfaces/mackie/mackie_control_protocol.cc @@ -2505,17 +2505,6 @@ MackieControlProtocol::global_index_locked (Strip& strip) return global; } -void* -MackieControlProtocol::request_factory (uint32_t num_requests) -{ - /* AbstractUI::request_buffer_factory() is a template method only - instantiated in this source module. To provide something visible for - use in the interface/descriptor, we have this static method that is - template-free. - */ - return request_buffer_factory (num_requests); -} - void MackieControlProtocol::set_automation_state (AutoState as) { diff --git a/libs/surfaces/mackie/mackie_control_protocol.h b/libs/surfaces/mackie/mackie_control_protocol.h index 4b254fc74b..a886ffccd1 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.h +++ b/libs/surfaces/mackie/mackie_control_protocol.h @@ -161,7 +161,6 @@ class MackieControlProtocol */ static bool probe(); - static void* request_factory (uint32_t); mutable Glib::Threads::Mutex surfaces_lock; typedef std::list > Surfaces; diff --git a/libs/surfaces/maschine2/interface.cc b/libs/surfaces/maschine2/interface.cc index 04c07c8591..a189f0d432 100644 --- a/libs/surfaces/maschine2/interface.cc +++ b/libs/surfaces/maschine2/interface.cc @@ -57,12 +57,6 @@ probe_maschine2 (ControlProtocolDescriptor*) return true; } -static void* -maschine2_request_buffer_factory (uint32_t num_requests) -{ - return Maschine2::request_factory (num_requests); -} - static ControlProtocolDescriptor maschine2_descriptor = { /*name : */ "NI Maschine2", /*id : */ "uri://ardour.org/surfaces/maschine2:0", @@ -73,7 +67,6 @@ static ControlProtocolDescriptor maschine2_descriptor = { /*probe : */ probe_maschine2, /*initialize : */ new_maschine2, /*destroy : */ delete_maschine2, - /*request_buffer_factory */ maschine2_request_buffer_factory }; extern "C" ARDOURSURFACE_API ControlProtocolDescriptor* protocol_descriptor () { return &maschine2_descriptor; } diff --git a/libs/surfaces/maschine2/maschine2.cc b/libs/surfaces/maschine2/maschine2.cc index 2a441b7ce3..b1b5771048 100644 --- a/libs/surfaces/maschine2/maschine2.cc +++ b/libs/surfaces/maschine2/maschine2.cc @@ -125,12 +125,6 @@ Maschine2::~Maschine2 () hid_exit (); } -void* -Maschine2::request_factory (uint32_t num_requests) -{ - return request_buffer_factory (num_requests); -} - void Maschine2::do_request (Maschine2Request* req) { diff --git a/libs/surfaces/maschine2/maschine2.h b/libs/surfaces/maschine2/maschine2.h index 6706fa0bd2..43222a6f90 100644 --- a/libs/surfaces/maschine2/maschine2.h +++ b/libs/surfaces/maschine2/maschine2.h @@ -64,7 +64,6 @@ class Maschine2: public ARDOUR::ControlProtocol, public AbstractUI::request_buffer_factory() is a template method only - instantiated in this source module. To provide something visible for - use in the interface/descriptor, we have this static method that is - template-free. - */ - return request_buffer_factory (num_requests); -} - void OSC::do_request (OSCUIRequest* req) { diff --git a/libs/surfaces/osc/osc.h b/libs/surfaces/osc/osc.h index 1068e2bb4b..3c760c97b2 100644 --- a/libs/surfaces/osc/osc.h +++ b/libs/surfaces/osc/osc.h @@ -108,8 +108,6 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI int start (); int stop (); - static void* request_factory (uint32_t); - enum OSCDebugMode { Off, Unhandled, diff --git a/libs/surfaces/push2/interface.cc b/libs/surfaces/push2/interface.cc index bcbedc7098..7db4d21e73 100644 --- a/libs/surfaces/push2/interface.cc +++ b/libs/surfaces/push2/interface.cc @@ -72,12 +72,6 @@ probe_push2 (ControlProtocolDescriptor*) return Push2::probe(); } -static void* -push2_request_buffer_factory (uint32_t num_requests) -{ - return MIDISurface::request_factory (num_requests); -} - static ControlProtocolDescriptor push2_descriptor = { /*name : */ "Ableton Push 2", /*id : */ "uri://ardour.org/surfaces/push2:0", @@ -92,7 +86,6 @@ static ControlProtocolDescriptor push2_descriptor = { /*probe : */ probe_push2, /*initialize : */ new_push2, /*destroy : */ delete_push2, - /*request_buffer_factory */ push2_request_buffer_factory }; extern "C" ARDOURSURFACE_API ControlProtocolDescriptor* protocol_descriptor () { return &push2_descriptor; } diff --git a/libs/surfaces/us2400/interface.cc b/libs/surfaces/us2400/interface.cc index 0dd78ee77d..9ded15ae19 100644 --- a/libs/surfaces/us2400/interface.cc +++ b/libs/surfaces/us2400/interface.cc @@ -74,12 +74,6 @@ probe_us2400_protocol (ControlProtocolDescriptor*) return US2400Protocol::probe(); } -static void* -us2400_request_buffer_factory (uint32_t num_requests) -{ - return US2400Protocol::request_factory (num_requests); -} - // Field names commented out by JE - 06-01-2010 static ControlProtocolDescriptor us2400_descriptor = { /*name : */ "Tascam US-2400", @@ -95,7 +89,6 @@ static ControlProtocolDescriptor us2400_descriptor = { /*probe : */ probe_us2400_protocol, /*initialize : */ new_us2400_protocol, /*destroy : */ delete_us2400_protocol, - /*request_buffer_factory */ us2400_request_buffer_factory }; extern "C" ARDOURSURFACE_API ControlProtocolDescriptor* protocol_descriptor () { return &us2400_descriptor; } diff --git a/libs/surfaces/us2400/us2400_control_protocol.cc b/libs/surfaces/us2400/us2400_control_protocol.cc index 395a1328ec..25ffc80d79 100644 --- a/libs/surfaces/us2400/us2400_control_protocol.cc +++ b/libs/surfaces/us2400/us2400_control_protocol.cc @@ -1962,17 +1962,6 @@ US2400Protocol::global_index_locked (Strip& strip) return global; } -void* -US2400Protocol::request_factory (uint32_t num_requests) -{ - /* AbstractUI::request_buffer_factory() is a template method only - instantiated in this source module. To provide something visible for - use in the interface/descriptor, we have this static method that is - template-free. - */ - return request_buffer_factory (num_requests); -} - void US2400Protocol::set_automation_state (AutoState as) { @@ -1995,4 +1984,4 @@ int US2400Protocol::get_sends_bank () { return _sends_bank; -} \ No newline at end of file +} diff --git a/libs/surfaces/us2400/us2400_control_protocol.h b/libs/surfaces/us2400/us2400_control_protocol.h index 744ed4490f..4af1dc918b 100644 --- a/libs/surfaces/us2400/us2400_control_protocol.h +++ b/libs/surfaces/us2400/us2400_control_protocol.h @@ -139,7 +139,6 @@ class US2400Protocol */ static bool probe(); - static void* request_factory (uint32_t); mutable Glib::Threads::Mutex surfaces_lock; typedef std::list > Surfaces; diff --git a/libs/surfaces/websockets/ardour_websockets.cc b/libs/surfaces/websockets/ardour_websockets.cc index adefb26174..9b8ec442ef 100644 --- a/libs/surfaces/websockets/ardour_websockets.cc +++ b/libs/surfaces/websockets/ardour_websockets.cc @@ -55,17 +55,6 @@ ArdourWebsockets::~ArdourWebsockets () stop (); } -void* -ArdourWebsockets::request_factory (uint32_t num_requests) -{ - /* AbstractUI::request_buffer_factory() is a template method only - instantiated in this source module. To provide something visible for - use in the interface/descriptor, we have this static method that is - template-free. - */ - return request_buffer_factory (num_requests); -} - int ArdourWebsockets::set_active (bool yn) { diff --git a/libs/surfaces/websockets/ardour_websockets.h b/libs/surfaces/websockets/ardour_websockets.h index 4d1fdc8a7d..f78375ce19 100644 --- a/libs/surfaces/websockets/ardour_websockets.h +++ b/libs/surfaces/websockets/ardour_websockets.h @@ -57,8 +57,6 @@ public: ArdourWebsockets (ARDOUR::Session&); virtual ~ArdourWebsockets (); - static void* request_factory (uint32_t); - int set_active (bool); ARDOUR::Session& ardour_session () diff --git a/libs/surfaces/websockets/interface.cc b/libs/surfaces/websockets/interface.cc index fc426ac56b..f39c60e47a 100644 --- a/libs/surfaces/websockets/interface.cc +++ b/libs/surfaces/websockets/interface.cc @@ -49,12 +49,6 @@ probe_ardour_websockets_protocol (ControlProtocolDescriptor* /*descriptor*/) return true; } -static void* -ardour_websockets_request_buffer_factory (uint32_t num_requests) -{ - return ArdourWebsockets::request_factory (num_requests); -} - static ControlProtocolDescriptor ardour_websockets_descriptor = { /*name : */ surface_name, /*id : */ surface_id, @@ -65,7 +59,6 @@ static ControlProtocolDescriptor ardour_websockets_descriptor = { /*probe : */ probe_ardour_websockets_protocol, /*initialize : */ new_ardour_websockets_protocol, /*destroy : */ delete_ardour_websockets_protocol, - /*request_buffer_factory */ ardour_websockets_request_buffer_factory }; extern "C" ARDOURSURFACE_API ControlProtocolDescriptor* diff --git a/libs/surfaces/wiimote/interface.cc b/libs/surfaces/wiimote/interface.cc index 2f84b0a0f9..245c6b5432 100644 --- a/libs/surfaces/wiimote/interface.cc +++ b/libs/surfaces/wiimote/interface.cc @@ -46,12 +46,6 @@ probe_wiimote_protocol (ControlProtocolDescriptor*) { return WiimoteControlProtocol::probe (); } -static void* -wiimote_request_buffer_factory (uint32_t num_requests) -{ - return WiimoteControlProtocol::request_factory (num_requests); -} - static ControlProtocolDescriptor wiimote_descriptor = { name : "Wiimote", @@ -63,7 +57,6 @@ static ControlProtocolDescriptor wiimote_descriptor = { probe : probe_wiimote_protocol, initialize : new_wiimote_protocol, destroy : delete_wiimote_protocol, - request_buffer_factory : wiimote_request_buffer_factory }; extern "C" ARDOURSURFACE_API ControlProtocolDescriptor* protocol_descriptor () { return &wiimote_descriptor; } diff --git a/libs/surfaces/wiimote/wiimote.cc b/libs/surfaces/wiimote/wiimote.cc index e95fb25e3c..0d7f5f8377 100644 --- a/libs/surfaces/wiimote/wiimote.cc +++ b/libs/surfaces/wiimote/wiimote.cc @@ -455,14 +455,3 @@ wiimote_control_protocol_mesg_callback (cwiid_wiimote_t *wiimote, int mesg_count DEBUG_TRACE (DEBUG::WiimoteControl, "WiimoteControlProtocol::mesg_callback done\n"); } - -void* -WiimoteControlProtocol::request_factory (uint32_t num_requests) -{ - /* AbstractUI::request_buffer_factory() is a template method only - instantiated in this source module. To provide something visible for - use in the interface/descriptor, we have this static method that is - template-free. - */ - return request_buffer_factory (num_requests); -} diff --git a/libs/surfaces/wiimote/wiimote.h b/libs/surfaces/wiimote/wiimote.h index 21d2d6cbc0..7e04d8e1f1 100644 --- a/libs/surfaces/wiimote/wiimote.h +++ b/libs/surfaces/wiimote/wiimote.h @@ -41,7 +41,6 @@ public: virtual ~WiimoteControlProtocol (); static bool probe (); - static void* request_factory (uint32_t); int set_active (bool yn);