Fixes for GCC 4.3.

git-svn-id: svn://localhost/ardour2/branches/3.0@3303 d708f5d6-7413-0410-9779-e7cbd77b26cf

10 files changed, 19 insertions, 12 deletions

diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc
index ced1ba3a40..f25dc1c9b2 100644
--- a/gtk2_ardour/actions.cc
+++ b/gtk2_ardour/actions.cc
@@ -17,6 +17,7 @@
 
 */
 
+#include <cstring>
 #include <vector>
 #include <string>
 #include <list>
diff --git a/gtk2_ardour/automation_controller.cc b/gtk2_ardour/automation_controller.cc
index 8483bab393..dfbdb30ffe 100644
--- a/gtk2_ardour/automation_controller.cc
+++ b/gtk2_ardour/automation_controller.cc
@@ -74,12 +74,13 @@ AutomationController::create(boost::shared_ptr<Automatable> parent, boost::share
 void
 AutomationController::update_label(char* label, int label_len)
 {
-	if (label && label_len)
+	if (label && label_len) {
 		// Hack to display CC rounded to int
 		if (_controllable->parameter().type() == MidiCCAutomation)
 			snprintf(label, label_len, "%d", (int)_controllable->get_value());
 		else
 			snprintf(label, label_len, "%.3f", _controllable->get_value());
+	}
 }
 
 void
diff --git a/gtk2_ardour/editing.cc b/gtk2_ardour/editing.cc
index 963b83647c..2874e69308 100644
--- a/gtk2_ardour/editing.cc
+++ b/gtk2_ardour/editing.cc
@@ -18,6 +18,7 @@
 */
 
 #include <string>
+#include <cstring>
 
 #include "editing.h"
 
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index dff2271a80..3d14d96178 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -3733,7 +3733,7 @@ Editor::get_valid_views (TimeAxisView* track, RouteGroup* group)
 			v->push_back (*i);
 		}
 
-	} else if (track != 0 && group == 0 || (track != 0 && group != 0 && !group->is_active())) {
+	} else if ((track != 0 && group == 0) || (track != 0 && group != 0 && !group->is_active())) {
 		
 		/* just the view for this track
 		 */
diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index e6c3ca972b..e1d320e386 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -518,7 +518,7 @@ Editor::button_selection (ArdourCanvas::Item* item, GdkEvent* event, ItemType it
 	     (mouse_mode != MouseTimeFX || item_type != RegionItem) &&
 	     (mouse_mode != MouseRange)) ||
 
-	    (event->type != GDK_BUTTON_PRESS && event->type != GDK_BUTTON_RELEASE || event->button.button > 3)) {
+	    ((event->type != GDK_BUTTON_PRESS && event->type != GDK_BUTTON_RELEASE) || event->button.button > 3)) {
 		
 		return;
 	}
diff --git a/gtk2_ardour/fft_result.cc b/gtk2_ardour/fft_result.cc
index d692b9152b..a9858542a3 100644
--- a/gtk2_ardour/fft_result.cc
+++ b/gtk2_ardour/fft_result.cc
@@ -21,6 +21,7 @@
 #include <fft_result.h>
 #include <fft_graph.h>
 #include <cstdlib>
+#include <cstring>
 #include <string>
 #include <cmath>
 
diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc
index d1b5f74990..fb3d68fa14 100644
--- a/gtk2_ardour/midi_region_view.cc
+++ b/gtk2_ardour/midi_region_view.cc
@@ -289,11 +289,12 @@ MidiRegionView::canvas_event(GdkEvent* ev)
 			if (_mouse_state == AddDragging)
 				event_x = trackview.editor.frame_to_pixel(event_frame);
 
-			if (drag_rect)
+			if (drag_rect) {
 				if (event_x > drag_start_x)
 					drag_rect->property_x2() = event_x;
 				else
 					drag_rect->property_x1() = event_x;
+			}
 
 			if (drag_rect && _mouse_state == SelectRectDragging) {
 				if (event_y > drag_start_y)
diff --git a/gtk2_ardour/new_session_dialog.cc b/gtk2_ardour/new_session_dialog.cc
index 22ddfa395d..4c128d4bf3 100644
--- a/gtk2_ardour/new_session_dialog.cc
+++ b/gtk2_ardour/new_session_dialog.cc
@@ -738,7 +738,7 @@ NewSessionDialog::which_page () const
 	} else if (page_set == EnginePage) {
 		return EnginePage;
 
-	} else if (page_set == NewPage|OpenPage) {
+	} else if (page_set == (NewPage|OpenPage)) {
 		switch (num) {
 		case 0:
 			return NewPage;
@@ -746,7 +746,7 @@ NewSessionDialog::which_page () const
 			return OpenPage;
 		}
 
-	} else if (page_set == NewPage|EnginePage) {
+	} else if (page_set == (NewPage|EnginePage)) {
 		switch (num) {
 		case 0:
 			return NewPage;
@@ -754,7 +754,7 @@ NewSessionDialog::which_page () const
 			return EnginePage;
 		}
 
-	} else if (page_set == NewPage|EnginePage|OpenPage) {
+	} else if (page_set == (NewPage|EnginePage|OpenPage)) {
 		switch (num) {
 		case 0:
 			return NewPage;
@@ -764,7 +764,7 @@ NewSessionDialog::which_page () const
 			return EnginePage;
 		}
 
-	} else if (page_set == OpenPage|EnginePage) {
+	} else if (page_set == (OpenPage|EnginePage)) {
 		switch (num) {
 		case 0:
 			return OpenPage;
@@ -772,6 +772,8 @@ NewSessionDialog::which_page () const
 			return EnginePage;
 		}
 	}
+
+	return NewPage; /* shouldn't get here */
 }
 
 void
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index 384e3e5538..1977858f0f 100644
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -1229,7 +1229,7 @@ RouteTimeAxisView::get_selectables (nframes_t start, nframes_t end, double top,
 	nframes_t start_adjusted = session_frame_to_track_frame(start, speed);
 	nframes_t end_adjusted   = session_frame_to_track_frame(end, speed);
 
-	if (_view && ((top < 0.0 && bot < 0.0)) || touched (top, bot)) {
+	if ((_view && ((top < 0.0 && bot < 0.0))) || touched (top, bot)) {
 		_view->get_selectables (start_adjusted, end_adjusted, results);
 	}
 
diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc
index 6fa74e986c..b7b853ebec 100644
--- a/gtk2_ardour/sfdb_ui.cc
+++ b/gtk2_ardour/sfdb_ui.cc
@@ -399,11 +399,11 @@ SoundFileBrowser::SoundFileBrowser (Gtk::Window& parent, string title, ARDOUR::S
 	  found_list (ListStore::create(found_list_columns)),
 	  freesound_list (ListStore::create(freesound_list_columns)),
 	  chooser (FILE_CHOOSER_ACTION_OPEN),
-	  found_list_view (found_list),
-	  freesound_list_view (freesound_list),
 	  preview (persistent),
 	  found_search_btn (_("Search")),
-	  freesound_search_btn (_("Start Downloading"))
+	  found_list_view (found_list),
+	  freesound_search_btn (_("Start Downloading")),
+	  freesound_list_view (freesound_list)
 
 {
 	resetting_ourselves = false;