Fixed some valgrind errors from using uninitialized variables in

conditionals.

git-svn-id: svn://localhost/trunk/ardour2@532 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc
index 18586caed93c7a05148725e0ce646b14aa94de5f..b225e47c0dd0442a748561e9bd27b908c9d22afc 100644 (file)
--- a/gtk2_ardour/audio_time_axis.cc
+++ b/gtk2_ardour/audio_time_axis.cc
@@ -578,7 +578,7 @@ AudioTimeAxisView::set_state (const XMLNode& node)
 void
 AudioTimeAxisView::set_height (TrackHeight h)
 {
-       bool height_changed = (h != height_style);
+       bool height_changed = (height == 0) || (h != height_style);
 
        TimeAxisView::set_height (h);
 

diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index bf8b16c0d74517f10ac556ef40b565bf5e459f32..50527f51d65019c8cc53320e7107209438a16660 100644 (file)
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -168,7 +168,7 @@ Editor::set_mouse_mode (MouseMode m, bool force)
                return;
        }
 
-       if (m == mouse_mode && !force) {
+       if (!force && m == mouse_mode) {
                return;
        }
        

diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index 4cbb8a8f471a64b1fffb9a9ed1666deaa04381d4..9d0228dba68023337e63f0676a33f2d52576e146 100644 (file)
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -152,6 +152,8 @@ GainMeter::GainMeter (IO& io, Session& s)
        hbox.set_spacing (0);
        hbox.pack_start (*fader_vbox, false, false, 2);
 
+       set_width(Narrow);
+
        Route* r;
 
        if ((r = dynamic_cast<Route*> (&_io)) != 0) {

diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc
index f430e9c19ad24afe0981ba8c39a95d9d9bc6cbbd..5fc659d2f81dd534b23397e0974c377fc603bfa9 100644 (file)
--- a/gtk2_ardour/panner_ui.cc
+++ b/gtk2_ardour/panner_ui.cc
@@ -144,6 +144,8 @@ PannerUI::PannerUI (IO& io, Session& s)
 
        panner = 0;
 
+       set_width(Narrow);
+
        _io.panner().Changed.connect (mem_fun(*this, &PannerUI::panner_changed));
        _io.panner().LinkStateChanged.connect (mem_fun(*this, &PannerUI::update_pan_linkage));
        _io.panner().StateChanged.connect (mem_fun(*this, &PannerUI::update_pan_state));