X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fmidi%2B%2B2%2Fmidi.cc;h=81633f4bd2d4f6adf73467bd36015d7f75662f9d;hb=dbf06eb2cfd361590e0988388bfda293fca909bc;hp=eacd85bf28c4af4d74f3fe08b5e2cebb522f9e01;hpb=e0aaed6d65f160c328cb8b56d7c6552ee15d65e2;p=ardour.git

diff --git a/libs/midi++2/midi.cc b/libs/midi++2/midi.cc
index eacd85bf28..81633f4bd2 100644
--- a/libs/midi++2/midi.cc
+++ b/libs/midi++2/midi.cc
@@ -1,22 +1,21 @@
 /*
-    Copyright (C) 1998 Paul Barton-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.
-
-    $Id$
-*/
+ * Copyright (C) 1998-2015 Paul Davis <paul@linuxaudiosystems.com>
+ * Copyright (C) 2008-2009 David Robillard <d@drobilla.net>
+ *
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #include <cstring>
 #include <cstdlib>
@@ -154,11 +153,11 @@ const char *MIDI::controller_names[] = {
 	0
 };
 
-MIDI::byte 
+MIDI::byte
 MIDI::decode_controller_name (const char *name)
 
 {
-	char *lparen;
+	const char *lparen;
 	size_t len;
 
 	if ((lparen = strrchr (name, '(')) != 0) {