# HG changeset patch
# User Chris Cannam
# Date 1480957389 0
# Node ID 4c5533df5d7280d2c44c2966ec3e59427c8f907b
# Parent  05d35ce6ea722f31bab7e2fe581ccfe14712fa34# Parent  032bf0b11de9bc30d4cc053dce394fb1ea0d954c
Merge from branch 3.0-integration

diff -r 05d35ce6ea72 -r 4c5533df5d72 .hgsubstate
--- a/.hgsubstate	Mon Dec 05 15:47:40 2016 +0000
+++ b/.hgsubstate	Mon Dec 05 17:03:09 2016 +0000
@@ -7,7 +7,7 @@
 5359bc0783c637ba486a335fbc6757e64f4e83ac icons/scalable
 3257ddb6fff110cc88f3ffeaeefa0f29d5eb3b6f piper-cpp
 5f67a29f0fc7f1b908f7cde4866173a7af337862 sv-dependency-builds
-fb675409297a97468a96c703ee9fa378575c52a6 svapp
-a421e752d22c71a9cd55db40a62f053f61d9ce57 svcore
+fcac6c6b8deb3c78c4c453b4271a198775bd71d7 svapp
+ea28ee929034977f941b9713e82583fc3d9b1312 svcore
 916b62baf7ac87aa5cd2db9c26b51fdefddfc897 svgui
 0eebd22a081a824067bf3d5de65326696feab653 vamp-plugin-sdk
diff -r 05d35ce6ea72 -r 4c5533df5d72 main/MainWindow.cpp
--- a/main/MainWindow.cpp	Mon Dec 05 15:47:40 2016 +0000
+++ b/main/MainWindow.cpp	Mon Dec 05 17:03:09 2016 +0000
@@ -1072,12 +1072,16 @@
 
     menu->addSeparator();
 
+#ifndef Q_OS_MAC
+    // Only on non-Mac platforms -- on the Mac this interacts very
+    // badly with the "native" full-screen mode
     action = new QAction(tr("Go Full-Screen"), this);
     action->setShortcut(tr("F11"));
     action->setStatusTip(tr("Expand the pane area to the whole screen"));
     connect(action, SIGNAL(triggered()), this, SLOT(goFullScreen()));
     m_keyReference->registerShortcut(action);
     menu->addAction(action);
+#endif
 }
 
 void
diff -r 05d35ce6ea72 -r 4c5533df5d72 main/PreferencesDialog.cpp
--- a/main/PreferencesDialog.cpp	Mon Dec 05 15:47:40 2016 +0000
+++ b/main/PreferencesDialog.cpp	Mon Dec 05 17:03:09 2016 +0000
@@ -202,20 +202,6 @@
     connect(audioDevice, SIGNAL(currentIndexChanged(int)),
             this, SLOT(audioDeviceChanged(int)));
     */
-    QComboBox *resampleQuality = new QComboBox;
-
-    int rsq = prefs->getPropertyRangeAndValue("Resample Quality", &min, &max,
-                                              &deflt);
-    m_resampleQuality = rsq;
-
-    for (i = min; i <= max; ++i) {
-        resampleQuality->addItem(prefs->getPropertyValueLabel("Resample Quality", i));
-    }
-
-    resampleQuality->setCurrentIndex(rsq);
-
-    connect(resampleQuality, SIGNAL(currentIndexChanged(int)),
-            this, SLOT(resampleQualityChanged(int)));
 
     QCheckBox *resampleOnLoad = new QCheckBox;
     m_resampleOnLoad = prefs->getResampleOnLoad();
@@ -386,11 +372,6 @@
 //!!!    subgrid->addWidget(new QLabel(tr("Playback audio device:")), row, 0);
 //!!!    subgrid->addWidget(audioDevice, row++, 1, 1, 2);
 
-    subgrid->addWidget(new QLabel(tr("%1:").arg(prefs->getPropertyLabel
-                                                ("Resample Quality"))),
-                       row, 0);
-    subgrid->addWidget(resampleQuality, row++, 1, 1, 2);
-
     subgrid->setRowStretch(row, 10);
     
     m_tabOrdering[GeneralTab] = m_tabs->count();
@@ -641,13 +622,6 @@
 }
 
 void
-PreferencesDialog::resampleQualityChanged(int q)
-{
-    m_resampleQuality = q;
-    m_applyButton->setEnabled(true);
-}
-
-void
 PreferencesDialog::resampleOnLoadChanged(int state)
 {
     m_resampleOnLoad = (state == Qt::Checked);
@@ -783,7 +757,6 @@
     prefs->setPropertyBoxLayout(Preferences::PropertyBoxLayout
                                 (m_propertyLayout));
     prefs->setTuningFrequency(m_tuningFrequency);
-    prefs->setResampleQuality(m_resampleQuality);
     prefs->setResampleOnLoad(m_resampleOnLoad);
     prefs->setUseGaplessMode(m_gapless);
     prefs->setRunPluginsInProcess(m_runPluginsInProcess);
diff -r 05d35ce6ea72 -r 4c5533df5d72 main/PreferencesDialog.h
--- a/main/PreferencesDialog.h	Mon Dec 05 15:47:40 2016 +0000
+++ b/main/PreferencesDialog.h	Mon Dec 05 17:03:09 2016 +0000
@@ -55,7 +55,6 @@
     void propertyLayoutChanged(int layout);
     void tuningFrequencyChanged(double freq);
     void audioDeviceChanged(int device);
-    void resampleQualityChanged(int quality);
     void resampleOnLoadChanged(int state);
     void gaplessModeChanged(int state);
     void vampProcessSeparationChanged(int state);
@@ -101,7 +100,6 @@
     int m_propertyLayout;
     double m_tuningFrequency;
     int m_audioDevice;
-    int m_resampleQuality;
     bool m_resampleOnLoad;
     bool m_gapless;
     bool m_runPluginsInProcess;