summaryrefslogtreecommitdiff
path: root/src/cachemanager.h
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2015-04-12 10:57:54 +0200
committerBent Bisballe Nyeng <deva@aasimon.org>2015-04-12 10:57:54 +0200
commit9842ada95aa51bc50ae6d4565f0f7aef5af22264 (patch)
treec2dc48726b970befbbb0975694502d5ead2ec67b /src/cachemanager.h
parent873bcbbe7b8c226d1efbfd34b6d1d454bcd10639 (diff)
Fix buffers and clean up a bit.
Diffstat (limited to 'src/cachemanager.h')
-rw-r--r--src/cachemanager.h18
1 files changed, 8 insertions, 10 deletions
diff --git a/src/cachemanager.h b/src/cachemanager.h
index 1b79568..557ba23 100644
--- a/src/cachemanager.h
+++ b/src/cachemanager.h
@@ -149,20 +149,18 @@ private:
};
typedef struct {
- bool active;
- cacheid_t id;
- size_t pos;
cmd_t cmd;
- sample_t *fillbuffer;
- } event_t;
+ size_t pos;
+ sample_t *buffer;
+ AudioFile *file;
+ } cevent_t;
- CacheManager::event_t createLoadNextEvent(cacheid_t id, size_t pos, sample_t* fillbuffer);
- void loadNext(event_t &e);
- void pushEvent(event_t e);
- cache_t getNextCache(cacheid_t id);
+ cevent_t createLoadNextEvent(AudioFile *file, size_t pos, sample_t* buffer);
+ void loadNext(cevent_t &e);
+ void pushEvent(cevent_t e);
// Protected by mutex
- std::list<event_t> eventqueue;
+ std::list<cevent_t> eventqueue;
std::list<cacheid_t> availableids;
std::vector<cache_t> id2cache;