fix some compiler warnings

diff --git a/gtk2_ardour/ardour_button.cc b/gtk2_ardour/ardour_button.cc
index 1e5184b874d2403b1d5773f1bc4aa205369ef9f1..1e6b05a7a8a6a0a9bf20cc641f9bd5ead6f3fe33 100644 (file)
--- a/gtk2_ardour/ardour_button.cc
+++ b/gtk2_ardour/ardour_button.cc
@@ -618,15 +618,13 @@ ArdourButton::build_patterns ()
                cairo_pattern_destroy (led_inset_pattern);
        }
        
-       float width = get_width();  float height = get_height();
-
        //convex gradient
-       convex_pattern = cairo_pattern_create_linear (0.0, 0, 0.0,  height);
+       convex_pattern = cairo_pattern_create_linear (0.0, 0, 0.0,  get_height());
        cairo_pattern_add_color_stop_rgba (convex_pattern, 0.0, 0,0,0, 0.0);
        cairo_pattern_add_color_stop_rgba (convex_pattern, 1.0, 0,0,0, 0.35);
 
        //concave gradient
-       concave_pattern = cairo_pattern_create_linear (0.0, 0, 0.0,  height);
+       concave_pattern = cairo_pattern_create_linear (0.0, 0, 0.0,  get_height());
        cairo_pattern_add_color_stop_rgba (concave_pattern, 0.0, 0,0,0, 0.5);
        cairo_pattern_add_color_stop_rgba (concave_pattern, 0.7, 0,0,0, 0.0);
 

diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index dd7fb27326bb56db1ad74465cbc4c0bd0b92e6c1..edc1b867ff95d72087e796016f242c31f2ea9d79 100644 (file)
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -790,7 +790,7 @@ RouteUI::monitor_disk_press (GdkEventButton*)
 bool
 RouteUI::monitor_disk_release (GdkEventButton* ev)
 {
-       monitor_release (ev, MonitorDisk);
+       return monitor_release (ev, MonitorDisk);
 }
 
 bool

diff --git a/libs/gtkmm2ext/barcontroller.cc b/libs/gtkmm2ext/barcontroller.cc
index 4ad048a0cc2e4eb4c6604cb68b974c6eff1bb98d..011c66141a8fa7bfc2e5ce106406f488296fa0f2 100644 (file)
--- a/libs/gtkmm2ext/barcontroller.cc
+++ b/libs/gtkmm2ext/barcontroller.cc
@@ -43,9 +43,9 @@ BarController::BarController (Gtk::Adjustment& adj,
                              boost::shared_ptr<PBD::Controllable> mc)
 
        : adjustment (adj)
-         , binding_proxy (mc)
-         , _hovering (false)
-         , spinner (adjustment)
+       , binding_proxy (mc)
+       , spinner (adjustment)
+       , _hovering (false)
 {                        
        _style = LeftToRight;
        grabbed = false;