Mercurial > hg > svcore
comparison base/Preferences.h @ 1036:682d64f05e72
Merge
author | Chris Cannam |
---|---|
date | Mon, 02 Mar 2015 17:21:34 +0000 |
parents | 344c9ea90181 |
children | cc27f35aa75c |
comparison
equal
deleted
inserted
replaced
1035:d74ebd2d2c49 | 1036:682d64f05e72 |
---|---|
91 TimeToText50Frame, | 91 TimeToText50Frame, |
92 TimeToText60Frame | 92 TimeToText60Frame |
93 }; | 93 }; |
94 TimeToTextMode getTimeToTextMode() const { return m_timeToTextMode; } | 94 TimeToTextMode getTimeToTextMode() const { return m_timeToTextMode; } |
95 | 95 |
96 bool getShowHMS() const { return m_showHMS; } | |
97 | |
96 int getOctaveOfMiddleC() const { | 98 int getOctaveOfMiddleC() const { |
97 // weed out unsupported octaves | 99 // weed out unsupported octaves |
98 return getOctaveOfMiddleCInSystem(getSystemWithMiddleCInOctave(m_octave)); | 100 return getOctaveOfMiddleCInSystem(getSystemWithMiddleCInOctave(m_octave)); |
99 } | 101 } |
100 int getOctaveOfLowestMIDINote() const { | 102 int getOctaveOfLowestMIDINote() const { |
117 void setFixedSampleRate(int); | 119 void setFixedSampleRate(int); |
118 void setResampleOnLoad(bool); | 120 void setResampleOnLoad(bool); |
119 void setNormaliseAudio(bool); | 121 void setNormaliseAudio(bool); |
120 void setBackgroundMode(BackgroundMode mode); | 122 void setBackgroundMode(BackgroundMode mode); |
121 void setTimeToTextMode(TimeToTextMode mode); | 123 void setTimeToTextMode(TimeToTextMode mode); |
124 void setShowHMS(bool show); | |
122 void setOctaveOfMiddleC(int oct); | 125 void setOctaveOfMiddleC(int oct); |
123 void setViewFontSize(int size); | 126 void setViewFontSize(int size); |
124 void setShowSplash(bool); | 127 void setShowSplash(bool); |
125 | 128 |
126 private: | 129 private: |
154 bool m_resampleOnLoad; | 157 bool m_resampleOnLoad; |
155 bool m_normaliseAudio; | 158 bool m_normaliseAudio; |
156 int m_viewFontSize; | 159 int m_viewFontSize; |
157 BackgroundMode m_backgroundMode; | 160 BackgroundMode m_backgroundMode; |
158 TimeToTextMode m_timeToTextMode; | 161 TimeToTextMode m_timeToTextMode; |
162 bool m_showHMS; | |
159 int m_octave; | 163 int m_octave; |
160 bool m_showSplash; | 164 bool m_showSplash; |
161 }; | 165 }; |
162 | 166 |
163 #endif | 167 #endif |