Another approach for stuck splash-screens:

[ardour.git] / gtk2_ardour / vca_master_strip.cc

diff --git a/gtk2_ardour/vca_master_strip.cc b/gtk2_ardour/vca_master_strip.cc
index 2d6088fbdf62405757d988b4f2c510caaeca5fd9..40b2a081030cfb549f92e8feccbf85e919e67760 100644 (file)
--- a/gtk2_ardour/vca_master_strip.cc
+++ b/gtk2_ardour/vca_master_strip.cc
@@ -18,7 +18,7 @@
 
 #include <gtkmm/stock.h>
 
-#include "pbd/convert.h"
+#include "pbd/string_convert.h"
 
 #include "ardour/rc_configuration.h"
 #include "ardour/session.h"
@@ -87,7 +87,7 @@ VCAMasterStrip::VCAMasterStrip (Session* s, boost::shared_ptr<VCA> v)
        solo_mute_box.pack_start (mute_button, true, true);
        solo_mute_box.pack_start (solo_button, true, true);
 
-       number_label.set_text (to_string (v->number(), std::dec));
+       number_label.set_text (PBD::to_string (v->number()));
        number_label.set_elements((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::Text|ArdourButton::Inactive));
        number_label.set_no_show_all ();
        number_label.set_name ("generic button");
@@ -230,6 +230,11 @@ VCAMasterStrip::update_bottom_padding ()
        output_button.set_name ("mixer strip button");
        comment_button.set_name ("generic button");
 
+       if (viz.find ("VCA") == std::string::npos) {
+               control_slave_ui.hide ();
+       } else {
+               control_slave_ui.show ();
+       }
 
        int h = 1;
        if (1) {