Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-16 03:20:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix MS20089: Enable interrupting of avatar recordings with sounds

Browse source
This commit is contained in:
Zach Fox 2018-12-17 15:46:08 -08:00
parent 78c9fb2b91
commit 240917e8ae
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
assignment-client/src/Agent.cpp
View file

@ -756,6 +756,11 @@ void Agent::processAgentAvatarAudio() {
const int16_t* nextSoundOutput = NULL; const int16_t* nextSoundOutput = NULL;
if (_avatarSound) { if (_avatarSound) {
if (isPlayingRecording) {
recordingInterface->stopPlaying();
_recordingInterrupted = true;
}
auto audioData = _avatarSound->getAudioData(); auto audioData = _avatarSound->getAudioData();
nextSoundOutput = reinterpret_cast<const int16_t*>(audioData->rawData() nextSoundOutput = reinterpret_cast<const int16_t*>(audioData->rawData()
+ _numAvatarSoundSentBytes); + _numAvatarSoundSentBytes);
@ -781,6 +786,11 @@ void Agent::processAgentAvatarAudio() {
_avatarSound.clear(); _avatarSound.clear();
_numAvatarSoundSentBytes = 0; _numAvatarSoundSentBytes = 0;
_flushEncoder = true; _flushEncoder = true;
if (_recordingInterrupted) {
_recordingInterrupted = false;
recordingInterface->startPlaying();
}
} }
} }

2
assignment-client/src/Agent.h
View file

@ -122,6 +122,8 @@ private:
Encoder* _encoder { nullptr }; Encoder* _encoder { nullptr };
QTimer _avatarAudioTimer; QTimer _avatarAudioTimer;
bool _flushEncoder { false }; bool _flushEncoder { false };
bool _recordingInterrupted { false };
}; };
#endif // hifi_Agent_h #endif // hifi_Agent_h