Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-24 20:44:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove readPendingDatagram from AudioMixer

Browse source
This commit is contained in:
Ryan Huffman 2015-07-13 14:24:06 -07:00
parent 2efa2877da
commit 9de6828b03
2 changed files with 0 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -543,11 +543,6 @@ void AudioMixer::sendAudioEnvironmentPacket(SharedNodePointer node) {
} }
} }
void AudioMixer::readPendingDatagram(const QByteArray& receivedPacket, const HifiSockAddr& senderSockAddr) {
auto nodeList = DependencyManager::get<NodeList>();
nodeList->processNodeData(senderSockAddr, receivedPacket);
}
void AudioMixer::handleMicrophoneAudioNoEchoPacket(QSharedPointer<NLPacket> packet, HifiSockAddr senderSockAddr) { void AudioMixer::handleMicrophoneAudioNoEchoPacket(QSharedPointer<NLPacket> packet, HifiSockAddr senderSockAddr) {
auto nodeList = DependencyManager::get<NodeList>(); auto nodeList = DependencyManager::get<NodeList>();
nodeList->findNodeAndUpdateWithDataFromPacket(packet); nodeList->findNodeAndUpdateWithDataFromPacket(packet);
@ -684,28 +679,6 @@ void AudioMixer::run() {
_datagramProcessingThread = new QThread(this); _datagramProcessingThread = new QThread(this);
_datagramProcessingThread->setObjectName("Datagram Processor Thread"); _datagramProcessingThread->setObjectName("Datagram Processor Thread");
// create an AudioMixerDatagramProcessor and move it to that thread
AudioMixerDatagramProcessor* datagramProcessor = new AudioMixerDatagramProcessor(nodeList->getNodeSocket(), thread());
datagramProcessor->moveToThread(_datagramProcessingThread);
// remove the NodeList as the parent of the node socket
nodeList->getNodeSocket().setParent(NULL);
nodeList->getNodeSocket().moveToThread(_datagramProcessingThread);
// let the datagram processor handle readyRead from node socket
connect(&nodeList->getNodeSocket(), &QUdpSocket::readyRead,
datagramProcessor, &AudioMixerDatagramProcessor::readPendingDatagrams);
// connect to the datagram processing thread signal that tells us we have to handle a packet
connect(datagramProcessor, &AudioMixerDatagramProcessor::packetRequiresProcessing, this, &AudioMixer::readPendingDatagram);
// delete the datagram processor and the associated thread when the QThread quits
connect(_datagramProcessingThread, &QThread::finished, datagramProcessor, &QObject::deleteLater);
connect(datagramProcessor, &QObject::destroyed, _datagramProcessingThread, &QThread::deleteLater);
// start the datagram processing thread
_datagramProcessingThread->start();
nodeList->addNodeTypeToInterestSet(NodeType::Agent); nodeList->addNodeTypeToInterestSet(NodeType::Agent);
nodeList->linkedDataCreateCallback = [](Node* node) { nodeList->linkedDataCreateCallback = [](Node* node) {

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

@ -35,8 +35,6 @@ public slots:
/// threaded run of assignment /// threaded run of assignment
void run(); void run();
void readPendingDatagram(const QByteArray& receivedPacket, const HifiSockAddr& senderSockAddr);
void sendStatsPacket(); void sendStatsPacket();
static const InboundAudioStream::Settings& getStreamSettings() { return _streamSettings; } static const InboundAudioStream::Settings& getStreamSettings() { return _streamSettings; }