Fix some warnings.

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

6 files changed, 15 insertions, 8 deletions

diff --git a/gtk2_ardour/midi_list_editor.cc b/gtk2_ardour/midi_list_editor.cc
index 53af17488c..66a8e8b6df 100644
--- a/gtk2_ardour/midi_list_editor.cc
+++ b/gtk2_ardour/midi_list_editor.cc
@@ -180,8 +180,8 @@ MidiListEditor::scroll_event (GdkEventScroll* ev)
 	TreeViewColumn* col;
 	int cellx;
 	int celly;
-	int idelta;
-	double fdelta;
+	int idelta = 0;
+	double fdelta = 0;
 	MidiModel::NoteDiffCommand::Property prop (MidiModel::NoteDiffCommand::NoteNumber);
 	bool apply = false;
 	bool was_selected = false;
@@ -586,8 +586,8 @@ MidiListEditor::edited (const std::string& path, const std::string& text)
 	double fval;
 	int    ival;
 	bool   apply = false;
-	int    idelta;
-	double fdelta;
+	int    idelta = 0;
+	double fdelta = 0;
 	char*  opname;
 	switch (edit_column) {
 	case 0: // start
diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc
index 89427f57b9..df3dddbd6d 100644
--- a/libs/ardour/tempo.cc
+++ b/libs/ardour/tempo.cc
@@ -1806,7 +1806,7 @@ TempoMap::framepos_plus_beats (framepos_t pos, Evoral::MusicalTime beats) const
 {
 	Glib::RWLock::ReaderLock lm (lock);
 	Metrics::const_iterator next_tempo;
-	const TempoSection* tempo;
+	const TempoSection* tempo = 0;
 
 	/* Find the starting tempo metric */
 
diff --git a/libs/evoral/src/ControlList.cpp b/libs/evoral/src/ControlList.cpp
index 758dc141e0..e90b28c147 100644
--- a/libs/evoral/src/ControlList.cpp
+++ b/libs/evoral/src/ControlList.cpp
@@ -422,9 +422,9 @@ ControlList::thin ()
 {
 	Glib::Mutex::Lock lm (_lock);
 
-	ControlEvent* prevprev;
-	ControlEvent* cur;
-	ControlEvent* prev;
+	ControlEvent* prevprev = 0;
+	ControlEvent* cur = 0;
+	ControlEvent* prev = 0;
 	iterator pprev;
 	int counter = 0;
 
diff --git a/libs/pbd/pbd/ringbufferNPT.h b/libs/pbd/pbd/ringbufferNPT.h
index 0aed05355d..e43f967592 100644
--- a/libs/pbd/pbd/ringbufferNPT.h
+++ b/libs/pbd/pbd/ringbufferNPT.h
@@ -231,6 +231,7 @@ RingBufferNPT<T>::get_read_vector (RingBufferNPT<T>::rw_vector *vec)
 		
 		vec->buf[0] = &buf[r];
 		vec->len[0] = free_cnt;
+		vec->buf[1] = 0;
 		vec->len[1] = 0;
 	}
 }
diff --git a/libs/rubberband/src/StretcherImpl.cpp b/libs/rubberband/src/StretcherImpl.cpp
index 7ec7c161f3..200c8771a8 100644
--- a/libs/rubberband/src/StretcherImpl.cpp
+++ b/libs/rubberband/src/StretcherImpl.cpp
@@ -834,7 +834,11 @@ RubberBandStretcher::Impl::study(const float *const *input, size_t samples, bool
             // cd.accumulator is not otherwise used during studying,
             // so we can use it as a temporary buffer here
 
+#ifdef NDEBUG
+            inbuf.peek(cd.accumulator, m_windowSize);
+#else            
             size_t got = inbuf.peek(cd.accumulator, m_windowSize);
+#endif            
             assert(final || got == m_windowSize);
 
             m_window->cut(cd.accumulator);
diff --git a/libs/surfaces/mackie/strip.cc b/libs/surfaces/mackie/strip.cc
index 64d916a2a9..4f4a96ebdc 100644
--- a/libs/surfaces/mackie/strip.cc
+++ b/libs/surfaces/mackie/strip.cc
@@ -87,12 +87,14 @@ Strip::Strip (Surface& s, const std::string& name, int index, const map<Button::
 	_vpot = dynamic_cast<Pot*> (Pot::factory (*_surface, Pot::ID + index, "vpot", *this));
 	_meter = dynamic_cast<Meter*> (Meter::factory (*_surface, index, "meter", *this));
 
+#ifndef NDEBUG	
 	for (map<Button::ID,StripButtonInfo>::const_iterator b = strip_buttons.begin(); b != strip_buttons.end(); ++b) {
 		Button* bb = dynamic_cast<Button*> (Button::factory (*_surface, b->first, b->second.base_id + index, b->second.name, *this));
 		DEBUG_TRACE (DEBUG::MackieControl, string_compose ("surface %1 strip %2 new button BID %3 id %4 from base %5\n",
 								   _surface->number(), index, Button::id_to_name (bb->bid()), 
 								   bb->id(), b->second.base_id));
 	}
+#endif	
 }	
 
 Strip::~Strip ()