changeset 222:c7122e70f8ec

Fixes for Windows build

--- a/system/Init.cpp	Thu Jan 25 15:55:12 2007 +0000
+++ b/system/Init.cpp	Thu Jan 25 17:41:00 2007 +0000
@@ -1,92 +1,93 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
-
-/*
-    Sonic Visualiser
-    An audio file viewer and annotation editor.
-    Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2006 Chris Cannam.
-    
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License as
-    published by the Free Software Foundation; either version 2 of the
-    License, or (at your option) any later version.  See the file
-    COPYING included with this distribution for more information.
-*/
-
-#include <QApplication>
-#include <QFont>
-
-#include <iostream>
-
-#ifdef Q_WS_X11
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Xatom.h>
-#include <X11/SM/SMlib.h>
-
-static int handle_x11_error(Display *dpy, XErrorEvent *err)
-{
-    char errstr[256];
-    XGetErrorText(dpy, err->error_code, errstr, 256);
-    if (err->error_code != BadWindow) {
-	std::cerr << "Sonic Visualiser: X Error: "
-		  << errstr << " " << int(err->error_code)
-		  << "\nin major opcode:  "
-		  << int(err->request_code) << std::endl;
-    }
-    return 0;
-}
-#endif
-
-#ifdef Q_WS_WIN32
-
-#include <fcntl.h>
-
-// Set default file open mode to binary
-#undef _fmode
-int _fmode = _O_BINARY;
-
-void redirectStderr()
-{
-    HANDLE stderrHandle = GetStdHandle(STD_ERROR_HANDLE);
-    if (!stderrHandle) return;
-
-    AllocConsole();
-
-    CONSOLE_SCREEN_BUFFER_INFO info;
-    GetConsoleScreenBufferInfo(stderrHandle, &info);
-    info.dwSize.Y = 1000;
-    SetConsoleScreenBufferSize(stderrHandle, info.dwSize);
-
-    int h = _open_osfhandle((long)stderrHandle, _O_TEXT);
-    if (h) {
-        FILE *fd = _fdopen(h, "w");
-        if (fd) {
-            *stderr = *fd;
-            setvbuf(stderr, NULL, _IONBF, 0);
-        }
-    }
-}
-
-#endif
-
-extern void svSystemSpecificInitialisation()
-{
-#ifdef Q_WS_X11
-    XSetErrorHandler(handle_x11_error);
-#endif
-
-#ifdef Q_WS_WIN32
-    redirectStderr();
-    QFont fn = qApp->font();
-    fn.setFamily("Tahoma");
-    qApp->setFont(fn);
-#else
-#ifdef Q_WS_X11
-    QFont fn = qApp->font();
-    fn.setPointSize(fn.pointSize() + 2);
-    qApp->setFont(fn);
-#endif
-#endif
-}
-
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+    Sonic Visualiser
+    An audio file viewer and annotation editor.
+    Centre for Digital Music, Queen Mary, University of London.
+    This file copyright 2006 Chris Cannam.
+    
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
+*/
+
+#include <QApplication>
+#include <QFont>
+
+#include <iostream>
+
+#ifdef Q_WS_X11
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/Xatom.h>
+#include <X11/SM/SMlib.h>
+
+static int handle_x11_error(Display *dpy, XErrorEvent *err)
+{
+    char errstr[256];
+    XGetErrorText(dpy, err->error_code, errstr, 256);
+    if (err->error_code != BadWindow) {
+	std::cerr << "Sonic Visualiser: X Error: "
+		  << errstr << " " << int(err->error_code)
+		  << "\nin major opcode:  "
+		  << int(err->request_code) << std::endl;
+    }
+    return 0;
+}
+#endif
+
+#ifdef Q_WS_WIN32
+
+#include <fcntl.h>
+#include <windows.h>
+
+// Set default file open mode to binary
+//#undef _fmode
+//int _fmode = _O_BINARY;
+
+void redirectStderr()
+{
+    HANDLE stderrHandle = GetStdHandle(STD_ERROR_HANDLE);
+    if (!stderrHandle) return;
+
+    AllocConsole();
+
+    CONSOLE_SCREEN_BUFFER_INFO info;
+    GetConsoleScreenBufferInfo(stderrHandle, &info);
+    info.dwSize.Y = 1000;
+    SetConsoleScreenBufferSize(stderrHandle, info.dwSize);
+
+    int h = _open_osfhandle((long)stderrHandle, _O_TEXT);
+    if (h) {
+        FILE *fd = _fdopen(h, "w");
+        if (fd) {
+            *stderr = *fd;
+            setvbuf(stderr, NULL, _IONBF, 0);
+        }
+    }
+}
+
+#endif
+
+extern void svSystemSpecificInitialisation()
+{
+#ifdef Q_WS_X11
+    XSetErrorHandler(handle_x11_error);
+#endif
+
+#ifdef Q_WS_WIN32
+    redirectStderr();
+    QFont fn = qApp->font();
+    fn.setFamily("Tahoma");
+    qApp->setFont(fn);
+#else
+#ifdef Q_WS_X11
+    QFont fn = qApp->font();
+    fn.setPointSize(fn.pointSize() + 2);
+    qApp->setFont(fn);
+#endif
+#endif
+}
+

