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

ZappoMan deadcode analysis applied

Browse source
This commit is contained in:
Craig Hansen-Sturm 2014-08-27 10:56:44 -07:00
parent e941e58626
commit 40a5ff6b9e
1 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
assignment-client/src/audio/AudioMixer.h
View file

@ -39,18 +39,7 @@ public slots:
void sendStatsPacket(); void sendStatsPacket();
#if 0
<<<<<<< HEAD
static bool getUseDynamicJitterBuffers() { return _useDynamicJitterBuffers; }
static int getStaticDesiredJitterBufferFrames() { return _staticDesiredJitterBufferFrames; }
static int getMaxFramesOverDesired() { return _maxFramesOverDesired; }
=======
#endif
static const InboundAudioStream::Settings& getStreamSettings() { return _streamSettings; } static const InboundAudioStream::Settings& getStreamSettings() { return _streamSettings; }
#if 0
>>>>>>> 7a8a8684d6f8c9956ca7e4f81eb8064b8dece58e
#endif
private: private:
/// adds one stream to the mix for a listening node /// adds one stream to the mix for a listening node
@ -83,10 +72,8 @@ private:
static InboundAudioStream::Settings _streamSettings; static InboundAudioStream::Settings _streamSettings;
static bool _printStreamStats; static bool _printStreamStats;
static bool _enableFilter; static bool _enableFilter;
quint64 _lastSendAudioStreamStatsTime;
quint64 _lastPerSecondCallbackTime; quint64 _lastPerSecondCallbackTime;
bool _sendAudioStreamStats; bool _sendAudioStreamStats;