diff base/Preferences.h @ 927:5f021c13a4cc tony_integration

Merge from branch "tonioni"
author Chris Cannam
date Tue, 17 Jun 2014 12:54:51 +0100
parents 2896b8872834
children 344c9ea90181
line wrap: on
line diff
--- a/base/Preferences.h	Tue Jun 17 12:52:27 2014 +0100
+++ b/base/Preferences.h	Tue Jun 17 12:54:51 2014 +0100
@@ -66,8 +66,15 @@
 
     QString getTemporaryDirectoryRoot() const { return m_tempDirRoot; }
 
+    /// If we should always resample audio to the same rate, return it; otherwise (the normal case) return 0
+    int getFixedSampleRate() const { return m_fixedSampleRate; }
+
+    /// True if we should resample second or subsequent audio file to match first audio file's rate
     bool getResampleOnLoad() const { return m_resampleOnLoad; }    
     
+    /// True if audio files should be loaded with normalisation (max == 1)
+    bool getNormaliseAudio() const { return m_normaliseAudio; }
+
     enum BackgroundMode {
         BackgroundFromTheme,
         DarkBackground,
@@ -107,7 +114,9 @@
     void setResampleQuality(int quality);
     void setOmitTempsFromRecentFiles(bool omit);
     void setTemporaryDirectoryRoot(QString tempDirRoot);
+    void setFixedSampleRate(int);
     void setResampleOnLoad(bool);
+    void setNormaliseAudio(bool);
     void setBackgroundMode(BackgroundMode mode);
     void setTimeToTextMode(TimeToTextMode mode);
     void setOctaveOfMiddleC(int oct);
@@ -141,7 +150,9 @@
     int m_resampleQuality;
     bool m_omitRecentTemps;
     QString m_tempDirRoot;
+    int m_fixedSampleRate;
     bool m_resampleOnLoad;
+    bool m_normaliseAudio;
     int m_viewFontSize;
     BackgroundMode m_backgroundMode;
     TimeToTextMode m_timeToTextMode;