From 8109ff7bc0fa0918ef7ec005db721c412bd82b86 Mon Sep 17 00:00:00 2001
From: Jonathan Moore Liles <j.liles@unix.net>
Date: Wed, 16 Sep 2020 18:19:07 -0700
Subject: [PATCH] Sequencer: Fix casting/sign related bug which could cause a
 hang during SMF writing.

---
 sequencer/src/smf.C | 39 ++++++++++++++++++++++-----------------
 sequencer/src/smf.H |  2 +-
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/sequencer/src/smf.C b/sequencer/src/smf.C
index 4ae2fb3..ca21994 100644
--- a/sequencer/src/smf.C
+++ b/sequencer/src/smf.C
@@ -20,6 +20,7 @@
 #include "smf.H"
 #include "phrase.H"
 #include "pattern.H"
+#include <math.h>
 
 using namespace MIDI;
 
@@ -143,11 +144,11 @@ smf::read_byte ( void )
 }
 
 void
-smf::write_var ( long var )
+smf::write_var ( unsigned long var )
 {
-    long buffer;
-    buffer = var & 0x7F;
-
+    unsigned long buffer = var & 0x7F;
+    byte_t buf[4];
+    
     /* we shift it right 7, if there is
        still set bits, encode into buffer
        in reverse order */
@@ -157,15 +158,19 @@ smf::write_var ( long var )
 	buffer |= ( var & 0x7F ) | 0x80;
     }
 
-    for ( ;; )
+    int i = 0;
+    
+    while ( i < 4 )
     {
-        write_byte( buffer );
-
+	buf[i++] = buffer;
+        
         if ( buffer & 0x80 )
             buffer >>= 8;
         else
             break;
     }
+
+    write_bytes( buf, i );    
 }
 
 
@@ -182,15 +187,6 @@ smf::write_long ( unsigned long x )
     write_bytes( buf, 4 );
 }
 
-void
-smf::write_ascii ( const char *buf )
-{
-    if ( strlen( buf ) != 4 )
-        ASSERTION( "invalid MIDI value" );
-
-    write_bytes( (void *)buf, 4 );
-}
-
 void
 smf::write_short ( unsigned short x )
 {
@@ -208,6 +204,15 @@ smf::write_byte ( byte_t b )
     write_bytes( &b, 1 );
 }
 
+void
+smf::write_ascii ( const char *buf )
+{
+    if ( strlen( buf ) != 4 )
+        ASSERTION( "invalid MIDI value" );
+
+    write_bytes( (void *)buf, 4 );
+}
+
 
 void
 smf::write_bytes ( const void *p, size_t l )
@@ -231,7 +236,7 @@ smf::write_event ( const midievent *e )
     tick_t delta = ts - _time;
     _time = ts;
 
-    write_var( delta );
+    write_var( floor(delta) );
 
     if ( _cue && (e->is_note_off() || e->is_note_on() ) )
     {
diff --git a/sequencer/src/smf.H b/sequencer/src/smf.H
index ad96db9..964aa7e 100644
--- a/sequencer/src/smf.H
+++ b/sequencer/src/smf.H
@@ -64,7 +64,7 @@ public:
     void read_bytes ( void *p, int l );
     byte_t read_byte ( void );
 
-    void write_var ( long var );
+    void write_var ( unsigned long var );
     void write_long ( unsigned long x );
     void write_ascii ( const char *buf );
     void write_short ( unsigned short x );