new messaging

git-svn-id: svn://elaine/murooma/trunk@230 d8a302eb-03bc-478d-80e4-98257eca68ef
This commit is contained in:
(no author) 2014-09-04 19:23:29 +00:00
parent a519d0f0dd
commit 04e872e036
15 changed files with 107 additions and 104 deletions

View file

@ -8,7 +8,7 @@
#include <vector>
#include <memory>
#include "doubleBuffer.h"
#include "common/chunk.h"
#include "common/message.h"
#include "common/timeUtils.h"
#include "common/queue.h"
#include "common/sampleFormat.h"
@ -18,7 +18,7 @@ class Stream
{
public:
Stream(const SampleFormat& format);
void addChunk(Chunk* chunk);
void addChunk(PcmChunk* chunk);
void clearChunks();
void getPlayerChunk(void* outputBuffer, double outputBufferDacTime, unsigned long framesPerBuffer);
void setBufferLen(size_t bufferLenMs);
@ -37,12 +37,12 @@ private:
long lastTick;
int sleep;
Queue<std::shared_ptr<Chunk>> chunks;
Queue<std::shared_ptr<PcmChunk>> chunks;
DoubleBuffer<int>* pCardBuffer;
DoubleBuffer<int>* pMiniBuffer;
DoubleBuffer<int>* pBuffer;
DoubleBuffer<int>* pShortBuffer;
std::shared_ptr<Chunk> chunk;
std::shared_ptr<PcmChunk> chunk;
int median;
int shortMedian;