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

Remove lastMuted member in AvatarAudioStream

Browse source
This commit is contained in:
Atlante45 2014-11-17 10:32:28 -08:00
parent 46eebe9d40
commit 4615afe034
3 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -776,13 +776,9 @@ void AudioMixer::run() {
// if the stream should be muted, send mute packet // if the stream should be muted, send mute packet
if (nodeData->getAvatarAudioStream() if (nodeData->getAvatarAudioStream()
&& shouldMute(nodeData->getAvatarAudioStream()->getQuietestFrameLoudness())) { && shouldMute(nodeData->getAvatarAudioStream()->getQuietestFrameLoudness())) {
static const int TIME_BETWEEN_MUTES = 5; // in secs QByteArray packet = byteArrayWithPopulatedHeader(PacketTypeNoisyMute);
if (usecTimestampNow() - nodeData->getAvatarAudioStream()->getLastMuted() > nodeList->writeDatagram(packet, node);
TIME_BETWEEN_MUTES * USECS_PER_SECOND) { nodeData->getAvatarAudioStream()->setLastMutedNow();
QByteArray packet = byteArrayWithPopulatedHeader(PacketTypeNoisyMute);
nodeList->writeDatagram(packet, node);
nodeData->getAvatarAudioStream()->setLastMutedNow();
}
} }
if (node->getType() == NodeType::Agent && node->getActiveSocket() if (node->getType() == NodeType::Agent && node->getActiveSocket()

3
assignment-client/src/audio/AvatarAudioStream.cpp
View file

@ -14,8 +14,7 @@
#include "AvatarAudioStream.h" #include "AvatarAudioStream.h"
AvatarAudioStream::AvatarAudioStream(bool isStereo, const InboundAudioStream::Settings& settings) : AvatarAudioStream::AvatarAudioStream(bool isStereo, const InboundAudioStream::Settings& settings) :
PositionalAudioStream(PositionalAudioStream::Microphone, isStereo, settings), PositionalAudioStream(PositionalAudioStream::Microphone, isStereo, settings)
_lastMuted(usecTimestampNow())
{ {
} }

5
assignment-client/src/audio/AvatarAudioStream.h
View file

@ -20,17 +20,12 @@ class AvatarAudioStream : public PositionalAudioStream {
public: public:
AvatarAudioStream(bool isStereo, const InboundAudioStream::Settings& settings); AvatarAudioStream(bool isStereo, const InboundAudioStream::Settings& settings);
qint64 getLastMuted() const { return _lastMuted; }
void setLastMutedNow() { _lastMuted = usecTimestampNow(); }
private: private:
// disallow copying of AvatarAudioStream objects // disallow copying of AvatarAudioStream objects
AvatarAudioStream(const AvatarAudioStream&); AvatarAudioStream(const AvatarAudioStream&);
AvatarAudioStream& operator= (const AvatarAudioStream&); AvatarAudioStream& operator= (const AvatarAudioStream&);
int parseStreamProperties(PacketType type, const QByteArray& packetAfterSeqNum, int& numAudioSamples); int parseStreamProperties(PacketType type, const QByteArray& packetAfterSeqNum, int& numAudioSamples);
qint64 _lastMuted;
}; };
#endif // hifi_AvatarAudioStream_h #endif // hifi_AvatarAudioStream_h