diff options
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/ardour/midi_model.h | 3 | ||||
| -rw-r--r-- | libs/ardour/plugin_insert.cc | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index cd2411430e..fd384ecf81 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -5393,7 +5393,7 @@ ARDOUR_UI::key_event_handler (GdkEventKey* ev, Gtk::Window* event_window) static Gtkmm2ext::Bindings* get_bindings_from_widget_heirarchy (GtkWidget* w) { - void* p; + void* p = NULL; while (w) { if ((p = g_object_get_data (G_OBJECT(w), "ardour-bindings")) != 0) { diff --git a/libs/ardour/ardour/midi_model.h b/libs/ardour/ardour/midi_model.h index 21c67c2b32..254d610077 100644 --- a/libs/ardour/ardour/midi_model.h +++ b/libs/ardour/ardour/midi_model.h @@ -175,8 +175,9 @@ public: private: struct Change { + Change () : sysex_id (0) {} boost::shared_ptr<Evoral::Event<TimeType> > sysex; - gint sysex_id; + gint sysex_id; SysExDiffCommand::Property property; TimeType old_time; TimeType new_time; diff --git a/libs/ardour/plugin_insert.cc b/libs/ardour/plugin_insert.cc index 502f581532..7aed4cfa0b 100644 --- a/libs/ardour/plugin_insert.cc +++ b/libs/ardour/plugin_insert.cc @@ -2254,14 +2254,14 @@ PluginInsert::set_state(const XMLNode& node, int version) } if (strncmp ((*i)->name ().c_str(), X_("InputMap-"), 9) == 0) { long pc = atol (&((*i)->name().c_str()[9])); - if (pc >=0 && pc <= get_count()) { + if (pc >= 0 && pc <= (long) get_count()) { _in_map[pc] = ChanMapping (**i); ++in_maps; } } if (strncmp ((*i)->name ().c_str(), X_("OutputMap-"), 10) == 0) { long pc = atol (&((*i)->name().c_str()[10])); - if (pc >=0 && pc <= get_count()) { + if (pc >= 0 && pc <= (long) get_count()) { _out_map[pc] = ChanMapping (**i); ++out_maps; } |