summaryrefslogtreecommitdiff
path: root/src/audiocachefile.h
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2017-05-06 15:41:43 +0200
committerBent Bisballe Nyeng <deva@aasimon.org>2017-05-06 15:41:43 +0200
commitb7b5b9ee2a9d6cefe9b83589122cedb89c22279c (patch)
treeb7953590423e616d1f61a8ae9a4a2a4ca154d9f5 /src/audiocachefile.h
parent305bc5c31dde06afb3d867abd1b461a98c868a74 (diff)
Remove old (obsolete) Mutex class and replace all uses with std::mutex.
Diffstat (limited to 'src/audiocachefile.h')
-rw-r--r--src/audiocachefile.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/audiocachefile.h b/src/audiocachefile.h
index 01625a7..66a6529 100644
--- a/src/audiocachefile.h
+++ b/src/audiocachefile.h
@@ -30,16 +30,15 @@
#include <list>
#include <map>
#include <vector>
-
#include <mutex>
-#include "mutex.h"
#include <sndfile.h>
#include <audiotypes.h>
//! Channel data container in the cache world.
-class CacheChannel {
+class CacheChannel
+{
public:
size_t channel; //< Channel number
sample_t* samples; //< Sample buffer pointer.
@@ -52,7 +51,8 @@ using CacheChannels = std::list<CacheChannel>;
//! This class is used to encapsulate reading from a single file source.
//! The access is ref counted so that the file is only opened once and closed
//! when it is no longer required.
-class AudioCacheFile {
+class AudioCacheFile
+{
friend class AudioCacheFiles;
friend class TestableAudioCacheFiles;
public:
@@ -82,7 +82,8 @@ private:
std::vector<sample_t>& read_buffer;
};
-class AudioCacheFiles {
+class AudioCacheFiles
+{
public:
//! Get the CacheAudioFile object corresponding to filename.
//! If it does not exist it will be created.