From ce6c41c060c700489a9ac9fc5080bf2920c17ae2 Mon Sep 17 00:00:00 2001 From: Sampo Savolainen Date: Wed, 24 May 2006 22:43:15 +0000 Subject: [PATCH] Fixed some valgrind errors from using uninitialized variables in conditionals. git-svn-id: svn://localhost/trunk/ardour2@532 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/audio_time_axis.cc | 2 +- gtk2_ardour/editor_mouse.cc | 2 +- gtk2_ardour/gain_meter.cc | 2 ++ gtk2_ardour/panner_ui.cc | 2 ++ 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc index 18586caed9..b225e47c0d 100644 --- 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 bf8b16c0d7..50527f51d6 100644 --- 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 4cbb8a8f47..9d0228dba6 100644 --- 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 (&_io)) != 0) { diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc index f430e9c19a..5fc659d2f8 100644 --- 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));