# HG changeset patch # User matthiasm # Date 1402674635 -3600 # Node ID 9352a51999532b4882f3556fccac71e724cf8e31 # Parent b5ed315a8b934ed9b64ce4af6d7c70a1009cff1e# Parent 6f334b0b5a902da653ff943928f27b1685001843 merge diff -r b5ed315a8b93 -r 9352a5199953 .hgsubstate --- a/.hgsubstate Fri Jun 13 16:50:17 2014 +0100 +++ b/.hgsubstate Fri Jun 13 16:50:35 2014 +0100 @@ -3,5 +3,5 @@ 27eee0f7a4f66b3dc39bc3c83d9c3f93f3845cc1 pyin 553a5f65ef64811747a6613f759622d655db63c1 sv-dependency-builds 5302c548adadd5e3ddb5fd2eafa45ce3033183e7 svapp -4c7b4040bd2daac3883a9def0279fae7104ad9a2 svcore +9911b8cb53bc8e61f4da5e9de8a5ec675506bd0f svcore 7717751f44070920714ed7885b409332556944db svgui diff -r b5ed315a8b93 -r 9352a5199953 src/MainWindow.cpp --- a/src/MainWindow.cpp Fri Jun 13 16:50:17 2014 +0100 +++ b/src/MainWindow.cpp Fri Jun 13 16:50:35 2014 +0100 @@ -136,6 +136,7 @@ Preferences::getInstance()->setFixedSampleRate(44100); Preferences::getInstance()->setSpectrogramSmoothing (Preferences::SpectrogramInterpolated); + Preferences::getInstance()->setNormaliseAudio(true); QSettings settings;