# HG changeset patch
# User Chris Cannam
# Date 1405678050 -3600
# Node ID 5f7b509a441a518ecda57da7ba804f3d6f281bdb
# Parent  178ffa964096f32ace219b21e0fb2e7e71bde1a2# Parent  6d2ece0fe35637968428395746cdac60f7d687e5
Merge from default branch

diff -r 178ffa964096 -r 5f7b509a441a base/test/test.pro
--- a/base/test/test.pro	Wed Jul 02 17:31:21 2014 +0100
+++ b/base/test/test.pro	Fri Jul 18 11:07:30 2014 +0100
@@ -7,15 +7,34 @@
     INCLUDEPATH += ../../../sv-dependency-builds/win32-mingw/include
     LIBS += -L../../../sv-dependency-builds/win32-mingw/lib
 }
+win32-msvc* {
+    INCLUDEPATH += ../../../sv-dependency-builds/win32-msvc/include
+    LIBS += -L../../../sv-dependency-builds/win32-msvc/lib
+}
+mac* {
+    INCLUDEPATH += ../../../sv-dependency-builds/osx/include
+    LIBS += -L../../../sv-dependency-builds/osx/lib
+}
 
 exists(../../config.pri) {
     include(../../config.pri)
 }
 
-win* {
-    !exists(../../config.pri) {
-        DEFINES += HAVE_BZ2 HAVE_FFTW3 HAVE_FFTW3F HAVE_SNDFILE HAVE_SAMPLERATE HAVE_VAMP HAVE_VAMPHOSTSDK HAVE_RUBBERBAND HAVE_DATAQUAY HAVE_LIBLO HAVE_MAD HAVE_ID3TAG HAVE_PORTAUDIO_2_0
-        LIBS += -lbz2 -lrubberband -lvamp-hostsdk -lfftw3 -lfftw3f -lsndfile -lFLAC -logg -lvorbis -lvorbisenc -lvorbisfile -logg -lmad -lid3tag -lportaudio -lsamplerate -llo -lz -lsord-0 -lserd-0 -lwinmm -lws2_32
+!exists(../../config.pri) {
+
+    CONFIG += release
+    DEFINES += NDEBUG BUILD_RELEASE NO_TIMING
+
+    DEFINES += HAVE_BZ2 HAVE_FFTW3 HAVE_FFTW3F HAVE_SNDFILE HAVE_SAMPLERATE HAVE_VAMP HAVE_VAMPHOSTSDK HAVE_RUBBERBAND HAVE_DATAQUAY HAVE_LIBLO HAVE_MAD HAVE_ID3TAG HAVE_PORTAUDIO_2_0
+
+    LIBS += -lbz2 -lrubberband -lvamp-hostsdk -lfftw3 -lfftw3f -lsndfile -lFLAC -logg -lvorbis -lvorbisenc -lvorbisfile -logg -lmad -lid3tag -lportaudio -lsamplerate -lz -lsord-0 -lserd-0
+
+    win* {
+        LIBS += -llo -lwinmm -lws2_32
+    }
+    macx* {
+        DEFINES += HAVE_COREAUDIO
+        LIBS += -framework CoreAudio -framework CoreMidi -framework AudioUnit -framework AudioToolbox -framework CoreFoundation -framework CoreServices -framework Accelerate
     }
 }
 
diff -r 178ffa964096 -r 5f7b509a441a data/fileio/test/test.pro
--- a/data/fileio/test/test.pro	Wed Jul 02 17:31:21 2014 +0100
+++ b/data/fileio/test/test.pro	Fri Jul 18 11:07:30 2014 +0100
@@ -7,15 +7,34 @@
     INCLUDEPATH += ../../../../sv-dependency-builds/win32-mingw/include
     LIBS += -L../../../../sv-dependency-builds/win32-mingw/lib
 }
+win32-msvc* {
+    INCLUDEPATH += ../../../../sv-dependency-builds/win32-msvc/include
+    LIBS += -L../../../../sv-dependency-builds/win32-msvc/lib
+}
+mac* {
+    INCLUDEPATH += ../../../../sv-dependency-builds/osx/include
+    LIBS += -L../../../../sv-dependency-builds/osx/lib
+}
 
 exists(../../../config.pri) {
     include(../../../config.pri)
 }
 
-win* {
-    !exists(../../../config.pri) {
-        DEFINES += HAVE_BZ2 HAVE_FFTW3 HAVE_FFTW3F HAVE_SNDFILE HAVE_SAMPLERATE HAVE_VAMP HAVE_VAMPHOSTSDK HAVE_RUBBERBAND HAVE_DATAQUAY HAVE_LIBLO HAVE_MAD HAVE_ID3TAG HAVE_PORTAUDIO_2_0
-        LIBS += -lbz2 -lrubberband -lvamp-hostsdk -lfftw3 -lfftw3f -lsndfile -lFLAC -logg -lvorbis -lvorbisenc -lvorbisfile -logg -lmad -lid3tag -lportaudio -lsamplerate -llo -lz -lsord-0 -lserd-0 -lwinmm -lws2_32
+!exists(../../../config.pri) {
+
+    CONFIG += release
+    DEFINES += NDEBUG BUILD_RELEASE NO_TIMING
+
+    DEFINES += HAVE_BZ2 HAVE_FFTW3 HAVE_FFTW3F HAVE_SNDFILE HAVE_SAMPLERATE HAVE_VAMP HAVE_VAMPHOSTSDK HAVE_RUBBERBAND HAVE_DATAQUAY HAVE_LIBLO HAVE_MAD HAVE_ID3TAG HAVE_PORTAUDIO_2_0
+
+    LIBS += -lbz2 -lrubberband -lvamp-hostsdk -lfftw3 -lfftw3f -lsndfile -lFLAC -logg -lvorbis -lvorbisenc -lvorbisfile -logg -lmad -lid3tag -lportaudio -lsamplerate -lz -lsord-0 -lserd-0
+
+    win* {
+        LIBS += -llo -lwinmm -lws2_32
+    }
+    macx* {
+        DEFINES += HAVE_COREAUDIO
+        LIBS += -framework CoreAudio -framework CoreMidi -framework AudioUnit -framework AudioToolbox -framework CoreFoundation -framework CoreServices -framework Accelerate
     }
 }
 
diff -r 178ffa964096 -r 5f7b509a441a data/model/AggregateWaveModel.cpp
--- a/data/model/AggregateWaveModel.cpp	Wed Jul 02 17:31:21 2014 +0100
+++ b/data/model/AggregateWaveModel.cpp	Fri Jul 18 11:07:30 2014 +0100
@@ -231,9 +231,9 @@
 }
 
 void
-AggregateWaveModel::componentModelChanged(int start, int end)
+AggregateWaveModel::componentModelChangedWithin(int start, int end)
 {
-    emit modelChanged(start, end);
+    emit modelChangedWithin(start, end);
 }
 
 void
diff -r 178ffa964096 -r 5f7b509a441a data/model/AggregateWaveModel.h
--- a/data/model/AggregateWaveModel.h	Wed Jul 02 17:31:21 2014 +0100
+++ b/data/model/AggregateWaveModel.h	Fri Jul 18 11:07:30 2014 +0100
@@ -85,12 +85,12 @@
 
 signals:
     void modelChanged();
-    void modelChanged(int, int);
+    void modelChangedWithin(int, int);
     void completionChanged();
 
 protected slots:
     void componentModelChanged();
-    void componentModelChanged(int, int);
+    void componentModelChangedWithin(int, int);
     void componentModelCompletionChanged();
 
 protected:
diff -r 178ffa964096 -r 5f7b509a441a data/model/AlignmentModel.cpp
--- a/data/model/AlignmentModel.cpp	Wed Jul 02 17:31:21 2014 +0100
+++ b/data/model/AlignmentModel.cpp	Fri Jul 18 11:07:30 2014 +0100
@@ -37,8 +37,8 @@
         connect(m_rawPath, SIGNAL(modelChanged()),
                 this, SLOT(pathChanged()));
 
-        connect(m_rawPath, SIGNAL(modelChanged(int, int)),
-                this, SLOT(pathChanged(int, int)));
+        connect(m_rawPath, SIGNAL(modelChangedWithin(int, int)),
+                this, SLOT(pathChangedWithin(int, int)));
         
         connect(m_rawPath, SIGNAL(completionChanged()),
                 this, SLOT(pathCompletionChanged()));
@@ -175,7 +175,7 @@
 }
 
 void
-AlignmentModel::pathChanged(int, int)
+AlignmentModel::pathChangedWithin(int, int)
 {
     if (!m_pathComplete) return;
     constructPath();
diff -r 178ffa964096 -r 5f7b509a441a data/model/AlignmentModel.h
--- a/data/model/AlignmentModel.h	Wed Jul 02 17:31:21 2014 +0100
+++ b/data/model/AlignmentModel.h	Fri Jul 18 11:07:30 2014 +0100
@@ -60,12 +60,12 @@
 
 signals:
     void modelChanged();
-    void modelChanged(int startFrame, int endFrame);
+    void modelChangedWithin(int startFrame, int endFrame);
     void completionChanged();
 
 protected slots:
     void pathChanged();
-    void pathChanged(int startFrame, int endFrame);
+    void pathChangedWithin(int startFrame, int endFrame);
     void pathCompletionChanged();
 
 protected:
diff -r 178ffa964096 -r 5f7b509a441a data/model/ModelDataTableModel.cpp
--- a/data/model/ModelDataTableModel.cpp	Wed Jul 02 17:31:21 2014 +0100
+++ b/data/model/ModelDataTableModel.cpp	Fri Jul 18 11:07:30 2014 +0100
@@ -31,8 +31,8 @@
     Model *baseModel = dynamic_cast<Model *>(m);
 
     connect(baseModel, SIGNAL(modelChanged()), this, SLOT(modelChanged()));
-    connect(baseModel, SIGNAL(modelChanged(int, int)),
-            this, SLOT(modelChanged(int, int)));
+    connect(baseModel, SIGNAL(modelChangedWithin(int, int)),
+            this, SLOT(modelChangedWithin(int, int)));
     connect(baseModel, SIGNAL(aboutToBeDeleted()),
             this, SLOT(modelAboutToBeDeleted()));
 }
@@ -219,7 +219,7 @@
 }
 
 void 
