changeset 1642:25153af6c329

Merge

--- a/.hgsubstate	Thu Mar 02 18:12:35 2017 +0000
+++ b/.hgsubstate	Sun Mar 05 17:19:40 2017 +0000
@@ -1,13 +1,13 @@
 692c02f29c999fa355a60220089499924ca94e02 bqaudioio
 fb508f7cdcdc245add2de6811acda46745516716 bqfft
 a867fff0963dd91df0fd99c81d690c1155e73645 bqresample
-4d06ab1a8550d45ab67653f2212da775d79e9a03 bqvec
-146d42909e712134774f0b2a12498b1d841b6e8e checker
+f77d948bde24e667ece98015782db8caf4cb81c4 bqvec
+cf18645ff411a2b292946153109d499fbf69de9f checker
 3768bdde6fdf866aa63fff5bde8d9fa64a8979ef dataquay
 3d2cde3b1ab3d39c7f9e542250c288a9da0f6850 icons/scalable
 d06300b789ea62fcdc61a847b636be9d348682ef piper-cpp
 95867ba8caa86f69fdd57366dbfe2f977dd9cb5d sv-dependency-builds
-c196680910dc00f7b50da76e0ef389ead2b73616 svapp
-7e3532d56abbf8ae449af5de18c224f247e48713 svcore
+77d33ed8e7539c39b44e2f49524b047272bbe5a7 svapp
+0bbf91b05164a42c414b4312e1ff085a7ac023ac svcore
 b3603483228dc6b02f32313132e319b7675ba5c6 svgui
-fb3e0ca3e700c2dc5c75c0749dd85383b2e06da5 vamp-plugin-sdk
+25e023bad200ec8882d5ec331c9675f396d32841 vamp-plugin-sdk

--- a/deploy/win32/sonic-visualiser.wxs	Thu Mar 02 18:12:35 2017 +0000
+++ b/deploy/win32/sonic-visualiser.wxs	Sun Mar 05 17:19:40 2017 +0000
@@ -5,7 +5,7 @@
       Id="*"
       Language="1033"
       Codepage="1252" 
-      Version="3.0.0"
+      Version="3.0.1"
       UpgradeCode="D476941E-65F3-4962-9E72-B40FAAE5DBD0"
       Manufacturer="Queen Mary, University of London">
     

--- a/deploy/win64/sonic-visualiser.wxs	Thu Mar 02 18:12:35 2017 +0000
+++ b/deploy/win64/sonic-visualiser.wxs	Sun Mar 05 17:19:40 2017 +0000
@@ -5,7 +5,7 @@
       Id="*"
       Language="1033"
       Codepage="1252" 
-      Version="3.0.0"
+      Version="3.0.1"
       UpgradeCode="D476941E-65F3-4962-9E72-B40FAAE5DBD0"
       Manufacturer="Queen Mary, University of London">
     

--- a/main/MainWindow.cpp	Thu Mar 02 18:12:35 2017 +0000
+++ b/main/MainWindow.cpp	Sun Mar 05 17:19:40 2017 +0000
@@ -199,6 +199,8 @@
     cdb->setUseDarkBackground(cdb->addColour(QColor(225, 74, 255), tr("Bright Purple")), true);
     cdb->setUseDarkBackground(cdb->addColour(QColor(255, 188, 80), tr("Bright Orange")), true);
 
+    SVDEBUG << "MainWindow: Creating main user interface layout" << endl;
+
     QFrame *frame = new QFrame;
     setCentralWidget(frame);
 
@@ -282,6 +284,8 @@
 
     frame->setLayout(layout);
 
+    SVDEBUG << "MainWindow: Creating menus and toolbars" << endl;
+
 #ifdef Q_OS_MAC
     // Mac doesn't align menu labels when icons are shown: result is messy
     QApplication::setAttribute(Qt::AA_DontShowIconsInMenus);
@@ -313,21 +317,32 @@
     m_unitConverter->hide();
 
     setAudioRecordMode(RecordCreateAdditionalModel);
-    
+
+    SVDEBUG << "MainWindow: Creating new session" << endl;
+
     newSession();
 
     connect(m_midiInput, SIGNAL(eventsAvailable()),
             this, SLOT(midiEventsAvailable()));
 
+    SVDEBUG << "MainWindow: Creating network permission tester" << endl;
+
     NetworkPermissionTester tester(withOSCSupport);
     bool networkPermission = tester.havePermission();
     if (networkPermission) {
         if (withOSCSupport) {
+            SVDEBUG << "MainWindow: Creating OSC queue" << endl;
             startOSCQueue();
         }
+
+        SVDEBUG << "MainWindow: Starting transform population thread" << endl;
         TransformFactory::getInstance()->startPopulationThread();
+
+        SVDEBUG << "MainWindow: Creating surveyer" << endl;
         m_surveyer = new Surveyer
             ("sonicvisualiser.org", "survey23-present.txt", "survey23.php");
+
+        SVDEBUG << "MainWindow: Creating version tester" << endl;
         m_versionTester = new VersionTester
             ("sonicvisualiser.org", "latest-version.txt", SV_VERSION);
         connect(m_versionTester, SIGNAL(newerVersionAvailable(QString)),
@@ -345,6 +360,8 @@
     if (warning != "") {
         QTimer::singleShot(500, this, SLOT(pluginPopulationWarning()));
     }
+
+    SVDEBUG << "MainWindow: Constructor done" << endl;
 }
 
 MainWindow::~MainWindow()

--- a/main/NetworkPermissionTester.cpp	Thu Mar 02 18:12:35 2017 +0000
+++ b/main/NetworkPermissionTester.cpp	Sun Mar 05 17:19:40 2017 +0000
@@ -16,6 +16,8 @@
 
 #include "../version.h"
 
+#include "base/Debug.h"
+
 #include <QWidget>
 #include <QString>
 #include <QSettings>
@@ -37,10 +39,12 @@
     bool permish = false;
 
     if (settings.contains(tag)) {
-	permish = settings.value(tag, false).toBool();
+        permish = settings.value(tag, false).toBool();
+        SVDEBUG << "NetworkPermissionTester: Asked already, result was " << permish << endl;
     } else {
+        SVDEBUG << "NetworkPermissionTester: Asking for permission" << endl;
 
-	QDialog d;
+    QDialog d;
 	d.setWindowTitle(QCoreApplication::translate("NetworkPermissionTester", "Welcome to Sonic Visualiser"));
 
 	QGridLayout *layout = new QGridLayout;
@@ -97,6 +101,8 @@
 
         permish = cb->isChecked();
 	settings.setValue(tag, permish);
+
+        SVDEBUG << "NetworkPermissionTester: asked, answer was " << permish << endl;
     }
 
     settings.endGroup();

--- a/version.h	Thu Mar 02 18:12:35 2017 +0000
+++ b/version.h	Sun Mar 05 17:19:40 2017 +0000
@@ -1,1 +1,1 @@
-#define SV_VERSION "3.0"
+#define SV_VERSION "3.0.1pre1"