--- a/system/System.cpp	Thu Jan 25 15:55:12 2007 +0000
+++ b/system/System.cpp	Thu Jan 25 17:41:00 2007 +0000
@@ -1,259 +1,261 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
-
-/*
-    Sonic Visualiser
-    An audio file viewer and annotation editor.
-    Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2006 Chris Cannam and QMUL.
-    
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License as
-    published by the Free Software Foundation; either version 2 of the
-    License, or (at your option) any later version.  See the file
-    COPYING included with this distribution for more information.
-*/
-
-#include "System.h"
-
-#include <QStringList>
-#include <QString>
-
-#include <stdint.h>
-
-#ifndef _WIN32
-#include <signal.h>
-#include <sys/statvfs.h>
-#endif
-
-#ifdef __APPLE__
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#endif
-
-#include <iostream>
-
-#ifdef _WIN32
-
-extern "C" {
-
-void usleep(unsigned long usec)
-{
-    ::Sleep(usec / 1000);
-}
-
-void gettimeofday(struct timeval *tv, void *tz)
-{
-    union { 
-	long long ns100;  
-	FILETIME ft; 
-    } now; 
-    
-    ::GetSystemTimeAsFileTime(&now.ft); 
-    tv->tv_usec = (long)((now.ns100 / 10LL) % 1000000LL); 
-    tv->tv_sec = (long)((now.ns100 - 116444736000000000LL) / 10000000LL); 
-}
-
-}
-
-#endif
-
-ProcessStatus
-GetProcessStatus(int pid)
-{
-#ifdef _WIN32
-    HANDLE handle = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, pid);
-    if (!handle) {
-        return ProcessNotRunning;
-    } else {
-        CloseHandle(handle);
-        return ProcessRunning;
-    }
-#else
-    if (kill(getpid(), 0) == 0) {
-        if (kill(pid, 0) == 0) {
-            return ProcessRunning;
-        } else {
-            return ProcessNotRunning;
-        }
-    } else {
-        return UnknownProcessStatus;
-    }
-#endif
-}
-
-#ifdef _WIN32
-/*  MEMORYSTATUSEX is missing from older Windows headers, so define a
-    local replacement.  This trick from MinGW source code.  Ugh */
-typedef struct
-{
-    DWORD dwLength;
-    DWORD dwMemoryLoad;
-    DWORDLONG ullTotalPhys;
-    DWORDLONG ullAvailPhys;
-    DWORDLONG ullTotalPageFile;
-    DWORDLONG ullAvailPageFile;
-    DWORDLONG ullTotalVirtual;
-    DWORDLONG ullAvailVirtual;
-    DWORDLONG ullAvailExtendedVirtual;
-} lMEMORYSTATUSEX;
-typedef WINBOOL (WINAPI *PFN_MS_EX) (lMEMORYSTATUSEX*);
-#endif
-
-void
-GetRealMemoryMBAvailable(int &available, int &total)
-{
-    available = -1;
-    total = -1;
-
-#ifdef _WIN32
-
-    static bool checked = false;
-    static bool exFound = false;
-    static PFN_MS_EX ex;
-
-    if (!checked) {
-
-        HMODULE h = GetModuleHandle("kernel32.dll");
-
-        if (h) {
-            if ((ex = (PFN_MS_EX)GetProcAddress(h, "GlobalMemoryStatusEx"))) {
-                exFound = true;
-            }
-        }
-        
-        checked = true;
-    }
-
-    DWORDLONG avail = 0;
-    DWORDLONG total = 0;
-
-    if (exFound) {
-
-        lMEMORYSTATUSEX lms;
-	lms.dwLength = sizeof(lms);
-	if (!ex(&lms)) {
-            std::cerr << "WARNING: GlobalMemoryStatusEx failed: error code "
-                      << GetLastError() << std::endl;
-            return;
-        }
-        avail = lms.ullAvailPhys;
-        total = lms.ullTotalPhys;
-
-    } else {
-
-        /* Fall back to GlobalMemoryStatus which is always available.
-           but returns wrong results for physical memory > 4GB  */
-
-	MEMORYSTATUS ms;
-	GlobalMemoryStatus(&ms);
-	avail = ms.dwAvailPhys;
-        total = ms.dwTotalPhys;
-    }
-
-    DWORDLONG size = avail / 1048576;
-    if (size > INT_MAX) size = INT_MAX;
-    available = int(size);
-
-    size = total / 1048576;
-    if (size > INT_MAX) size = INT_MAX;
-    total = int(size);
-
-    return;
-
-#else
-#ifdef __APPLE__
-
-    unsigned int val;
-    int mib[2];
-    size_t size_sys;
-    
-    mib[0] = CTL_HW;
-
-    mib[1] = HW_PHYSMEM;
-    size_sys = sizeof(val);
-    sysctl(mib, 2, &val, &size_sys, NULL, 0);
-    if (val) total = val / 1048576;
-
-    mib[1] = HW_USERMEM;
-    size_sys = sizeof(val);
-    sysctl(mib, 2, &val, &size_sys, NULL, 0);
-    if (val) available = val / 1048576;
-
-    return;
-
-#else
-
-    FILE *meminfo = fopen("/proc/meminfo", "r");
-    if (!meminfo) return;
-
-    char buf[256];
-    while (!feof(meminfo)) {
-        fgets(buf, 256, meminfo);
-        bool isMemFree = (strncmp(buf, "MemFree:", 8) == 0);
-        bool isMemTotal = (!isMemFree && (strncmp(buf, "MemTotal:", 9) == 0));
-        if (isMemFree || isMemTotal) {
-            QString line = QString(buf).trimmed();
-            QStringList elements = line.split(' ', QString::SkipEmptyParts);
-            QString unit = "kB";
-            if (elements.size() > 2) unit = elements[2];
-            int size = elements[1].toInt();
-//            std::cerr << "have size \"" << size << "\", unit \""
-//                      << unit.toStdString() << "\"" << std::endl;
-            if (unit.toLower() == "gb") size = size * 1024;
-            else if (unit.toLower() == "mb") size = size;
-            else if (unit.toLower() == "kb") size = size / 1024;
-            else size = size / 1048576;
-
-            if (isMemFree) available = size;
-            else total = size;
-        }
-        if (available != -1 && total != -1) {
-            fclose(meminfo);
-            return;
-        }
-    }
-    fclose(meminfo);
-
-    return;
-
-#endif
-#endif
-}
-
-int
-GetDiscSpaceMBAvailable(const char *path)
-{
-#ifdef _WIN32
-    __int64 available, total, totalFree;
-    if (GetDiskFreeSpaceEx(path, &available, &total, &totalFree)) {
-        available /= 1048576;
-        if (available > INT_MAX) available = INT_MAX;
-        return int(available);
-    } else {
-        std::cerr << "WARNING: GetDiskFreeSpaceEx failed: error code "
-                  << GetLastError() << std::endl;
-        return -1;
-    }
-#else
-    struct statvfs buf;
-    if (!statvfs(path, &buf)) {
-        // do the multiplies and divides in this order to reduce the
-        // likelihood of arithmetic overflow
-        std::cerr << "statvfs(" << path << ") says available: " << buf.f_bavail << ", block size: " << buf.f_bsize << std::endl;
-        uint64_t available = ((buf.f_bavail / 1024) * buf.f_bsize) / 1024;
-        if (available > INT_MAX) available = INT_MAX;
-        return int(available);
-    } else {
-        perror("statvfs failed");
-        return -1;
-    }
-#endif
-}
-    
-
-double mod(double x, double y) { return x - (y * floor(x / y)); }
-float modf(float x, float y) { return x - (y * floorf(x / y)); }
-
-double princarg(double a) { return mod(a + M_PI, -2 * M_PI) + M_PI; }
-float princargf(float a) { return modf(a + M_PI, -2 * M_PI) + M_PI; }
-
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+    Sonic Visualiser
+    An audio file viewer and annotation editor.
+    Centre for Digital Music, Queen Mary, University of London.
+    This file copyright 2006 Chris Cannam and QMUL.
+    
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
+*/
+
+#include "System.h"
+
+#include <QStringList>
+#include <QString>
+
+#include <stdint.h>
+
+#ifndef _WIN32
+#include <signal.h>
+#include <sys/statvfs.h>
+#include <windows.h>
+#endif
+
+#ifdef __APPLE__
+#include <sys/param.h>
+#include <sys/sysctl.h>
+#endif
+
+#include <iostream>
+
+#ifdef _WIN32
+
+extern "C" {
+
+void usleep(unsigned long usec)
+{
+    ::Sleep(usec / 1000);
+}
+
+void gettimeofday(struct timeval *tv, void *tz)
+{
+    union { 
+	long long ns100;  
+	FILETIME ft; 
+    } now; 
+    
+    ::GetSystemTimeAsFileTime(&now.ft); 
+    tv->tv_usec = (long)((now.ns100 / 10LL) % 1000000LL); 
+    tv->tv_sec = (long)((now.ns100 - 116444736000000000LL) / 10000000LL); 
+}
+
+}
+
+#endif
+
+ProcessStatus
+GetProcessStatus(int pid)
+{
+#ifdef _WIN32
+    HANDLE handle = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, pid);
+    if (!handle) {
+        return ProcessNotRunning;
+    } else {
+        CloseHandle(handle);
+        return ProcessRunning;
+    }
+#else
+    if (kill(getpid(), 0) == 0) {
+        if (kill(pid, 0) == 0) {
+            return ProcessRunning;
+        } else {
+            return ProcessNotRunning;
+        }
+    } else {
+        return UnknownProcessStatus;
+    }
+#endif
+}
+
+#ifdef _WIN32
+/*  MEMORYSTATUSEX is missing from older Windows headers, so define a
+    local replacement.  This trick from MinGW source code.  Ugh */
+typedef struct
+{
+    DWORD dwLength;
+    DWORD dwMemoryLoad;
+    DWORDLONG ullTotalPhys;
+    DWORDLONG ullAvailPhys;
+    DWORDLONG ullTotalPageFile;
+    DWORDLONG ullAvailPageFile;
+    DWORDLONG ullTotalVirtual;
+    DWORDLONG ullAvailVirtual;
+    DWORDLONG ullAvailExtendedVirtual;
+} lMEMORYSTATUSEX;
+typedef WINBOOL (WINAPI *PFN_MS_EX) (lMEMORYSTATUSEX*);
+#endif
+
+void
+GetRealMemoryMBAvailable(int &available, int &total)
+{
+    available = -1;
+    total = -1;
+
+#ifdef _WIN32
+
+    static bool checked = false;
+    static bool exFound = false;
+    static PFN_MS_EX ex;
+
+    if (!checked) {
+
+        HMODULE h = GetModuleHandleA("kernel32.dll");
+
+        if (h) {
+            if ((ex = (PFN_MS_EX)GetProcAddress(h, "GlobalMemoryStatusEx"))) {
+                exFound = true;
+            }
+        }
+        
+        checked = true;
+    }
+
+    DWORDLONG wavail = 0;
+    DWORDLONG wtotal = 0;
+
+    if (exFound) {
+
+        lMEMORYSTATUSEX lms;
+	lms.dwLength = sizeof(lms);
+	if (!ex(&lms)) {
+            std::cerr << "WARNING: GlobalMemoryStatusEx failed: error code "
+                      << GetLastError() << std::endl;
+            return;
+        }
+        wavail = lms.ullAvailPhys;
+        wtotal = lms.ullTotalPhys;
+
+    } else {
+
+        /* Fall back to GlobalMemoryStatus which is always available.
+           but returns wrong results for physical memory > 4GB  */
+
+	MEMORYSTATUS ms;
+	GlobalMemoryStatus(&ms);
+	wavail = ms.dwAvailPhys;
+        wtotal = ms.dwTotalPhys;
+    }
+
+    DWORDLONG size = wavail / 1048576;
+    if (size > INT_MAX) size = INT_MAX;
+    available = int(size);
+
+    size = wtotal / 1048576;
+    if (size > INT_MAX) size = INT_MAX;
+    total = int(size);
+
+    return;
+
+#else
+#ifdef __APPLE__
+
+    unsigned int val;
+    int mib[2];
+    size_t size_sys;
+    
+    mib[0] = CTL_HW;
+
+    mib[1] = HW_PHYSMEM;
+    size_sys = sizeof(val);
+    sysctl(mib, 2, &val, &size_sys, NULL, 0);
+    if (val) total = val / 1048576;
+
+    mib[1] = HW_USERMEM;
+    size_sys = sizeof(val);
+    sysctl(mib, 2, &val, &size_sys, NULL, 0);
+    if (val) available = val / 1048576;
+
+    return;
+
+#else
+
+    FILE *meminfo = fopen("/proc/meminfo", "r");
+    if (!meminfo) return;
+
+    char buf[256];
+    while (!feof(meminfo)) {
+        fgets(buf, 256, meminfo);
+        bool isMemFree = (strncmp(buf, "MemFree:", 8) == 0);
+        bool isMemTotal = (!isMemFree && (strncmp(buf, "MemTotal:", 9) == 0));
+        if (isMemFree || isMemTotal) {
+            QString line = QString(buf).trimmed();
+            QStringList elements = line.split(' ', QString::SkipEmptyParts);
+            QString unit = "kB";
+            if (elements.size() > 2) unit = elements[2];
+            int size = elements[1].toInt();
+//            std::cerr << "have size \"" << size << "\", unit \""
+//                      << unit.toStdString() << "\"" << std::endl;
+            if (unit.toLower() == "gb") size = size * 1024;
+            else if (unit.toLower() == "mb") size = size;
+            else if (unit.toLower() == "kb") size = size / 1024;
+            else size = size / 1048576;
+
+            if (isMemFree) available = size;
+            else total = size;
+        }
+        if (available != -1 && total != -1) {
+            fclose(meminfo);
+            return;
+        }
+    }
+    fclose(meminfo);
+
+    return;
+
+#endif
+#endif
+}
+
+int
+GetDiscSpaceMBAvailable(const char *path)
+{
+#ifdef _WIN32
+    ULARGE_INTEGER available, total, totalFree;
+    if (GetDiskFreeSpaceExA(path, &available, &total, &totalFree)) {
+	  __int64 a = available.QuadPart;
+        a /= 1048576;
+        if (a > INT_MAX) a = INT_MAX;
+        return int(a);
+    } else {
+        std::cerr << "WARNING: GetDiskFreeSpaceEx failed: error code "
+                  << GetLastError() << std::endl;
+        return -1;
+    }
+#else
+    struct statvfs buf;
+    if (!statvfs(path, &buf)) {
+        // do the multiplies and divides in this order to reduce the
+        // likelihood of arithmetic overflow
+        std::cerr << "statvfs(" << path << ") says available: " << buf.f_bavail << ", block size: " << buf.f_bsize << std::endl;
+        uint64_t available = ((buf.f_bavail / 1024) * buf.f_bsize) / 1024;
+        if (available > INT_MAX) available = INT_MAX;
+        return int(available);
+    } else {
+        perror("statvfs failed");
+        return -1;
+    }
+#endif
+}
+    
+
+double mod(double x, double y) { return x - (y * floor(x / y)); }
+float modf(float x, float y) { return x - (y * floorf(x / y)); }
+
+double princarg(double a) { return mod(a + M_PI, -2 * M_PI) + M_PI; }
+float princargf(float a) { return modf(a + M_PI, -2 * M_PI) + M_PI; }
+