assure midi patch ID is set before assigning it

[ardour.git] / libs / gtkmm2ext / bindings.cc

diff --git a/libs/gtkmm2ext/bindings.cc b/libs/gtkmm2ext/bindings.cc
index 6002f16371814dd9d12f07c10ef069bc805196d1..f96bd586d985ec6d7cbcb35957291885df535b08 100644 (file)
--- a/libs/gtkmm2ext/bindings.cc
+++ b/libs/gtkmm2ext/bindings.cc
@@ -1,5 +1,26 @@
+/*
+    Copyright (C) 2012 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #include <iostream>
 
+#include <glib/gstdio.h>
+
 #include "pbd/xml++.h"
 #include "pbd/convert.h"
 
@@ -217,7 +238,7 @@ Bindings::set_action_map (ActionMap& am)
 bool
 Bindings::activate (KeyboardKey kb, Operation op)
 {
-        KeybindingMap* kbm;
+        KeybindingMap* kbm = 0;
 
         switch (op) {
         case Press:
@@ -244,7 +265,7 @@ Bindings::activate (KeyboardKey kb, Operation op)
 void
 Bindings::add (KeyboardKey kb, Operation op, RefPtr<Action> what)
 {
-        KeybindingMap* kbm;
+        KeybindingMap* kbm = 0;
 
         switch (op) {
         case Press:
@@ -260,7 +281,7 @@ Bindings::add (KeyboardKey kb, Operation op, RefPtr<Action> what)
         if (k == kbm->end()) {
                 pair<KeyboardKey,RefPtr<Action> > newpair (kb, what);
                 kbm->insert (newpair);
-                cerr << "Bindings added " << kb.key() << " w/ " << kb.state() << " => " << what->get_name() << endl;
+                // cerr << "Bindings added " << kb.key() << " w/ " << kb.state() << " => " << what->get_name() << endl;
         } else {
                 k->second = what;
         }
@@ -269,7 +290,7 @@ Bindings::add (KeyboardKey kb, Operation op, RefPtr<Action> what)
 void
 Bindings::remove (KeyboardKey kb, Operation op)
 {
-        KeybindingMap* kbm;
+        KeybindingMap* kbm = 0;
 
         switch (op) {
         case Press:
@@ -290,7 +311,7 @@ Bindings::remove (KeyboardKey kb, Operation op)
 bool
 Bindings::activate (MouseButton bb, Operation op)
 {
-        MouseButtonBindingMap* bbm;
+        MouseButtonBindingMap* bbm = 0;
 
         switch (op) {
         case Press:
@@ -317,7 +338,7 @@ Bindings::activate (MouseButton bb, Operation op)
 void
 Bindings::add (MouseButton bb, Operation op, RefPtr<Action> what)
 {
-        MouseButtonBindingMap* bbm;
+        MouseButtonBindingMap* bbm = 0;
 
         switch (op) {
         case Press:
@@ -333,7 +354,7 @@ Bindings::add (MouseButton bb, Operation op, RefPtr<Action> what)
         if (b == bbm->end()) {
                 pair<MouseButton,RefPtr<Action> > newpair (bb, what);
                 bbm->insert (newpair);
-                cerr << "Bindings added mouse button " << bb.button() << " w/ " << bb.state() << " => " << what->get_name() << endl;
+                // cerr << "Bindings added mouse button " << bb.button() << " w/ " << bb.state() << " => " << what->get_name() << endl;
         } else {
                 b->second = what;
         }
@@ -342,7 +363,7 @@ Bindings::add (MouseButton bb, Operation op, RefPtr<Action> what)
 void
 Bindings::remove (MouseButton bb, Operation op)
 {
-        MouseButtonBindingMap* bbm;
+        MouseButtonBindingMap* bbm = 0;
 
         switch (op) {
         case Press:
@@ -370,7 +391,7 @@ Bindings::save (const string& path)
         save (*root);
 
         if (!tree.write (path)) {
-                ::unlink (path.c_str());
+                ::g_unlink (path.c_str());
                 return false;
         }