-ModelDataTableModel::modelChanged(int, int)
+ModelDataTableModel::modelChangedWithin(int, int)
 {
     //!!! inefficient
     clearSort();
diff -r 178ffa964096 -r 5f7b509a441a data/model/ModelDataTableModel.h
--- a/data/model/ModelDataTableModel.h	Wed Jul 02 17:31:21 2014 +0100
+++ b/data/model/ModelDataTableModel.h	Fri Jul 18 11:07:30 2014 +0100
@@ -69,7 +69,7 @@
 
 protected slots:
     void modelChanged();
-    void modelChanged(int, int);
+    void modelChangedWithin(int, int);
     void modelAboutToBeDeleted();
 
 protected:
diff -r 178ffa964096 -r 5f7b509a441a data/model/WaveFileModel.cpp
--- a/data/model/WaveFileModel.cpp	Wed Jul 02 17:31:21 2014 +0100
+++ b/data/model/WaveFileModel.cpp	Fri Jul 18 11:07:30 2014 +0100
@@ -197,7 +197,9 @@
     if (start >= m_startFrame) {
         start -= m_startFrame;
     } else {
-        for (int i = 0; i < count; ++i) buffer[i] = 0.f;
+        for (int i = 0; i < count; ++i) {
+            buffer[i] = 0.f;
+        }
         if (count <= m_startFrame - start) {
             return 0;
         } else {
diff -r 178ffa964096 -r 5f7b509a441a data/model/WaveFileModel.h
--- a/data/model/WaveFileModel.h	Wed Jul 02 17:31:21 2014 +0100
+++ b/data/model/WaveFileModel.h	Fri Jul 18 11:07:30 2014 +0100
@@ -63,14 +63,14 @@
     void setStartFrame(int startFrame) { m_startFrame = startFrame; }
 
     virtual int getData(int channel, int start, int count,
-                           float *buffer) const;
+                        float *buffer) const;
 
     virtual int getData(int channel, int start, int count,
-                           double *buffer) const;
+                        double *buffer) const;
 
     virtual int getData(int fromchannel, int tochannel,
-                           int start, int count,
-                           float **buffers) const;
+                        int start, int count,
+                        float **buffers) const;
 
     virtual int getSummaryBlockSize(int desired) const;
 
diff -r 178ffa964096 -r 5f7b509a441a data/model/WritableWaveFileModel.cpp
--- a/data/model/WritableWaveFileModel.cpp	Wed Jul 02 17:31:21 2014 +0100
+++ b/data/model/WritableWaveFileModel.cpp	Fri Jul 18 11:07:30 2014 +0100
@@ -86,8 +86,8 @@
     m_model->setStartFrame(m_startFrame);
 
     connect(m_model, SIGNAL(modelChanged()), this, SIGNAL(modelChanged()));
-    connect(m_model, SIGNAL(modelChanged(int, int)),
-            this, SIGNAL(modelChanged(int, int)));
+    connect(m_model, SIGNAL(modelChangedWithin(int, int)),
+            this, SIGNAL(modelChangedWithin(int, int)));
 }
 
 WritableWaveFileModel::~WritableWaveFileModel()