[Sv1-commits] SF.net SVN: sv1: [1063] sonic-visualiser/trunk

[<ca...@us...>]

Revision: 1063
          http://sv1.svn.sourceforge.net/sv1/?rev=1063&view=rev
Author:   cannam
Date:     2008-04-29 02:44:44 -0700 (Tue, 29 Apr 2008)

Log Message:
-----------

* Merge rev 1048 (build fixes) from rdf-import branch

Revision Links:
--------------
    http://sv1.svn.sourceforge.net/sv1/?rev=1048&view=rev

Modified Paths:
--------------
    sonic-visualiser/trunk/audioio/AudioJACKTarget.cpp
    sonic-visualiser/trunk/base/RealTime.cpp
    sonic-visualiser/trunk/base/Window.h
    sonic-visualiser/trunk/data/fileio/FileSource.cpp
    sonic-visualiser/trunk/data/fileio/MP3FileReader.cpp
    sonic-visualiser/trunk/data/fileio/MatrixFile.cpp
    sonic-visualiser/trunk/plugin/DSSIPluginFactory.cpp
    sonic-visualiser/trunk/plugin/DSSIPluginInstance.cpp
    sonic-visualiser/trunk/plugin/plugins/SamplePlayer.cpp
    sonic-visualiser/trunk/system/System.cpp

Modified: sonic-visualiser/trunk/audioio/AudioJACKTarget.cpp
===================================================================
--- sonic-visualiser/trunk/audioio/AudioJACKTarget.cpp	2008-04-29 09:42:18 UTC (rev 1062)
+++ sonic-visualiser/trunk/audioio/AudioJACKTarget.cpp	2008-04-29 09:44:44 UTC (rev 1063)
@@ -21,6 +21,8 @@
 #include <iostream>
 #include <cmath>
 
+#include <alloca.h>
+
 //#define DEBUG_AUDIO_JACK_TARGET 1
 
 #ifdef BUILD_STATIC
@@ -354,7 +356,7 @@
 	char name[20];
 	jack_port_t *port;
 
