Merge branch 'master' into cairocanvas

[ardour.git] / libs / evoral / src / libsmf / smf_tempo.c

diff --git a/libs/evoral/src/libsmf/smf_tempo.c b/libs/evoral/src/libsmf/smf_tempo.c
index 6620cd405c054089e3a21fc1bdba4236dc3f8544..f3e3f7fc1b76fd43c6aa7cbac372ac559e66097e 100644 (file)
--- a/libs/evoral/src/libsmf/smf_tempo.c
+++ b/libs/evoral/src/libsmf/smf_tempo.c
@@ -133,13 +133,13 @@ maybe_add_to_tempo_map(smf_event_t *event)
 
        /* Tempo Change? */
        if (event->midi_buffer[1] == 0x51) {
-               int new_tempo = (event->midi_buffer[3] << 16) + (event->midi_buffer[4] << 8) + event->midi_buffer[5];
-               if (new_tempo <= 0) {
+               int ntempo = (event->midi_buffer[3] << 16) + (event->midi_buffer[4] << 8) + event->midi_buffer[5];
+               if (ntempo <= 0) {
                        g_critical("Ignoring invalid tempo change.");
                        return;
                }
 
-               add_tempo(event->track->smf, event->time_pulses, new_tempo);
+               add_tempo(event->track->smf, event->time_pulses, ntempo);
        }
 
        /* Time Signature? */