Doc: NR 2.1 Vocal: use vocalName rather than instrumentName

[lilypond.git] / scripts / midi2ly.py

diff --git a/scripts/midi2ly.py b/scripts/midi2ly.py
index beb4cec7af0a8cded98d783531ebeefac2be2018..e0a00ae170310a5a9d40a8d92a60f86b7db8a443 100644 (file)
--- a/scripts/midi2ly.py
+++ b/scripts/midi2ly.py
@@ -4,7 +4,7 @@
 
 # This file is part of LilyPond, the GNU music typesetter.
 #
-# Copyright (C) 1998--2009  Han-Wen Nienhuys <hanwen@xs4all.nl>
+# Copyright (C) 1998--2010  Han-Wen Nienhuys <hanwen@xs4all.nl>
 #                 Jan Nieuwenhuizen <janneke@gnu.org>
 #
 # LilyPond is free software: you can redistribute it and/or modify
@@ -87,7 +87,7 @@ def warranty ():
 
 %s
 %s
-''' % ( _ ('Copyright (c) %s by') % '2001--2009',
+''' % ( _ ('Copyright (c) %s by') % '2001--2010',
         '\n  '.join (authors),
         _ ('Distributed under terms of the GNU General Public License.'),
         _ ('It comes with NO WARRANTY.')))
@@ -801,7 +801,7 @@ def convert_midi (in_file, out_file):
     global  duration_quant_clocks
     global allowed_tuplet_clocks
 
-    str = open (in_file).read ()
+    str = open (in_file, 'rb').read ()
     midi_dump = midi.parse (str)
     
     clocks_per_1 = midi_dump[0][1]