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

fix pointer var declarations, AudioInjector constructor in eve main

Browse source
This commit is contained in:
Stephen Birarda 2013-04-23 13:52:25 -07:00
parent 42ba5a51d4
commit ddc74984b5
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
eve/src/main.cpp
View file

@ -33,8 +33,8 @@ void *receiveAgentData(void *args) {
ssize_t bytesReceived; ssize_t bytesReceived;
unsigned char incomingPacket[MAX_PACKET_SIZE]; unsigned char incomingPacket[MAX_PACKET_SIZE];
AgentList *agentList = AgentList::getInstance(); AgentList* agentList = AgentList::getInstance();
Agent *avatarMixer = NULL; Agent* avatarMixer = NULL;
while (!::stopReceiveAgentDataThread) { while (!::stopReceiveAgentDataThread) {
if (agentList->getAgentSocket().receive(&senderAddress, incomingPacket, &bytesReceived)) { if (agentList->getAgentSocket().receive(&senderAddress, incomingPacket, &bytesReceived)) {
@ -65,10 +65,10 @@ void *receiveAgentData(void *args) {
void *injectAudio(void *args) { void *injectAudio(void *args) {
::injectAudioThreadRunning = true; ::injectAudioThreadRunning = true;
AudioInjector *eveAudioInjector = (AudioInjector *)args; AudioInjector* eveAudioInjector = (AudioInjector *)args;
// look for an audio mixer in our agent list // look for an audio mixer in our agent list
Agent *audioMixer = AgentList::getInstance()->soloAgentOfType(AGENT_TYPE_AUDIO_MIXER); Agent* audioMixer = AgentList::getInstance()->soloAgentOfType(AGENT_TYPE_AUDIO_MIXER);
if (audioMixer != NULL) { if (audioMixer != NULL) {
// until the audio mixer is setup for ping-reply, activate the public socket if it's not active // until the audio mixer is setup for ping-reply, activate the public socket if it's not active
@ -85,12 +85,12 @@ void *injectAudio(void *args) {
return NULL; return NULL;
} }
int main(int argc, char* argv[]) { int main(int argc, const char* argv[]) {
// new seed for random audio sleep times // new seed for random audio sleep times
srand(time(0)); srand(time(0));
// create an AgentList instance to handle communication with other agents // create an AgentList instance to handle communication with other agents
AgentList *agentList = AgentList::createInstance(AGENT_TYPE_AVATAR, EVE_AGENT_LIST_PORT); AgentList* agentList = AgentList::createInstance(AGENT_TYPE_AVATAR, EVE_AGENT_LIST_PORT);
// start telling the domain server that we are alive // start telling the domain server that we are alive
agentList->startDomainServerCheckInThread(); agentList->startDomainServerCheckInThread();
@ -119,7 +119,7 @@ int main(int argc, char* argv[]) {
eve.getBodyPosition()[2] + 0.1)); eve.getBodyPosition()[2] + 0.1));
// read eve's audio data // read eve's audio data
AudioInjector eveAudioInjector = AudioInjector("eve.raw"); AudioInjector eveAudioInjector("eve.raw");
unsigned char broadcastPacket[MAX_PACKET_SIZE]; unsigned char broadcastPacket[MAX_PACKET_SIZE];
broadcastPacket[0] = PACKET_HEADER_HEAD_DATA; broadcastPacket[0] = PACKET_HEADER_HEAD_DATA;

1
libraries/shared/src/AudioInjector.cpp
View file

@ -45,7 +45,6 @@ AudioInjector::AudioInjector(const char* filename) :
sourceFile.read((char *)_audioSampleArray, _numTotalBytesAudio); sourceFile.read((char *)_audioSampleArray, _numTotalBytesAudio);
} }
} }
AudioInjector::~AudioInjector() { AudioInjector::~AudioInjector() {