diff options
| author | Robin Gareus <robin@gareus.org> | 2019-03-07 16:42:04 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2019-03-07 23:50:43 +0100 |
| commit | 64e1d691ecc54c33c34adb13a66f51790c9bc0d9 (patch) | |
| tree | 7ea3c0fb755f3dc33abf94b0f3baf0cb803752f1 /gtk2_ardour/meter_strip.cc | |
| parent | 3bc9281c312ec237b6365c023c5ef060f5788a6b (diff) | |
Prefer using RAII to suspend signals
Diffstat (limited to 'gtk2_ardour/meter_strip.cc')
| -rw-r--r-- | gtk2_ardour/meter_strip.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc index 094d5170db..e219a70d1c 100644 --- a/gtk2_ardour/meter_strip.cc +++ b/gtk2_ardour/meter_strip.cc @@ -21,6 +21,8 @@ #include <sigc++/bind.h> +#include "pbd/unwind.h" + #include "ardour/logmeter.h" #include "ardour/session.h" #include "ardour/route.h" @@ -840,7 +842,7 @@ MeterStrip::popup_level_meter_menu (GdkEventButton* ev) RadioMenuItem::Group group; - _suspend_menu_callbacks = true; + PBD::Unwinder<bool> uw (_suspend_menu_callbacks, true); add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterPeak), MeterPeak); add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterPeak0dB), MeterPeak0dB); add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterKrms), MeterKrms); @@ -865,7 +867,6 @@ MeterStrip::popup_level_meter_menu (GdkEventButton* ev) sigc::bind (SetMeterTypeMulti, _strip_type, _route->route_group(), cmt))); m->popup (ev->button, ev->time); - _suspend_menu_callbacks = false; } bool @@ -892,7 +893,7 @@ MeterStrip::popup_name_label_menu (GdkEventButton* ev) RadioMenuItem::Group group; - _suspend_menu_callbacks = true; + PBD::Unwinder<bool> uw (_suspend_menu_callbacks, true); add_label_height_item (items, group, _("Variable height"), 0); add_label_height_item (items, group, _("Short"), 1); add_label_height_item (items, group, _("Tall"), 2); @@ -900,7 +901,6 @@ MeterStrip::popup_name_label_menu (GdkEventButton* ev) add_label_height_item (items, group, _("Venti"), 4); m->popup (ev->button, ev->time); - _suspend_menu_callbacks = false; } void |