changeset 1063:1f92fc7a6b05 3.0-integration

Merge from branch "recording"

--- a/.hgsubstate	Thu Sep 17 13:29:31 2015 +0100
+++ b/.hgsubstate	Thu Sep 17 13:46:20 2015 +0100
@@ -1,9 +1,9 @@
-187d6a02a90e62f392b4ec6ca00947d346c9d6dc bqaudioio
+5f4dce69ab3eb1cbe38339f7320e9aea9568c369 bqaudioio
 62c40e7f9231e459091c3352c5d4b6001be127ca bqresample
 94b6ebd5e8ab897e5b294fd77b4113e8d6d78b13 bqvec
 d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay
 c6ca18292bfe9ba9bd67b0aa59320893f2954333 icons/scalable
 55ece8862b6d3a54aad271a53f9c1615e5d3bcf8 sv-dependency-builds
-52c0aff69478e2fcb6a3ae9e7aaa56ee3f07c87a svapp
+111e976f9ed4cc78e552fa55a62b7532e5eb834d svapp
 2c43f99040689b482b52971b1edef6b697427f21 svcore
 8588b97f1d1c324a9d2c14e646b07fc00442172f svgui

--- a/bq.pro	Thu Sep 17 13:29:31 2015 +0100
+++ b/bq.pro	Thu Sep 17 13:46:20 2015 +0100
@@ -23,11 +23,12 @@
     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
+    DEFINES += HAVE_BZ2 HAVE_FFTW3 HAVE_FFTW3F HAVE_SNDFILE HAVE_LIBSAMPLERATE HAVE_VAMP HAVE_VAMPHOSTSDK HAVE_RUBBERBAND HAVE_DATAQUAY HAVE_LIBLO HAVE_MAD HAVE_ID3TAG HAVE_PORTAUDIO
 
     LIBS += -lbz2 -lrubberband -lvamp-hostsdk -lfftw3 -lfftw3f -lsndfile -lFLAC -logg -lvorbis -lvorbisenc -lvorbisfile -logg -lmad -lid3tag -lportaudio -lsamplerate -lz -lsord-0 -lserd-0 -llo
 
     win* {
+        DEFINES += USE_OWN_ALIGNED_MALLOC _USE_MATH_DEFINES
         LIBS += -lwinmm -lws2_32
     }
     macx* {

--- a/main/MainWindow.cpp	Thu Sep 17 13:29:31 2015 +0100
+++ b/main/MainWindow.cpp	Thu Sep 17 13:46:20 2015 +0100
@@ -303,6 +303,8 @@
     m_activityLog->hide();
 
     m_unitConverter->hide();
+
+    setAudioRecordMode(RecordCreateAdditionalModel);
     
     newSession();
 
@@ -585,6 +587,13 @@
 
     menu->addSeparator();
 
+    action = new QAction(tr("Browse Recorded Audio Folder"), this);
+    action->setStatusTip(tr("Open the Recorded Audio folder in the system file browser"));
+    connect(action, SIGNAL(triggered()), this, SLOT(browseRecordedAudio()));
+    menu->addAction(action);
+
+    menu->addSeparator();
+
     QString templatesMenuLabel = tr("Apply Session Template");
     m_templatesMenu = menu->addMenu(templatesMenuLabel);
     m_templatesMenu->setTearOffEnabled(true);
@@ -2057,6 +2066,7 @@
     m_keyReference->registerShortcut(m_ffwdEndAction);
 
     menu->addAction(m_playAction);
+    menu->addAction(m_recordAction);
     menu->addAction(m_playSelectionAction);
     menu->addAction(m_playLoopAction);
     menu->addAction(m_soloAction);
@@ -2075,6 +2085,7 @@
     menu->addSeparator();
 
     m_rightButtonPlaybackMenu->addAction(m_playAction);
+    m_rightButtonPlaybackMenu->addAction(m_recordAction);
     m_rightButtonPlaybackMenu->addAction(m_playSelectionAction);
     m_rightButtonPlaybackMenu->addAction(m_playLoopAction);
     m_rightButtonPlaybackMenu->addAction(m_soloAction);
@@ -2896,6 +2907,17 @@
 }
 
 void
+MainWindow::browseRecordedAudio()
+{
+    if (!m_recordTarget) return;
+
+    QString path = m_recordTarget->getRecordFolder();
+    if (path == "") return;
+
+    openLocalFolder(path);
+}
+
+void
 MainWindow::newSession()
 {
     if (!checkSaveModified()) return;

--- a/main/MainWindow.h	Thu Sep 17 13:29:31 2015 +0100
+++ b/main/MainWindow.h	Thu Sep 17 13:46:20 2015 +0100
@@ -59,6 +59,7 @@
     virtual void importLayer();
     virtual void exportLayer();
     virtual void exportImage();
+    virtual void browseRecordedAudio();
     virtual void saveSession();
     virtual void saveSessionAs();
     virtual void newSession();

--- a/sv.pro	Thu Sep 17 13:29:31 2015 +0100
+++ b/sv.pro	Thu Sep 17 13:46:20 2015 +0100
@@ -3,11 +3,11 @@
 
 win32-g++ {
     INCLUDEPATH += sv-dependency-builds/win32-mingw/include
-    LIBS += -Lsv-dependency-builds/win32-mingw/lib
+    LIBS += -Lrelease -Lsv-dependency-builds/win32-mingw/lib
 }
 win32-msvc* {
     INCLUDEPATH += sv-dependency-builds/win32-msvc/include
-    LIBS += -Lsv-dependency-builds/win32-msvc/lib
+    LIBS += -Lrelease -Lsv-dependency-builds/win32-msvc/lib
 }
 mac* {
     INCLUDEPATH += sv-dependency-builds/osx/include