Added framesize control mechanism to the engine, and made us of it in the cachemanager and drumkitloader.

1 files changed, 11 insertions, 1 deletions

diff --git a/src/drumkitloader.cc b/src/drumkitloader.cc
index 2b66ae0..413d3f4 100644
--- a/src/drumkitloader.cc
+++ b/src/drumkitloader.cc
@@ -34,6 +34,7 @@
 
 DrumKitLoader::DrumKitLoader()
   : semaphore("drumkitloader")
+  , framesize(0)
 {
   run();
   run_semaphore.wait(); // Wait for the thread to actually start.
@@ -64,6 +65,13 @@ void DrumKitLoader::skip()
   load_queue.clear();
 }
 
+void DrumKitLoader::setFrameSize(size_t framesize)
+{
+  MutexAutolock l(mutex);
+  this->framesize = framesize;
+  framesize_semaphore.post(); // Signal that the framesize has been set.
+}
+
 bool DrumKitLoader::isDone()
 {
   MutexAutolock l(mutex);
@@ -120,6 +128,8 @@ void DrumKitLoader::thread_main()
 
   run_semaphore.post(); // Signal that the thread has been started.
 
+  framesize_semaphore.wait(); // Wait until the framesize has been set.
+
   while(running) {
     size_t size;
     {
@@ -137,7 +147,7 @@ void DrumKitLoader::thread_main()
       AudioFile *audiofile = load_queue.front();
       load_queue.pop_front();
       filename = audiofile->filename;
-      audiofile->load(PRELOADSIZE);
+      audiofile->load(framesize * CHUNK_MULTIPLIER + framesize);
     }
 
     loaded++;