From 6ad9b9d2ae3341bbd4914f4951070a02d3dd4d2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Nusser?= Date: Sat, 26 Oct 2019 12:43:00 +0200 Subject: Fix variable name typo: resamplig -> resampling --- plugingui/resamplingframecontent.cc | 8 ++++---- plugingui/resamplingframecontent.h | 4 ++-- src/drumgizmo.cc | 2 +- src/settings.h | 10 +++++----- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/plugingui/resamplingframecontent.cc b/plugingui/resamplingframecontent.cc index 92102e3..6026154 100644 --- a/plugingui/resamplingframecontent.cc +++ b/plugingui/resamplingframecontent.cc @@ -40,7 +40,7 @@ ResamplingframeContent::ResamplingframeContent( this, &ResamplingframeContent::updateDrumkitSamplerate); CONNECT(this, settings_notifier.samplerate, this, &ResamplingframeContent::updateSessionSamplerate); - CONNECT(this, settings_notifier.resamplig_recommended, + CONNECT(this, settings_notifier.resampling_recommended, this, &ResamplingframeContent::updateResamplingRecommended); text_field.move(0, 0); @@ -61,7 +61,7 @@ void ResamplingframeContent::updateContent() text_field.setText( "Session samplerate: " + session_samplerate + "\n" "Drumkit samplerate: " + drumkit_samplerate + "\n" - "Resampling recommended: " + resamplig_recommended + "\n" + "Resampling recommended: " + resampling_recommended + "\n" ); } @@ -81,9 +81,9 @@ void ResamplingframeContent::updateSessionSamplerate(double samplerate) updateContent(); } -void ResamplingframeContent::updateResamplingRecommended(bool resamplig_recommended) +void ResamplingframeContent::updateResamplingRecommended(bool resampling_recommended) { - this->resamplig_recommended = resamplig_recommended ? "Yes" : "No"; + this->resampling_recommended = resampling_recommended ? "Yes" : "No"; updateContent(); } diff --git a/plugingui/resamplingframecontent.h b/plugingui/resamplingframecontent.h index b45f1ee..b5530c2 100644 --- a/plugingui/resamplingframecontent.h +++ b/plugingui/resamplingframecontent.h @@ -47,7 +47,7 @@ public: void updateDrumkitSamplerate(std::size_t drumkit_samplerate); void updateSessionSamplerate(double samplerate); - void updateResamplingRecommended(bool resamplig_recommended); + void updateResamplingRecommended(bool resampling_recommended); private: TextEdit text_field{this}; @@ -56,7 +56,7 @@ private: std::string drumkit_samplerate; std::string session_samplerate; - std::string resamplig_recommended; + std::string resampling_recommended; }; } // GUI:: diff --git a/src/drumgizmo.cc b/src/drumgizmo.cc index e6dbf55..bec3e0f 100644 --- a/src/drumgizmo.cc +++ b/src/drumgizmo.cc @@ -437,7 +437,7 @@ void DrumGizmo::setSamplerate(float samplerate) auto input_fs = settings.drumkit_samplerate.load(); auto output_fs = samplerate; ratio = input_fs / output_fs; - settings.resamplig_recommended.store(ratio != 1.0); + settings.resampling_recommended.store(ratio != 1.0); // TODO: Only reallocate the actual amount of samples needed based on the // ratio and the framesize. diff --git a/src/settings.h b/src/settings.h index d51b32c..5d29210 100644 --- a/src/settings.h +++ b/src/settings.h @@ -102,7 +102,7 @@ struct Settings Atomic buffer_size{1024}; // Only used to show in the UI. Atomic enable_resampling{true}; - Atomic resamplig_recommended{false}; + Atomic resampling_recommended{false}; Atomic number_of_files{0}; Atomic number_of_files_loaded{0}; @@ -190,7 +190,7 @@ struct SettingsGetter SettingRef buffer_size; SettingRef enable_resampling; - SettingRef resamplig_recommended; + SettingRef resampling_recommended; SettingRef number_of_files; SettingRef number_of_files_loaded; @@ -243,7 +243,7 @@ struct SettingsGetter , samplerate{settings.samplerate} , buffer_size(settings.buffer_size) , enable_resampling{settings.enable_resampling} - , resamplig_recommended{settings.resamplig_recommended} + , resampling_recommended{settings.resampling_recommended} , number_of_files{settings.number_of_files} , number_of_files_loaded{settings.number_of_files_loaded} , current_file{settings.current_file} @@ -302,7 +302,7 @@ public: Notifier buffer_size; Notifier enable_resampling; - Notifier resamplig_recommended; + Notifier resampling_recommended; Notifier number_of_files; Notifier number_of_files_loaded; @@ -364,7 +364,7 @@ public: EVAL(buffer_size); EVAL(enable_resampling); - EVAL(resamplig_recommended); + EVAL(resampling_recommended); EVAL(number_of_files); EVAL(number_of_files_loaded); -- cgit v1.2.3