From 1928f286e91243004a014ec67c8bb13976d0927b Mon Sep 17 00:00:00 2001
From: Sakari Bergen <sakari.bergen@beatwaves.net>
Date: Fri, 2 Oct 2009 11:16:15 +0000
Subject: [PATCH] Fix some trivial compiler warnings and add
 editor_imageframe.cc to gtk2_ardour/wscript

git-svn-id: svn://localhost/ardour2/branches/3.0@5716 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 gtk2_ardour/editor.cc               | 2 +-
 gtk2_ardour/export_format_dialog.cc | 2 +-
 gtk2_ardour/mixer_ui.cc             | 4 ++--
 gtk2_ardour/wscript                 | 1 +
 libs/ardour/event_type_map.cc       | 3 ++-
 libs/pbd/xml++.cc                   | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index fb917ac19e..3a343f75b3 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -4947,7 +4947,7 @@ Editor::remove_route (TimeAxisView *tv)
 
 	TrackViewList::iterator i;
 	boost::shared_ptr<Route> route;
-	TimeAxisView* next_tv;
+	TimeAxisView* next_tv = 0;
 
 	if (tv == entered_track) {
 		entered_track = 0;
diff --git a/gtk2_ardour/export_format_dialog.cc b/gtk2_ardour/export_format_dialog.cc
index 93fd1d56b3..22852882ba 100644
--- a/gtk2_ardour/export_format_dialog.cc
+++ b/gtk2_ardour/export_format_dialog.cc
@@ -730,7 +730,7 @@ ExportFormatDialog::update_clock (AudioClock & clock, ARDOUR::AnyTime const & ti
 	// TODO position
 	clock.set (session->convert_to_frames_at (0, time), true);
 	
-	AudioClock::Mode mode;
+	AudioClock::Mode mode(AudioClock::SMPTE);
 	
 	switch (time.type) {
 	  case AnyTime::SMPTE:
diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index 83a35bcb96..2e9cfff614 100644
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -388,11 +388,11 @@ Mixer_UI::sync_order_keys (string const & src)
 	}
 
 	bool changed = false;
-	int order;
+	unsigned int order;
 
 	for (order = 0, ri = rows.begin(); ri != rows.end(); ++ri, ++order) {
 		boost::shared_ptr<Route> route = (*ri)[track_columns.route];
-		int old_key = order;
+		unsigned int old_key = order;
 		unsigned int new_key = route->order_key (N_("signal"));
 
 		assert (new_key < neworder.size());
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index 17d9096dc9..d594d364d8 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -79,6 +79,7 @@ gtk2_ardour_sources = [
 	'editor_export_audio.cc',
 	'editor_group_tabs.cc',
 	'editor_hscroller.cc',
+	'editor_imageframe.cc',
 	'editor_keyboard.cc',
 	'editor_keys.cc',
 	'editor_markers.cc',
diff --git a/libs/ardour/event_type_map.cc b/libs/ardour/event_type_map.cc
index cbc3458615..d380906c0c 100644
--- a/libs/ardour/event_type_map.cc
+++ b/libs/ardour/event_type_map.cc
@@ -82,7 +82,7 @@ Evoral::ControlList::InterpolationStyle
 EventTypeMap::interpolation_of(const Evoral::Parameter& param)
 {
 	switch (param.type()) {
-	case MidiCCAutomation:              
+	case MidiCCAutomation:
 		switch (param.id()) {
 		case MIDI_CTL_LSB_BANK:
 		case MIDI_CTL_MSB_BANK:
@@ -128,6 +128,7 @@ EventTypeMap::interpolation_of(const Evoral::Parameter& param)
 	case MidiPitchBenderAutomation:     return Evoral::ControlList::Linear; break; 
 	default: assert(false);
 	}
+	return Evoral::ControlList::Linear; // Not reached, suppress warnings
 }
 
 
diff --git a/libs/pbd/xml++.cc b/libs/pbd/xml++.cc
index ec1c8a7b60..eb48c8e346 100644
--- a/libs/pbd/xml++.cc
+++ b/libs/pbd/xml++.cc
@@ -68,7 +68,7 @@ XMLTree::read_internal(bool validate)
 	delete _root;
 	_root = 0;
 
-	xmlParserCtxtPtr ctxt; /* the parser context */
+	xmlParserCtxtPtr ctxt = NULL; /* the parser context */
 	xmlDocPtr doc; /* the resulting document tree */
 
 	xmlKeepBlanksDefault(0);