comparison main/PreferencesDialog.h @ 940:440ead77632b

Merge from branch cxx11
author Chris Cannam
date Mon, 20 Apr 2015 09:22:46 +0100
parents a16456ca5e71
children c9d87032f3da
comparison
equal deleted inserted replaced
939:2c5f8da27f72 940:440ead77632b
88 88
89 WindowType m_windowType; 89 WindowType m_windowType;
90 int m_spectrogramSmoothing; 90 int m_spectrogramSmoothing;
91 int m_spectrogramXSmoothing; 91 int m_spectrogramXSmoothing;
92 int m_propertyLayout; 92 int m_propertyLayout;
93 float m_tuningFrequency; 93 double m_tuningFrequency;
94 int m_audioDevice; 94 int m_audioDevice;
95 int m_resampleQuality; 95 int m_resampleQuality;
96 bool m_resampleOnLoad; 96 bool m_resampleOnLoad;
97 bool m_networkPermission; 97 bool m_networkPermission;
98 QString m_tempDirRoot; 98 QString m_tempDirRoot;