-	sprintf(name, "out %d", m_outputs.size() + 1);
+	sprintf(name, "out %d", int(m_outputs.size() + 1));
 
 	port = jack_port_register(m_client,
 				  name,

Modified: sonic-visualiser/trunk/base/RealTime.cpp
===================================================================
--- sonic-visualiser/trunk/base/RealTime.cpp	2008-04-29 09:42:18 UTC (rev 1062)
+++ sonic-visualiser/trunk/base/RealTime.cpp	2008-04-29 09:44:44 UTC (rev 1063)
@@ -20,6 +20,8 @@
 
 #include <iostream>
 
+#include <cstdlib>
+
 #if (__GNUC__ < 3)
 #include <strstream>
 #define stringstream strstream

Modified: sonic-visualiser/trunk/base/Window.h
===================================================================
--- sonic-visualiser/trunk/base/Window.h	2008-04-29 09:42:18 UTC (rev 1062)
+++ sonic-visualiser/trunk/base/Window.h	2008-04-29 09:44:44 UTC (rev 1063)
@@ -22,6 +22,8 @@
 #include <map>
 #include <cstdlib>
 
+#include <cstdlib>
+
 enum WindowType {
     RectangularWindow,
     BartlettWindow,

Modified: sonic-visualiser/trunk/data/fileio/FileSource.cpp
===================================================================
--- sonic-visualiser/trunk/data/fileio/FileSource.cpp	2008-04-29 09:42:18 UTC (rev 1062)
+++ sonic-visualiser/trunk/data/fileio/FileSource.cpp	2008-04-29 09:44:44 UTC (rev 1063)
@@ -27,6 +27,7 @@
 #include <QHttpResponseHeader>
 
 #include <iostream>
+#include <cstdlib>
 
 //#define DEBUG_FILE_SOURCE 1
 

Modified: sonic-visualiser/trunk/data/fileio/MP3FileReader.cpp
===================================================================
--- sonic-visualiser/trunk/data/fileio/MP3FileReader.cpp	2008-04-29 09:42:18 UTC (rev 1062)
+++ sonic-visualiser/trunk/data/fileio/MP3FileReader.cpp	2008-04-29 09:44:44 UTC (rev 1063)
@@ -27,6 +27,8 @@
 
 #include <iostream>
 
+#include <cstdlib>
+
 #ifdef HAVE_ID3TAG
 #include <id3tag.h>
 #endif
@@ -421,9 +423,9 @@
 {
     DecoderData *data = (DecoderData *)dp;
 
-    fprintf(stderr, "decoding error 0x%04x (%s) at byte offset %u\n",
+    fprintf(stderr, "decoding error 0x%04x (%s) at byte offset %lu\n",
 	    stream->error, mad_stream_errorstr(stream),
-	    stream->this_frame - data->start);
+	    (unsigned long)(stream->this_frame - data->start));
 
     return MAD_FLOW_CONTINUE;
 }

Modified: sonic-visualiser/trunk/data/fileio/MatrixFile.cpp
===================================================================
--- sonic-visualiser/trunk/data/fileio/MatrixFile.cpp	2008-04-29 09:42:18 UTC (rev 1062)
+++ sonic-visualiser/trunk/data/fileio/MatrixFile.cpp	2008-04-29 09:44:44 UTC (rev 1063)
@@ -29,6 +29,8 @@
 #include <cstdio>
 #include <cassert>
 
+#include <cstdlib>
+
 #include <QFileInfo>
 #include <QDir>
 

Modified: sonic-visualiser/trunk/plugin/DSSIPluginFactory.cpp
===================================================================
--- sonic-visualiser/trunk/plugin/DSSIPluginFactory.cpp	2008-04-29 09:42:18 UTC (rev 1062)
+++ sonic-visualiser/trunk/plugin/DSSIPluginFactory.cpp	2008-04-29 09:44:44 UTC (rev 1063)
@@ -26,6 +26,8 @@
 #include "DSSIPluginInstance.h"
 #include "PluginIdentifier.h"
 
+#include <cstdlib>
+
 //!!!
 #include "plugin/plugins/SamplePlayer.h"
 

Modified: sonic-visualiser/trunk/plugin/DSSIPluginInstance.cpp
===================================================================
--- sonic-visualiser/trunk/plugin/DSSIPluginInstance.cpp	2008-04-29 09:42:18 UTC (rev 1062)
+++ sonic-visualiser/trunk/plugin/DSSIPluginInstance.cpp	2008-04-29 09:44:44 UTC (rev 1063)
@@ -25,6 +25,8 @@
 #include "PluginIdentifier.h"
 #include "LADSPAPluginFactory.h"
 
+#include <cstdlib>
+
 //#define DEBUG_DSSI 1
 //#define DEBUG_DSSI_PROCESS 1
 

Modified: sonic-visualiser/trunk/plugin/plugins/SamplePlayer.cpp
===================================================================
--- sonic-visualiser/trunk/plugin/plugins/SamplePlayer.cpp	2008-04-29 09:42:18 UTC (rev 1062)
+++ sonic-visualiser/trunk/plugin/plugins/SamplePlayer.cpp	2008-04-29 09:44:44 UTC (rev 1063)
@@ -21,6 +21,7 @@
 
 #include <dssi.h>
 #include <cmath>
+#include <cstdlib>
 
 #include <QMutexLocker>
 #include <QDir>

Modified: sonic-visualiser/trunk/system/System.cpp
===================================================================
--- sonic-visualiser/trunk/system/System.cpp	2008-04-29 09:42:18 UTC (rev 1062)
+++ sonic-visualiser/trunk/system/System.cpp	2008-04-29 09:44:44 UTC (rev 1063)
@@ -30,6 +30,9 @@
 #include <sys/sysctl.h>
 #endif
 
+#include <limits.h>
+#include <cstdlib>
+
 #include <iostream>
 
 #ifdef __APPLE__


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.