diff options
| author | André Nusser <andre.nusser@googlemail.com> | 2017-05-05 23:54:29 +0200 |
|---|---|---|
| committer | André Nusser <andre.nusser@googlemail.com> | 2017-05-06 20:26:40 +0200 |
| commit | 17c4551a0a02df27cb907678a0509c1a63f6256c (patch) | |
| tree | 5eed9407be2f20dd823521ebe8726139ec187a75 /src | |
| parent | 286cddccfd9d69f4bc567fc9f00898f06315cd30 (diff) | |
Introduce the new resampling frame.
Diffstat (limited to 'src')
| -rw-r--r-- | src/drumkitloader.cc | 2 | ||||
| -rw-r--r-- | src/settings.h | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/drumkitloader.cc b/src/drumkitloader.cc index eed5a33..a1a5bdf 100644 --- a/src/drumkitloader.cc +++ b/src/drumkitloader.cc @@ -136,7 +136,7 @@ bool DrumKitLoader::loadkit(const std::string& file) #ifdef WITH_RESAMPLER resamplers.setup(kit.getSamplerate(), settings.samplerate.load()); #endif/*WITH_RESAMPLER*/ - settings.resampling_active.store(resamplers.isActive()); + settings.resamplig_recommended.store(resamplers.isActive()); DEBUG(loadkit, "loadkit: Success\n"); diff --git a/src/settings.h b/src/settings.h index 76662c2..6d094ea 100644 --- a/src/settings.h +++ b/src/settings.h @@ -81,7 +81,7 @@ struct Settings Atomic<std::size_t> buffer_size{1024}; // Only used to show in the UI. Atomic<bool> enable_resampling{true}; - Atomic<bool> resampling_active{false}; + Atomic<bool> resamplig_recommended{false}; Atomic<std::size_t> number_of_files{0}; Atomic<std::size_t> number_of_files_loaded{0}; @@ -118,7 +118,7 @@ struct SettingsGetter SettingRef<std::size_t> buffer_size; SettingRef<bool> enable_resampling; - SettingRef<bool> resampling_active; + SettingRef<bool> resamplig_recommended; SettingRef<std::size_t> number_of_files; SettingRef<std::size_t> number_of_files_loaded; @@ -146,7 +146,7 @@ struct SettingsGetter , samplerate{settings.samplerate} , buffer_size(settings.buffer_size) , enable_resampling{settings.enable_resampling} - , resampling_active{settings.resampling_active} + , resamplig_recommended{settings.resamplig_recommended} , number_of_files{settings.number_of_files} , number_of_files_loaded{settings.number_of_files_loaded} , current_file{settings.current_file} @@ -185,7 +185,7 @@ public: Notifier<std::size_t> buffer_size; Notifier<bool> enable_resampling; - Notifier<bool> resampling_active; + Notifier<bool> resamplig_recommended; Notifier<std::size_t> number_of_files; Notifier<std::size_t> number_of_files_loaded; @@ -222,7 +222,7 @@ public: EVAL(buffer_size); EVAL(enable_resampling); - EVAL(resampling_active); + EVAL(resamplig_recommended); EVAL(number_of_files); EVAL(number_of_files_loaded); |