ardour/livetrax
13
0
Fork 0
Code

remove "auto-discover" buttom from Mackie GUI

Browse Source 
It could never do anything useful anyway, and deadlocked due to bad
lock usage
This commit is contained in:
Paul Davis 2024-08-16 13:12:19 -06:00
parent 95d1ae595a
commit 35cb60c2dc
4 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libs/surfaces/mackie/gui.cc
View File

@ -99,7 +99,6 @@ MackieControlProtocolGUI::MackieControlProtocolGUI (MackieControlProtocol& p)
, touch_sensitivity_scale (touch_sensitivity_adjustment)
, recalibrate_fader_button (_("Recalibrate Faders"))
, ipmidi_base_port_adjustment (_cp.ipmidi_base(), 0, 32767, 1, 1000)
, discover_button (_("Discover Mackie Devices"))
, _device_dependent_widget (0)
, _ignore_profile_changed (false)
, ignore_active_change (false)
@ -222,11 +221,6 @@ MackieControlProtocolGUI::MackieControlProtocolGUI (MackieControlProtocol& p)
table.attach (recalibrate_fader_button, 1, 2, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions (0));
row++;
table.attach (discover_button, 1, 2, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions (0));
discover_button.signal_clicked().connect (sigc::mem_fun (*this, &MackieControlProtocolGUI::discover_clicked));
row++;
vector<string> profiles;
for (std::map<std::string,DeviceProfile>::iterator i = DeviceProfile::device_profiles.begin(); i != DeviceProfile::device_profiles.end(); ++i) {
@ -776,13 +770,6 @@ MackieControlProtocolGUI::ipmidi_spinner_changed ()
_cp.set_ipmidi_base ((int16_t) lrintf (ipmidi_base_port_adjustment.get_value()));
}
void
MackieControlProtocolGUI::discover_clicked ()
{
/* this should help to get things started */
_cp.ping_devices ();
}
void
MackieControlProtocolGUI::recalibrate_faders ()
{

2
libs/surfaces/mackie/gui.h
View File

@ -122,12 +122,10 @@ class MackieControlProtocolGUI : public Gtk::Notebook
Gtk::HScale touch_sensitivity_scale;
Gtk::Button recalibrate_fader_button;
Gtk::Adjustment ipmidi_base_port_adjustment;
Gtk::Button discover_button;
Gtk::HBox hpacker;
Gtk::Image image;
void discover_clicked ();
void recalibrate_faders ();
void toggle_backlight ();
void touch_sensitive_change ();

15
libs/surfaces/mackie/mackie_control_protocol.cc
View File

@ -202,21 +202,6 @@ MackieControlProtocol::thread_init ()
set_thread_priority ();
}
void
MackieControlProtocol::ping_devices ()
{
/* should not be called if surfaces are not connected, but will not
* malfunction if it is.
*/
{
Glib::Threads::Mutex::Lock lm (surfaces_lock);
for (auto const& si : surfaces) {
si->connected ();
}
}
}
// go to the previous track.
void
MackieControlProtocol::prev_track()

2
libs/surfaces/mackie/mackie_control_protocol.h
View File

@ -234,8 +234,6 @@ class MackieControlProtocol
int16_t ipmidi_base() const { return _ipmidi_base; }
void set_ipmidi_base (int16_t);
void ping_devices ();
protected:
// shut down the surface
void close();