summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Nusser <andre.nusser@googlemail.com>2019-10-26 12:43:00 +0200
committerAndré Nusser <andre.nusser@googlemail.com>2019-10-26 12:43:00 +0200
commit6ad9b9d2ae3341bbd4914f4951070a02d3dd4d2b (patch)
tree32a71f81fcc65d11a60f779b3633c0436822f94b
parent33f968de5c88a2f92d79cb9dfa14cc245676a8d5 (diff)
Fix variable name typo: resamplig -> resampling
-rw-r--r--plugingui/resamplingframecontent.cc8
-rw-r--r--plugingui/resamplingframecontent.h4
-rw-r--r--src/drumgizmo.cc2
-rw-r--r--src/settings.h10
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<std::size_t> buffer_size{1024}; // Only used to show in the UI.
Atomic<bool> enable_resampling{true};
- Atomic<bool> resamplig_recommended{false};
+ Atomic<bool> resampling_recommended{false};
Atomic<std::size_t> number_of_files{0};
Atomic<std::size_t> number_of_files_loaded{0};
@@ -190,7 +190,7 @@ struct SettingsGetter
SettingRef<std::size_t> buffer_size;
SettingRef<bool> enable_resampling;
- SettingRef<bool> resamplig_recommended;
+ SettingRef<bool> resampling_recommended;
SettingRef<std::size_t> number_of_files;
SettingRef<std::size_t> 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<std::size_t> buffer_size;
Notifier<bool> enable_resampling;
- Notifier<bool> resamplig_recommended;
+ Notifier<bool> resampling_recommended;
Notifier<std::size_t> number_of_files;
Notifier<std::size_t> 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);