Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 21:57:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

move typedef for FreeVerbAgentMap to AudioRingBuffer header

Browse source
This commit is contained in:
Stephen Birarda 2013-06-03 12:02:41 -07:00
parent e58d5db7ee
commit ca39593f05
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
audio-mixer/src/main.cpp
View file

@ -248,7 +248,6 @@ int main(int argc, const char* argv[]) {
numSamplesDelay = PHASE_DELAY_AT_90 * sinRatio; numSamplesDelay = PHASE_DELAY_AT_90 * sinRatio;
weakChannelAmplitudeRatio = 1 - (PHASE_AMPLITUDE_RATIO_AT_90 * sinRatio); weakChannelAmplitudeRatio = 1 - (PHASE_AMPLITUDE_RATIO_AT_90 * sinRatio);
typedef std::map<uint16_t, stk::FreeVerb*> FreeVerbAgentMap;
FreeVerbAgentMap& agentFreeVerbs = agentRingBuffer->getFreeVerbs(); FreeVerbAgentMap& agentFreeVerbs = agentRingBuffer->getFreeVerbs();
FreeVerbAgentMap::iterator freeVerbIterator = agentFreeVerbs.find(otherAgent->getAgentID()); FreeVerbAgentMap::iterator freeVerbIterator = agentFreeVerbs.find(otherAgent->getAgentID());

5
libraries/audio/src/AudioRingBuffer.h
View file

@ -19,6 +19,7 @@
#include "AgentData.h" #include "AgentData.h"
const int STREAM_IDENTIFIER_NUM_BYTES = 8; const int STREAM_IDENTIFIER_NUM_BYTES = 8;
typedef std::map<uint16_t, stk::FreeVerb*> FreeVerbAgentMap;
class AudioRingBuffer : public AgentData { class AudioRingBuffer : public AgentData {
public: public:
@ -35,7 +36,7 @@ public:
int16_t* getBuffer() const { return _buffer; } int16_t* getBuffer() const { return _buffer; }
std::map<uint16_t, stk::FreeVerb*>& getFreeVerbs() { return _freeVerbs; } FreeVerbAgentMap& getFreeVerbs() { return _freeVerbs; }
bool isStarted() const { return _started; } bool isStarted() const { return _started; }
void setStarted(bool started) { _started = started; } void setStarted(bool started) { _started = started; }
@ -67,7 +68,7 @@ private:
bool _shouldBeAddedToMix; bool _shouldBeAddedToMix;
bool _shouldLoopbackForAgent; bool _shouldLoopbackForAgent;
unsigned char _streamIdentifier[STREAM_IDENTIFIER_NUM_BYTES]; unsigned char _streamIdentifier[STREAM_IDENTIFIER_NUM_BYTES];
std::map<uint16_t, stk::FreeVerb*> _freeVerbs; FreeVerbAgentMap _freeVerbs;
}; };
#endif /* defined(__interface__AudioRingBuffer__) */ #endif /* defined(__interface__AudioRingBuffer__) */