* Some code rearrangement

* Threading fixes (corrections to condition usage)
* Avoid a potential hang when faced with some peculiar stretch factors
* More modular calls out to vectorizable functions
* Solaris build fixes
* Bump version number

src/system/sysutils.h

@@ -0,0 +1,111 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+    Rubber Band
+    An audio time-stretching and pitch-shifting library.
+    Copyright 2007-2009 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.
+*/
+
+#ifndef _RUBBERBAND_SYSUTILS_H_
+#define _RUBBERBAND_SYSUTILS_H_
+
+#ifdef __MSVC__
+#include <float_cast/float_cast.h>
+#define R__ __restrict
+#endif
+
+#ifdef __GNUC__
+#define R__ __restrict__
+#endif
+
+#ifndef R__
+#define R__
+#endif
+
+#ifdef __MINGW32__
+#include <malloc.h>
+#endif
+
+#ifdef __MSVC__
+#define alloca _alloca
+#define getpid _getpid
+#endif
+
+#ifdef __MSVC__
+#define uint8_t unsigned __int8
+#define uint16_t unsigned __int16
+#define uint32_t unsigned __int32
+#define ssize_t long
+#else
+#include <stdint.h>
+#endif
+
+#include <math.h>
+
+namespace RubberBand {
+
+extern const char *system_get_platform_tag();
+extern bool system_is_multiprocessor();
+extern void system_specific_initialise();
+extern void system_specific_application_initialise();
+
+#ifdef _WIN32
+
+struct timeval { long tv_sec; long tv_usec; };
+void gettimeofday(struct timeval *p, void *tz);
+
+void usleep(unsigned long);
+
+#endif
+
+enum ProcessStatus { ProcessRunning, ProcessNotRunning, UnknownProcessStatus };
+extern ProcessStatus GetProcessStatus(int pid);
+
+inline double mod(double x, double y) { return x - (y * floor(x / y)); }
+inline float modf(float x, float y) { return x - (y * float(floor(x / y))); }
+
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
+inline double princarg(double a) { return mod(a + M_PI, -2.0 * M_PI) + M_PI; }
+inline float princargf(float a) { return modf(a + (float)M_PI, -2.f * (float)M_PI) + (float)M_PI; }
+
+} // end namespace
+
+// The following should be functions in the RubberBand namespace, really
+
+#ifdef _WIN32
+
+#define MLOCK(a,b)   1
+#define MUNLOCK(a,b) 1
+#define MUNLOCK_SAMPLEBLOCK(a) 1
+
+#define DLOPEN(a,b)  LoadLibrary((a).toStdWString().c_str())
+#define DLSYM(a,b)   GetProcAddress((HINSTANCE)(a),(b))
+#define DLCLOSE(a)   FreeLibrary((HINSTANCE)(a))
+#define DLERROR()    ""
+
+#else
+
+#include <sys/mman.h>
+#include <dlfcn.h>
+
+#define MLOCK(a,b)   ::mlock((char *)(a),(b))
+#define MUNLOCK(a,b) (::munlock((char *)(a),(b)) ? (::perror("munlock failed"), 0) : 0)
+#define MUNLOCK_SAMPLEBLOCK(a) do { if (!(a).empty()) { const float &b = *(a).begin(); MUNLOCK(&b, (a).capacity() * sizeof(float)); } } while(0);
+
+#define DLOPEN(a,b)  dlopen((a).toStdString().c_str(),(b))
+#define DLSYM(a,b)   dlsym((a),(b))
+#define DLCLOSE(a)   dlclose((a))
+#define DLERROR()    dlerror()
+
+#endif
+
+#endif