summaryrefslogtreecommitdiff
path: root/src/drumkitloader.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/drumkitloader.cc')
-rw-r--r--src/drumkitloader.cc11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/drumkitloader.cc b/src/drumkitloader.cc
index ec86e77..a08fc0a 100644
--- a/src/drumkitloader.cc
+++ b/src/drumkitloader.cc
@@ -36,12 +36,12 @@
DrumKitLoader::DrumKitLoader(Settings& settings, DrumKit& kit,
AudioInputEngine& ie,
- std::array<CHResampler, 64>& resampler)
+ Resamplers& resamplers)
: settings(settings)
, getter(settings)
, kit(kit)
, ie(ie)
- , resampler(resampler)
+ , resamplers(resamplers)
{
run();
run_semaphore.wait(); // Wait for the thread to actually start.
@@ -99,10 +99,7 @@ bool DrumKitLoader::loadkit(const std::string& file)
loadKit(&kit);
#ifdef WITH_RESAMPLER
- for(auto& chresampler: resampler)
- {
- chresampler.setup(kit.getSamplerate(), settings.samplerate.load());
- }
+ resamplers.setup(kit.getSamplerate(), settings.samplerate.load());
#endif/*WITH_RESAMPLER*/
@@ -234,7 +231,7 @@ void DrumKitLoader::thread_main()
}
// Note: Remove this line to enable diskstreaming
- preload_size = ALL_SAMPLES;
+ //preload_size = ALL_SAMPLES;
audiofile->load(preload_size);
}