Fixed MIDI playback on Linux. Still need configure files for libscorealign and portmidi. (I tweaked makefiles by hand to build and test with EXPERIMENTAL_MIDI_OUT and EXPERIMENTAL_SCOREALIGN.) Also, I updated portmidi files, including some bug fixes from the portmidi project.

lib-src/libscorealign/audiomixerreader.cpp

@@ -2,8 +2,10 @@
 *
 * 17-Jun-08  RBD created based on audiofilereader.cpp
 */
-#include "assert.h"
-#include "stdlib.h"
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 #include "audioreader.h"
 #include "allegro.h"
 #include "scorealign.h"
@@ -75,5 +77,5 @@ void Audio_mixer_reader::print_info()
 {
     printf("   Audacity mixer at @ %p\n", mixer);
     printf("   sample rate %g\n", get_sample_rate());
-    printf("   total frames %d\n", get_frames());
+    printf("   total frames %ld\n", get_frames());
 }

lib-src/libscorealign/audioreader.cpp

@@ -3,9 +3,11 @@
  * 14-Jul-08  RBD
  */
 
-#include "assert.h"
-#include "stdio.h"
-#include "math.h"
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <math.h>
 #include "sautils.h"
 #include "string.h"
 #include <fstream>

lib-src/libscorealign/comp_chroma.cpp

@@ -1,4 +1,9 @@
+/* comp_chroma.cpp -- compute chroma distance
+ *
+ * 2008 RBD
+ */
 
+#include <string.h>
 #include <math.h>
 #include <fstream>
 #include <algorithm>

lib-src/libscorealign/curvefit.cpp

@@ -3,11 +3,12 @@
  *  scorealign
  *
  *  Created by Roger Dannenberg on 10/20/07.
- *  Copyright 2007 __MyCompanyName__. All rights reserved.
  *
  */
 
-#include "assert.h"
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
 #include <math.h>
 #include "comp_chroma.h"
 #include "sautils.h"

lib-src/libscorealign/fft3/FFT3.cpp

@@ -360,7 +360,7 @@ int NumWindowFuncs3()
    return 4;
 }
 
-char *WindowFuncName3(int whichFunction)
+const char *WindowFuncName3(int whichFunction)
 {
    switch (whichFunction) {
    default:

lib-src/libscorealign/fft3/FFT3.h

@@ -94,7 +94,7 @@ void WindowFunc3(int whichFunction, int NumSamples, float *data);
  * Returns the name of the windowing function (for UI display)
  */
 
-char *WindowFuncName3(int whichFunction);
+const char *WindowFuncName3(int whichFunction);
 
 /*
  * Returns the number of windowing functions supported

lib-src/libscorealign/license.txt

@@ -0,0 +1,40 @@
+/*
+ * Scorealign: Chromagram and dynamic programming based audio alignment
+ *
+ * license.txt -- a copy of the Scorealign copyright notice and 
+ *                license information
+ *
+ * Latest version available at: http://sourceforge.net/projects/portmedia
+ *
+ * Copyright (c) 2008-2010 Roger B. Dannenberg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire Scorealign license; however, 
+ * the PortMusic community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */

lib-src/libscorealign/scorealign-glue.cpp

@@ -3,6 +3,8 @@
  * 21-Jul-08 RBD
  */
 
+#include <stdlib.h>
+#include <string.h>
 #include "allegro.h"
 #include "audioreader.h"
 #include "scorealign.h"