Update to new combined build

main/main.cpp

@@ -1,15 +1,24 @@
 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
 
 /*
-    Rubber Band
+    Rubber Band Library
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2011 Chris Cannam.
-    
+    Copyright 2007-2012 Particular Programs Ltd.
+
     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.
+
+    Alternatively, if you have a valid commercial licence for the
+    Rubber Band Library obtained by agreement with the copyright
+    holders, you may redistribute and/or modify it under the terms
+    described in that licence.
+
+    If you wish to distribute code using the Rubber Band Library
+    under terms other than those of the GNU General Public License,
+    you must obtain a valid commercial licence before doing so.
 */
 
 #include "rubberband/RubberBandStretcher.h"
@@ -26,9 +35,13 @@
 
 #include "system/sysutils.h"
 
+#ifdef __MSVC__
+#include "getopt/getopt.h"
+#else
 #include <getopt.h>
 #include <unistd.h>
 #include <sys/time.h>
+#endif
 
 #include "base/Profiler.h"
 
@@ -39,6 +52,9 @@ using namespace RubberBand;
 using RubberBand::gettimeofday;
 #endif
 
+#ifdef __MSVC__
+using RubberBand::usleep;
+#endif
 
 double tempo_convert(const char *str)
 {
@@ -183,7 +199,7 @@ int main(int argc, char **argv)
         cerr << endl;
 	cerr << "Rubber Band" << endl;
         cerr << "An audio time-stretching and pitch-shifting library and utility program." << endl;
-	cerr << "Copyright 2011 Chris Cannam.  Distributed under the GNU General Public License." << endl;
+	cerr << "Copyright 2007-2012 Particular Programs Ltd." << endl;
         cerr << endl;
 	cerr << "   Usage: " << argv[0] << " [options] <infile.wav> <outfile.wav>" << endl;
         cerr << endl;