From c2997b9b1a5b831e76b1779aa957f2312a6e5089 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Wed, 23 Mar 2016 22:38:44 +0100 Subject: Settings. --- src/drumkitloader.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/drumkitloader.h') diff --git a/src/drumkitloader.h b/src/drumkitloader.h index 3656839..2410074 100644 --- a/src/drumkitloader.h +++ b/src/drumkitloader.h @@ -34,6 +34,7 @@ #include "mutex.h" #include "drumkit.h" +#include "settings.h" //! This class is responsible for loading the drumkits in its own thread. //! All interaction calls are simply modifying queues and not doing any @@ -45,7 +46,7 @@ class DrumKitLoader { public: //! The constrcutor starts the loader thread. - DrumKitLoader(); + DrumKitLoader(Settings& settings); //! The destructor signals the thread to stop and waits to merge before //! returning (ie. deleting the object will garantuee that the thread has @@ -82,4 +83,5 @@ protected: size_t fraction{1}; size_t loaded{0}; size_t framesize{0}; + Settings& settings; }; -- cgit v1.2.3 From 35e804b984c28131fe13d229c5a0867762c6e8cf Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Sat, 16 Apr 2016 13:23:11 +0200 Subject: Some DrumKitLoader refactoring. --- src/drumkitloader.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/drumkitloader.h') diff --git a/src/drumkitloader.h b/src/drumkitloader.h index 2410074..3fd7ec1 100644 --- a/src/drumkitloader.h +++ b/src/drumkitloader.h @@ -28,10 +28,11 @@ #include #include +#include +#include "mutex.h" #include "thread.h" #include "semaphore.h" -#include "mutex.h" #include "drumkit.h" #include "settings.h" @@ -76,12 +77,11 @@ protected: Semaphore run_semaphore; Semaphore semaphore; Semaphore framesize_semaphore; - Mutex mutex; + std::mutex mutex; volatile bool running{false}; std::list load_queue; - size_t total_num_audiofiles{0}; - size_t fraction{1}; - size_t loaded{0}; - size_t framesize{0}; + std::size_t loaded{0}; + std::size_t framesize{0}; Settings& settings; + SettingsGetter getter; }; -- cgit v1.2.3