Compiles again with VC++

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2663 0c269be4-1314-0410-8aa9-9f06e86f4224

common/JackAPI.cpp

@@ -247,16 +247,6 @@ extern "C"
 }
 #endif
 
-#if defined(WIN32) && !defined(__MINGW32__)
-/* missing on Windows : see http://bugs.mysql.com/bug.php?id=15936 */
-inline double rint(double nr)
-{
-    double f = floor(nr);
-    double c = ceil(nr);
-    return (((c -nr) >= (nr - f)) ? f : c);
-}
-#endif
-
 static inline bool CheckPort(jack_port_id_t port_index)
 {
     return (port_index > 0 && port_index < PORT_NUM);

common/JackFrameTimer.cpp

@@ -29,6 +29,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 namespace Jack
 {
 
+#if defined(WIN32) && !defined(__MINGW32__)
+/* missing on Windows : see http://bugs.mysql.com/bug.php?id=15936 */
+inline double rint(double nr)
+{
+    double f = floor(nr);
+    double c = ceil(nr);
+    return (((c -nr) >= (nr - f)) ? f : c);
+}
+#endif
+
 JackTimer::JackTimer()
 {
     fInitialized = false;

windows/JackPortAudioDevices.cpp

@@ -25,15 +25,16 @@ using namespace std;
 PortAudioDevices::PortAudioDevices()
 {
     PaError err;
+	PaDeviceIndex id;
     if ( ( err = Pa_Initialize() ) == paNoError )
     {
         fNumHostApi = Pa_GetHostApiCount();
         fNumDevice = Pa_GetDeviceCount();
         fDeviceInfo = new PaDeviceInfo*[fNumDevice];
-        for ( PaDeviceIndex id = 0; id < fNumDevice; id++ )
+        for ( id = 0; id < fNumDevice; id++ )
             fDeviceInfo[id] = const_cast<PaDeviceInfo*>(Pa_GetDeviceInfo(id));
         fHostName = new string[fNumHostApi];
-        for ( PaHostApiIndex id = 0; id < fNumHostApi; id++ )
+        for ( id = 0; id < fNumHostApi; id++ )
             fHostName[id] = string ( Pa_GetHostApiInfo(id)->name );
     }
     else
@@ -100,7 +101,7 @@ PaDeviceInfo* PortAudioDevices::GetDeviceFromFullName ( string fullname, PaDevic
     string::size_type separator = fullname.find ( "::", 0 );
     if ( separator == 0 )
         return NULL;
-    char hostname[separator + 9];
+    char* hostname = (char*)malloc(separator + 9);
     fill_n ( hostname, separator + 9, 0 );
     fullname.copy ( hostname, separator );
     //we need the entire hostname, replace shortcuts
@@ -116,6 +117,7 @@ PaDeviceInfo* PortAudioDevices::GetDeviceFromFullName ( string fullname, PaDevic
             ret = fDeviceInfo[dev_id];
         }
     }
+	free(hostname);
     return ret;
 }
 

windows/jack_netdriver.dsp

@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjackservermp.lib ws2_32.lib /nologo /dll /machine:I386 /out:"./Release/bin/jackmp/jack_netdriver.dll" /libpath:"./Release" /libpath:"./Release/bin"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjackservermp.lib ws2_32.lib /nologo /dll /machine:I386 /out:"./Release/bin/jackmp/jack_net.dll" /libpath:"./Release" /libpath:"./Release/bin"
 
 !ELSEIF  "$(CFG)" == "jack_netdriver - Win32 Debug"
 
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjackservermp.lib ws2_32.lib /nologo /dll /debug /machine:I386 /out:"./Debug/bin/jackmp/jack_netdriver.dll" /pdbtype:sept /libpath:"./Debug" /libpath:"./Debug/bin"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjackservermp.lib ws2_32.lib /nologo /dll /debug /machine:I386 /out:"./Debug/bin/jackmp/jack_net.dll" /pdbtype:sept /libpath:"./Debug" /libpath:"./Debug/bin"
 
 !ENDIF 
 

windows/jack_portaudio.dsp

@@ -92,6 +92,10 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
+SOURCE=.\JackPortAudioDevices.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\JackPortAudioDriver.cpp
 # End Source File
 # Begin Source File