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

removed unnecessary changes

Browse source
This commit is contained in:
wangyix 2014-06-25 11:48:32 -07:00
parent dd1c157f3a
commit c583f8b023
3 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
assignment-client/src/audio/AudioMixer.cpp
View file

@ -604,15 +604,11 @@ void AudioMixer::run() {
&& ((AudioMixerClientData*) node->getLinkedData())->getAvatarAudioRingBuffer()) {
prepareMixForListeningNode(node.data());
// pack header
int numBytesPacketHeader = populatePacketHeader(clientMixBuffer, PacketTypeMixedAudio);
char* dataAt = clientMixBuffer + numBytesPacketHeader;
// pack mixed audio, send mixed audio packet
memcpy(clientMixBuffer + numBytesPacketHeader, _clientSamples, NETWORK_BUFFER_LENGTH_BYTES_STEREO);
nodeList->writeDatagram(clientMixBuffer, NETWORK_BUFFER_LENGTH_BYTES_STEREO + numBytesPacketHeader, node);
// send an audio stream stats packet if it's time
if (sendAudioStreamStats) {
int numBytesWritten = ((AudioMixerClientData*)node->getLinkedData())

1
assignment-client/src/audio/AudioMixerClientData.cpp
View file

@ -15,7 +15,6 @@
#include <UUID.h>
#include "InjectedAudioRingBuffer.h"
#include "SharedUtil.h"
#include "AudioMixer.h"
#include "AudioMixerClientData.h"

2
libraries/networking/src/PacketHeaders.cpp
View file

@ -51,8 +51,6 @@ PacketVersion versionForPacketType(PacketType type) {
case PacketTypeMicrophoneAudioWithEcho:
case PacketTypeSilentAudioFrame:
return 1;
case PacketTypeMixedAudio:
return 1;
case PacketTypeAvatarData:
return 3;
case PacketTypeAvatarIdentity: