# HG changeset patch
# User Chris Cannam
# Date 1402663569 -3600
# Node ID 9b131c32fcb7dcca2b304af8af81e755012a1d48
# Parent  7fa301a4f149129b59991e8557b250c63dbd84a5# Parent  68779eb910c71388a393cad975cee1cb55ab229d
Merge

diff -r 7fa301a4f149 -r 9b131c32fcb7 .hgsubstate
--- a/.hgsubstate	Fri Jun 13 13:45:40 2014 +0100
+++ b/.hgsubstate	Fri Jun 13 13:46:09 2014 +0100
@@ -3,5 +3,5 @@
 b8ce40de83c25bf4585b3a03ddc67d215df31899 pyin
 553a5f65ef64811747a6613f759622d655db63c1 sv-dependency-builds
 b38268e34c097c99d19d7430c83d2f6f54b1f44e svapp
-e88a15c25a4a5323be1b339c03218c9a1001d0f3 svcore
+4c7b4040bd2daac3883a9def0279fae7104ad9a2 svcore
 9c272d39c3e3124c64173404db9ecac3ddccde8e svgui
diff -r 7fa301a4f149 -r 9b131c32fcb7 src/MainWindow.cpp
--- a/src/MainWindow.cpp	Fri Jun 13 13:45:40 2014 +0100
+++ b/src/MainWindow.cpp	Fri Jun 13 13:46:09 2014 +0100
@@ -133,6 +133,7 @@
     cdb->setUseDarkBackground(cdb->addColour(QColor(255, 188, 80), tr("Bright Orange")), true);
 
     Preferences::getInstance()->setResampleOnLoad(true);
+    Preferences::getInstance()->setFixedSampleRate(44100);
     Preferences::getInstance()->setSpectrogramSmoothing
         (Preferences::SpectrogramInterpolated);
 
@@ -414,6 +415,7 @@
     setupFileMenu();
     setupEditMenu();
     setupViewMenu();
+    setupAnalysisMenu();
 
     m_mainMenusCreated = true;
 }
@@ -479,9 +481,7 @@
     menu->addAction(action);
     toolbar->addAction(action);
 
-    icon = il.load("filesave");
-    icon.addPixmap(il.loadPixmap("filesave-22"));
-    action = new QAction(icon, tr("Save Session to Audio &Path"), this);
+    action = new QAction(tr("Save Session to Audio &Path"), this);
     action->setShortcut(tr("Ctrl+Alt+S"));
     action->setStatusTip(tr("Save the current session into a %1 session file with the same filename as the audio but a .ton extension.").arg(QApplication::applicationName()));
     connect(action, SIGNAL(triggered()), this, SLOT(saveSessionInAudioPath()));
@@ -801,6 +801,41 @@
 }
 
 void
+MainWindow::setupAnalysisMenu()
+{
+    if (m_mainMenusCreated) return;
+
+    IconLoader il;
+
+    QAction *action = 0;
+
+    QMenu *menu = menuBar()->addMenu(tr("&Analysis"));
+    menu->setTearOffEnabled(true);
+
+    m_keyReference->setCategory(tr("Analysis"));
+
+    action = new QAction(tr("&Analyse now"), this);
+    action->setShortcut(tr("Ctrl+P"));
+    action->setStatusTip(tr("Analyse audio now to extract pitches and notes. (This will delete all existing pitches and notes.)"));
+    menu->addAction(action);
+    m_keyReference->registerShortcut(action);
+
+    menu->addSeparator();
+
+    action = new QAction(tr("Automatically Analyse &New Audio"), this);
+    action->setCheckable(true);
+    action->setChecked(true);
+    menu->addAction(action);
+
+    action = new QAction(tr("Analyse &Without Frequency-dependent Timing Bias (slow)"), this);
+    action->setCheckable(true);
+    action->setChecked(false);
+    
+    menu->addAction(action);
+
+}
+
+void
 MainWindow::setupHelpMenu()
 {
     QMenu *menu = menuBar()->addMenu(tr("&Help"));
diff -r 7fa301a4f149 -r 9b131c32fcb7 src/MainWindow.h
--- a/src/MainWindow.h	Fri Jun 13 13:45:40 2014 +0100
+++ b/src/MainWindow.h	Fri Jun 13 13:46:09 2014 +0100
@@ -235,6 +235,7 @@
     virtual void setupFileMenu();
     virtual void setupEditMenu();
     virtual void setupViewMenu();
+    virtual void setupAnalysisMenu();
     virtual void setupHelpMenu();
     virtual void setupToolbars();