diff options
| author | Sakari Bergen <sakari.bergen@beatwaves.net> | 2009-10-02 11:16:15 +0000 |
|---|---|---|
| committer | Sakari Bergen <sakari.bergen@beatwaves.net> | 2009-10-02 11:16:15 +0000 |
| commit | 1928f286e91243004a014ec67c8bb13976d0927b (patch) | |
| tree | 0d06c1be216d33959e7057ad87b823ad4a469713 /libs | |
| parent | adeef356b239a25804c182b25e815f50f9d8fbab (diff) | |
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
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/event_type_map.cc | 3 | ||||
| -rw-r--r-- | libs/pbd/xml++.cc | 2 |
2 files changed, 3 insertions, 2 deletions
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); |