comparison base/Preferences.h @ 1038:cc27f35aa75c cxx11

Introducing the signed 64-bit frame index type, and fixing build failures from inclusion of -Wconversion with -Werror. Not finished yet.
author Chris Cannam
date Tue, 03 Mar 2015 15:18:24 +0000
parents 344c9ea90181
children 26cf6d5251ec
comparison
equal deleted inserted replaced
1037:bf0e5944289b 1038:cc27f35aa75c
47 SpectrogramXInterpolated 47 SpectrogramXInterpolated
48 }; 48 };
49 49
50 SpectrogramSmoothing getSpectrogramSmoothing() const { return m_spectrogramSmoothing; } 50 SpectrogramSmoothing getSpectrogramSmoothing() const { return m_spectrogramSmoothing; }
51 SpectrogramXSmoothing getSpectrogramXSmoothing() const { return m_spectrogramXSmoothing; } 51 SpectrogramXSmoothing getSpectrogramXSmoothing() const { return m_spectrogramXSmoothing; }
52 float getTuningFrequency() const { return m_tuningFrequency; } 52 double getTuningFrequency() const { return m_tuningFrequency; }
53 WindowType getWindowType() const { return m_windowType; } 53 WindowType getWindowType() const { return m_windowType; }
54 int getResampleQuality() const { return m_resampleQuality; } 54 int getResampleQuality() const { return m_resampleQuality; }
55 55
56 //!!! harmonise with PaneStack 56 //!!! harmonise with PaneStack
57 enum PropertyBoxLayout { 57 enum PropertyBoxLayout {
108 public slots: 108 public slots:
109 virtual void setProperty(const PropertyName &, int); 109 virtual void setProperty(const PropertyName &, int);
110 110
111 void setSpectrogramSmoothing(SpectrogramSmoothing smoothing); 111 void setSpectrogramSmoothing(SpectrogramSmoothing smoothing);
112 void setSpectrogramXSmoothing(SpectrogramXSmoothing smoothing); 112 void setSpectrogramXSmoothing(SpectrogramXSmoothing smoothing);
113 void setTuningFrequency(float freq); 113 void setTuningFrequency(double freq);
114 void setPropertyBoxLayout(PropertyBoxLayout layout); 114 void setPropertyBoxLayout(PropertyBoxLayout layout);
115 void setWindowType(WindowType type); 115 void setWindowType(WindowType type);
116 void setResampleQuality(int quality); 116 void setResampleQuality(int quality);
117 void setOmitTempsFromRecentFiles(bool omit); 117 void setOmitTempsFromRecentFiles(bool omit);
118 void setTemporaryDirectoryRoot(QString tempDirRoot); 118 void setTemporaryDirectoryRoot(QString tempDirRoot);
145 static int getOctaveOfMiddleCInSystem(OctaveNumberingSystem s); 145 static int getOctaveOfMiddleCInSystem(OctaveNumberingSystem s);
146 static OctaveNumberingSystem getSystemWithMiddleCInOctave(int o); 146 static OctaveNumberingSystem getSystemWithMiddleCInOctave(int o);
147 147
148 SpectrogramSmoothing m_spectrogramSmoothing; 148 SpectrogramSmoothing m_spectrogramSmoothing;
149 SpectrogramXSmoothing m_spectrogramXSmoothing; 149 SpectrogramXSmoothing m_spectrogramXSmoothing;
150 float m_tuningFrequency; 150 double m_tuningFrequency;
151 PropertyBoxLayout m_propertyBoxLayout; 151 PropertyBoxLayout m_propertyBoxLayout;
152 WindowType m_windowType; 152 WindowType m_windowType;
153 int m_resampleQuality; 153 int m_resampleQuality;
154 bool m_omitRecentTemps; 154 bool m_omitRecentTemps;
155 QString m_tempDirRoot; 155 QString m_tempDirRoot;