remove debug output from last commit

[ardour.git] / gtk2_ardour / mixer_strip.cc

diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index cfda138b1976b6ecdbdcddf1ca15ee62ae8a92b7..70e0a6aa1865f31e1e396a5f5cd42b0215a3e600 100644 (file)
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -15,10 +15,10 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <cmath>
+#include <algorithm>
 
 #include <sigc++/bind.h>
 
@@ -63,6 +63,7 @@ using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtk;
 using namespace Gtkmm2ext;
+using namespace std;
 
 int MixerStrip::scrollbar_height = 0;
 
@@ -390,8 +391,7 @@ MixerStrip::set_stuff_from_route ()
                } else {
                        _marked_for_display = true;
                }
-       }
-       else {
+       } else {
                /* backwards compatibility */
                _marked_for_display = true;
        }
@@ -441,7 +441,6 @@ MixerStrip::set_width (Width w)
                break;
 
        case Narrow:
-               set_size_request (50, -1);
                xml_node->add_property ("strip_width", "narrow");
 
                if (rec_enable_button) {
@@ -463,6 +462,7 @@ MixerStrip::set_width (Width w)
                ((Gtk::Label*)panners.pan_automation_style_button.get_child())->set_text (panners.short_astyle_string(_route->panner().automation_style()));
                ((Gtk::Label*)panners.pan_automation_state_button.get_child())->set_text (panners.short_astate_string(_route->panner().automation_state()));
                Gtkmm2ext::set_size_request_to_display_given_text (name_button, "longest label", 2, 2);
+               set_size_request (max (50, gpm.get_gm_width()), -1);
                break;
        }