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

Attempt to resolve final warnings

Browse source
This commit is contained in:
Zach Fox 2018-10-23 15:11:02 -07:00
parent 988bca201b
commit 8395132830
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/audio-client/src/AudioClient.cpp
View file

@ -186,11 +186,11 @@ AudioClient::AudioClient() :
_networkToOutputResampler(NULL), _localToOutputResampler(NULL), _networkToOutputResampler(NULL), _localToOutputResampler(NULL),
_audioLimiter(AudioConstants::SAMPLE_RATE, OUTPUT_CHANNEL_COUNT), _outgoingAvatarAudioSequenceNumber(0), _audioLimiter(AudioConstants::SAMPLE_RATE, OUTPUT_CHANNEL_COUNT), _outgoingAvatarAudioSequenceNumber(0),
_audioOutputIODevice(_localInjectorsStream, _receivedAudioStream, this), _stats(&_receivedAudioStream), _audioOutputIODevice(_localInjectorsStream, _receivedAudioStream, this), _stats(&_receivedAudioStream),
_positionGetter(DEFAULT_POSITION_GETTER), _TTSTimer(this), _positionGetter(DEFAULT_POSITION_GETTER), _orientationGetter(DEFAULT_ORIENTATION_GETTER),
#if defined(Q_OS_ANDROID) #if defined(Q_OS_ANDROID)
_checkInputTimer(this), _isHeadsetPluggedIn(false), _checkInputTimer(this), _isHeadsetPluggedIn(false),
#endif #endif
_orientationGetter(DEFAULT_ORIENTATION_GETTER) { _TTSTimer(this) {
// avoid putting a lock in the device callback // avoid putting a lock in the device callback
assert(_localSamplesAvailable.is_lock_free()); assert(_localSamplesAvailable.is_lock_free());

12
libraries/audio-client/src/AudioClient.h
View file

@ -293,12 +293,6 @@ private:
bool mixLocalAudioInjectors(float* mixBuffer); bool mixLocalAudioInjectors(float* mixBuffer);
float azimuthForSource(const glm::vec3& relativePosition); float azimuthForSource(const glm::vec3& relativePosition);
float gainForSource(float distance, float volume); float gainForSource(float distance, float volume);
Mutex _TTSMutex;
QTimer _TTSTimer;
bool _isProcessingTTS {false};
QByteArray _TTSAudioBuffer;
int _TTSChunkSize = AudioConstants::NETWORK_FRAME_SAMPLES_PER_CHANNEL * 50;
#ifdef Q_OS_ANDROID #ifdef Q_OS_ANDROID
QTimer _checkInputTimer; QTimer _checkInputTimer;
@ -464,6 +458,12 @@ private:
QTimer* _checkPeakValuesTimer { nullptr }; QTimer* _checkPeakValuesTimer { nullptr };
bool _isRecording { false }; bool _isRecording { false };
Mutex _TTSMutex;
bool _isProcessingTTS { false };
QByteArray _TTSAudioBuffer;
int _TTSChunkSize = AudioConstants::NETWORK_FRAME_SAMPLES_PER_CHANNEL * 50;
QTimer _TTSTimer;
}; };