# HG changeset patch
# User Chris Cannam
# Date 1476894812 -3600
# Node ID a68d407f9752a59df67e57d25cca79c538ca9950
# Parent  794b64e62e58ba812ad50e9d6e34575244de124c
Further MSVC build stuff. Committing this as-is because it's building and running now, but there's a lot to tidy up.

diff -r 794b64e62e58 -r a68d407f9752 data/midi/rtmidi/RtMidi.cpp
--- a/data/midi/rtmidi/RtMidi.cpp	Wed Oct 19 09:11:51 2016 +0100
+++ b/data/midi/rtmidi/RtMidi.cpp	Wed Oct 19 17:33:32 2016 +0100
@@ -63,7 +63,7 @@
 #endif
   }
   else {
-    cerr << '\n' << errorString_ << "\n\n";
+    cerr << "\nRtMidi error: " << errorString_ << "\n\n";
     throw RtError( errorString_, type );
   }
 }
diff -r 794b64e62e58 -r a68d407f9752 data/model/ReadOnlyWaveFileModel.cpp
--- a/data/model/ReadOnlyWaveFileModel.cpp	Wed Oct 19 09:11:51 2016 +0100
+++ b/data/model/ReadOnlyWaveFileModel.cpp	Wed Oct 19 17:33:32 2016 +0100
@@ -614,7 +614,10 @@
             cerr << "ReadOnlyWaveFileModel::fill inner loop: frame = " << frame << ", count = " << m_frameCount << ", blocksize " << readBlockSize << endl;
 #endif
 
-            if (updating && (frame + readBlockSize > m_frameCount)) break;
+            if (updating && (frame + readBlockSize > m_frameCount)) {
+                m_model.m_mutex.lock(); // must be locked on exiting loop
+                break;
+            }
 
             block = m_model.m_reader->getInterleavedFrames(frame, readBlockSize);