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

Modify injected audio stream to send the ignore penumbra option

Browse source
This commit is contained in:
Atlante45 2014-11-05 16:22:06 +01:00
parent 49526e69f8
commit 4b73a5ac35
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/audio/src/AudioInjector.cpp
View file

@ -100,6 +100,8 @@ void AudioInjector::injectAudio() {
quint8 volume = MAX_INJECTOR_VOLUME * _options.getVolume(); quint8 volume = MAX_INJECTOR_VOLUME * _options.getVolume();
packetStream << volume; packetStream << volume;
packetStream << _options.ignorePenumbra();
QElapsedTimer timer; QElapsedTimer timer;
timer.start(); timer.start();
int nextFrame = 0; int nextFrame = 0;

4
libraries/audio/src/InjectedAudioStream.cpp
View file

@ -63,7 +63,9 @@ int InjectedAudioStream::parseStreamProperties(PacketType type,
quint8 attenuationByte = 0; quint8 attenuationByte = 0;
packetStream >> attenuationByte; packetStream >> attenuationByte;
_attenuationRatio = attenuationByte / (float)MAX_INJECTOR_VOLUME; _attenuationRatio = attenuationByte / (float)MAX_INJECTOR_VOLUME;
packetStream >> _ignorePenumbra;
int numAudioBytes = packetAfterSeqNum.size() - packetStream.device()->pos(); int numAudioBytes = packetAfterSeqNum.size() - packetStream.device()->pos();
numAudioSamples = numAudioBytes / sizeof(int16_t); numAudioSamples = numAudioBytes / sizeof(int16_t);

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

@ -54,6 +54,8 @@ PacketVersion versionForPacketType(PacketType type) {
return 4; return 4;
case PacketTypeMixedAudio: case PacketTypeMixedAudio:
return 1; return 1;
case PacketTypeInjectAudio:
return 1;
case PacketTypeAvatarData: case PacketTypeAvatarData:
return 3; return 3;
case PacketTypeAvatarIdentity: case PacketTypeAvatarIdentity: