summaryrefslogtreecommitdiff
path: root/gtk2_ardour/transport_masters_dialog.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2018-10-07 12:57:56 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2018-10-07 12:57:56 -0400
commit8b1c8bb51137c13fb052b685b02b6e8130d6a668 (patch)
tree48a8319e340ac89604e5088c76365c3c249c3113 /gtk2_ardour/transport_masters_dialog.cc
parentad4dc4460d25fb5cef3bda2fd3f4fcaab0b5ff5f (diff)
use C++, dammit
Diffstat (limited to 'gtk2_ardour/transport_masters_dialog.cc')
-rw-r--r--gtk2_ardour/transport_masters_dialog.cc11
1 files changed, 4 insertions, 7 deletions
diff --git a/gtk2_ardour/transport_masters_dialog.cc b/gtk2_ardour/transport_masters_dialog.cc
index 67e9bba80b..33d0ce5ca4 100644
--- a/gtk2_ardour/transport_masters_dialog.cc
+++ b/gtk2_ardour/transport_masters_dialog.cc
@@ -213,7 +213,6 @@ TransportMastersWidget::rebuild ()
table.show_all ();
- // r->label_box.set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
r->label_box.signal_button_press_event().connect (sigc::mem_fun (*r, &TransportMastersWidget::Row::name_press));
r->port_combo.signal_changed().connect (sigc::mem_fun (*r, &TransportMastersWidget::Row::port_choice_changed));
r->use_button.signal_toggled().connect (sigc::mem_fun (*r, &TransportMastersWidget::Row::use_button_toggled));
@@ -267,13 +266,11 @@ TransportMastersWidget::Row::name_press (GdkEventButton* ev)
return false;
}
-gboolean
-TransportMastersWidget::Row::_idle_remove (gpointer arg)
+bool
+TransportMastersWidget::idle_remove (TransportMastersWidget::Row* row)
{
- TransportMastersWidget::Row* row = (TransportMastersWidget::Row*) arg;
TransportMasterManager::instance().remove (row->tm->name());
-
- return FALSE; /* do not call again */
+ return false;
}
void
@@ -282,7 +279,7 @@ TransportMastersWidget::Row::remove_clicked ()
/* have to do this via an idle callback, because it will destroy the
widget from which this callback was initiated.
*/
- g_idle_add_full (G_PRIORITY_HIGH_IDLE + 10, _idle_remove, this, NULL);
+ Glib::signal_idle().connect (sigc::bind (sigc::mem_fun (parent, &TransportMastersWidget::idle_remove), this));
}
void