diff options
author | Bent Bisballe Nyeng <deva@aasimon.org> | 2016-04-16 13:23:11 +0200 |
---|---|---|
committer | Bent Bisballe Nyeng <deva@aasimon.org> | 2016-04-16 13:23:11 +0200 |
commit | 35e804b984c28131fe13d229c5a0867762c6e8cf (patch) | |
tree | 200a8c3029e38fbf0f33318faec05c4f9f8e71c3 /src/drumkitloader.h | |
parent | c7577fa4ecf6f9858483c5d8b4a46e7caa2b376d (diff) |
Some DrumKitLoader refactoring.
Diffstat (limited to 'src/drumkitloader.h')
-rw-r--r-- | src/drumkitloader.h | 12 |
1 files changed, 6 insertions, 6 deletions
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 <string> #include <list> +#include <mutex> +#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<AudioFile*> 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; }; |