Mercurial > hg > svcore
comparison base/Preferences.cpp @ 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 |
---|---|
57 settings.beginGroup("Preferences"); | 57 settings.beginGroup("Preferences"); |
58 m_spectrogramSmoothing = SpectrogramSmoothing | 58 m_spectrogramSmoothing = SpectrogramSmoothing |
59 (settings.value("spectrogram-y-smoothing", int(m_spectrogramSmoothing)).toInt()); | 59 (settings.value("spectrogram-y-smoothing", int(m_spectrogramSmoothing)).toInt()); |
60 m_spectrogramXSmoothing = SpectrogramXSmoothing | 60 m_spectrogramXSmoothing = SpectrogramXSmoothing |
61 (settings.value("spectrogram-x-smoothing", int(m_spectrogramXSmoothing)).toInt()); | 61 (settings.value("spectrogram-x-smoothing", int(m_spectrogramXSmoothing)).toInt()); |
62 m_tuningFrequency = settings.value("tuning-frequency", 440.f).toDouble(); | 62 m_tuningFrequency = settings.value("tuning-frequency", 440.).toDouble(); |
63 m_propertyBoxLayout = PropertyBoxLayout | 63 m_propertyBoxLayout = PropertyBoxLayout |
64 (settings.value("property-box-layout", int(VerticallyStacked)).toInt()); | 64 (settings.value("property-box-layout", int(VerticallyStacked)).toInt()); |
65 m_windowType = WindowType | 65 m_windowType = WindowType |
66 (settings.value("window-type", int(HanningWindow)).toInt()); | 66 (settings.value("window-type", int(HanningWindow)).toInt()); |
67 m_resampleQuality = settings.value("resample-quality", 1).toInt(); | 67 m_resampleQuality = settings.value("resample-quality", 1).toInt(); |
465 emit propertyChanged("Spectrogram X Smoothing"); | 465 emit propertyChanged("Spectrogram X Smoothing"); |
466 } | 466 } |
467 } | 467 } |
468 | 468 |
469 void | 469 void |
470 Preferences::setTuningFrequency(float freq) | 470 Preferences::setTuningFrequency(double freq) |
471 { | 471 { |
472 if (m_tuningFrequency != freq) { | 472 if (m_tuningFrequency != freq) { |
473 m_tuningFrequency = freq; | 473 m_tuningFrequency = freq; |
474 QSettings settings; | 474 QSettings settings; |
475 settings.beginGroup("Preferences"); | 475 settings.beginGroup("Preferences"); |