Allow to hide engine dialog w/o unloading session.

[ardour.git] / gtk2_ardour / mixer_strip.cc

diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 2b1d01d913cb6bf972ab72e2e517ab6f2be73964..2a9012a42fce4c9d2a808c966c30272b22a67884 100644 (file)
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -57,6 +57,7 @@
 #include "ardour/vca_manager.h"
 
 #include "ardour_window.h"
+#include "enums_convert.h"
 #include "mixer_strip.h"
 #include "mixer_ui.h"
 #include "keyboard.h"
@@ -741,9 +742,9 @@ MixerStrip::set_stuff_from_route ()
 {
        /* if width is not set, it will be set by the MixerUI or editor */
 
-       string str = gui_property ("strip-width");
-       if (!str.empty()) {
-               set_width_enum (Width (string_2_enum (str, _width)), this);
+       Width width;
+       if (get_gui_property ("strip-width", width)) {
+               set_width_enum (width, this);
        }
 }
 
@@ -762,7 +763,7 @@ MixerStrip::set_width_enum (Width w, void* owner)
        _width = w;
 
        if (_width_owner == this) {
-               set_gui_property ("strip-width", enum_2_string (_width));
+               set_gui_property ("strip-width", _width);
        }
 
        set_button_names ();
@@ -838,12 +839,7 @@ void
 MixerStrip::set_packed (bool yn)
 {
        _packed = yn;
-
-       if (_packed) {
-               set_gui_property ("visible", true);
-       } else {
-               set_gui_property ("visible", false);
-       }
+       set_gui_property ("visible", _packed);
 }
 
 
@@ -1704,7 +1700,8 @@ MixerStrip::build_route_ops_menu ()
 
        if (!Profile->get_mixbus()) {
                items.push_back (MenuElem (_("Rename..."), sigc::mem_fun(*this, &RouteUI::route_rename)));
-               rename_menu_item = &items.back();
+               /* do not allow rename if the track is record-enabled */
+               items.back().set_sensitive (!is_track() || !track()->rec_enable_control()->get_value());
        }
 
        items.push_back (SeparatorElem());
@@ -1773,8 +1770,6 @@ MixerStrip::name_button_button_press (GdkEventButton* ev)
        if (ev->button == 1 || ev->button == 3) {
                list_route_operations ();
 
-               /* do not allow rename if the track is record-enabled */
-               rename_menu_item->set_sensitive (!is_track() || !track()->rec_enable_control()->get_value());
                if (ev->button == 1) {
                        Gtkmm2ext::anchored_menu_popup(route_ops_menu, &name_button, "",
                                                       1, ev->time);
@@ -1794,8 +1789,6 @@ MixerStrip::number_button_button_press (GdkEventButton* ev)
        if (  ev->button == 3 ) {
                list_route_operations ();
 
-               /* do not allow rename if the track is record-enabled */
-               rename_menu_item->set_sensitive (!is_track() || !track()->rec_enable_control()->get_value());
                route_ops_menu->popup (1, ev->time);
 
                return true;
@@ -1857,7 +1850,7 @@ MixerStrip::name_changed ()
                if (track_number == 0) {
                        number_label.set_text ("-");
                } else {
-                       number_label.set_text (PBD::to_string (abs(_route->track_number ()), std::dec));
+                       number_label.set_text (PBD::to_string (abs(_route->track_number ())));
                }
        } else {
                number_label.set_text ("");