smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 16:46:35 +01:00
Code Issues Projects Releases Wiki Activity

Fix some warnings.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@12048 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2012-04-20 23:34:15 +00:00
parent 9cc110f111
commit 9befa88deb
6 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gtk2_ardour/midi_list_editor.cc
View file

@ -180,8 +180,8 @@ MidiListEditor::scroll_event (GdkEventScroll* ev)
TreeViewColumn* col; TreeViewColumn* col;
int cellx; int cellx;
int celly; int celly;
int idelta; int idelta = 0;
double fdelta; double fdelta = 0;
MidiModel::NoteDiffCommand::Property prop (MidiModel::NoteDiffCommand::NoteNumber); MidiModel::NoteDiffCommand::Property prop (MidiModel::NoteDiffCommand::NoteNumber);
bool apply = false; bool apply = false;
bool was_selected = false; bool was_selected = false;
@ -586,8 +586,8 @@ MidiListEditor::edited (const std::string& path, const std::string& text)
double fval; double fval;
int ival; int ival;
bool apply = false; bool apply = false;
int idelta; int idelta = 0;
double fdelta; double fdelta = 0;
char* opname; char* opname;
switch (edit_column) { switch (edit_column) {
case 0: // start case 0: // start

2
libs/ardour/tempo.cc
View file

@ -1806,7 +1806,7 @@ TempoMap::framepos_plus_beats (framepos_t pos, Evoral::MusicalTime beats) const
{ {
Glib::RWLock::ReaderLock lm (lock); Glib::RWLock::ReaderLock lm (lock);
Metrics::const_iterator next_tempo; Metrics::const_iterator next_tempo;
const TempoSection* tempo; const TempoSection* tempo = 0;
/* Find the starting tempo metric */ /* Find the starting tempo metric */

6
libs/evoral/src/ControlList.cpp
View file

@ -422,9 +422,9 @@ ControlList::thin ()
{ {
Glib::Mutex::Lock lm (_lock); Glib::Mutex::Lock lm (_lock);
ControlEvent* prevprev; ControlEvent* prevprev = 0;
ControlEvent* cur; ControlEvent* cur = 0;
ControlEvent* prev; ControlEvent* prev = 0;
iterator pprev; iterator pprev;
int counter = 0; int counter = 0;

1
libs/pbd/pbd/ringbufferNPT.h
View file

@ -231,6 +231,7 @@ RingBufferNPT<T>::get_read_vector (RingBufferNPT<T>::rw_vector *vec)
vec->buf[0] = &buf[r]; vec->buf[0] = &buf[r];
vec->len[0] = free_cnt; vec->len[0] = free_cnt;
vec->buf[1] = 0;
vec->len[1] = 0; vec->len[1] = 0;
} }
} }

4
libs/rubberband/src/StretcherImpl.cpp
View file

@ -834,7 +834,11 @@ RubberBandStretcher::Impl::study(const float *const *input, size_t samples, bool
// cd.accumulator is not otherwise used during studying, // cd.accumulator is not otherwise used during studying,
// so we can use it as a temporary buffer here // 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); size_t got = inbuf.peek(cd.accumulator, m_windowSize);
#endif
assert(final || got == m_windowSize); assert(final || got == m_windowSize);
m_window->cut(cd.accumulator); m_window->cut(cd.accumulator);

2
libs/surfaces/mackie/strip.cc
View file

@ -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)); _vpot = dynamic_cast<Pot*> (Pot::factory (*_surface, Pot::ID + index, "vpot", *this));
_meter = dynamic_cast<Meter*> (Meter::factory (*_surface, index, "meter", *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) { 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)); 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", 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()), _surface->number(), index, Button::id_to_name (bb->bid()),
bb->id(), b->second.base_id)); bb->id(), b->second.base_id));
} }
#endif
} }
Strip::~Strip () Strip::~Strip ()