# HG changeset patch
# User matthiasm
# Date 1402662694 -3600
# Node ID 440190ed14507523f5f81c29ef64d1c06b3e0eca
# Parent  0862da97abc5719bdb146bce943764945184829b# Parent  fd7bdb74c8ec5b946a6e403caca41e987b9d6f29
merge

diff -r 0862da97abc5 -r 440190ed1450 .hgsubstate
--- a/.hgsubstate	Fri Jun 13 13:31:17 2014 +0100
+++ b/.hgsubstate	Fri Jun 13 13:31:34 2014 +0100
@@ -2,6 +2,6 @@
 236814e07bd07473958c1ff89103124536a0c3c8 dataquay
 b8ce40de83c25bf4585b3a03ddc67d215df31899 pyin
 553a5f65ef64811747a6613f759622d655db63c1 sv-dependency-builds
-1f2a4ad79967cf85e976332a508d5161e386bd8d svapp
-e88a15c25a4a5323be1b339c03218c9a1001d0f3 svcore
+88bf6cc732754841ce451c75c3b3581ac8289e5d svapp
+4c7b4040bd2daac3883a9def0279fae7104ad9a2 svcore
 9c272d39c3e3124c64173404db9ecac3ddccde8e svgui
diff -r 0862da97abc5 -r 440190ed1450 src/MainWindow.cpp
--- a/src/MainWindow.cpp	Fri Jun 13 13:31:17 2014 +0100
+++ b/src/MainWindow.cpp	Fri Jun 13 13:31:34 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);