fix a Wsigncompare and 2 -Wuninitialized

This commit is contained in:
Robin Gareus
2016-05-01 13:35:30 +02:00
parent 4727fa337d
commit e6b95a3d65
3 changed files with 5 additions and 4 deletions

View File

@@ -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) {

View File

@@ -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;

View File

@@ -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;
}