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

Switched AudioMixer to NetworkAccessManager

Browse source
This commit is contained in:
Atlante45 2014-07-01 17:39:45 -07:00
parent 231557a12c
commit d6a2cea756
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -38,11 +38,11 @@
#include <QtCore/QJsonObject> #include <QtCore/QJsonObject>
#include <QtCore/QJsonValue> #include <QtCore/QJsonValue>
#include <QtCore/QTimer> #include <QtCore/QTimer>
#include <QtNetwork/QNetworkAccessManager>
#include <QtNetwork/QNetworkRequest> #include <QtNetwork/QNetworkRequest>
#include <QtNetwork/QNetworkReply> #include <QtNetwork/QNetworkReply>
#include <Logging.h> #include <Logging.h>
#include <NetworkAccessManager.h>
#include <NodeList.h> #include <NodeList.h>
#include <Node.h> #include <Node.h>
#include <PacketHeaders.h> #include <PacketHeaders.h>
@ -482,8 +482,8 @@ void AudioMixer::run() {
nodeList->linkedDataCreateCallback = attachNewBufferToNode; nodeList->linkedDataCreateCallback = attachNewBufferToNode;
// setup a QNetworkAccessManager to ask the domain-server for our settings // setup a NetworkAccessManager to ask the domain-server for our settings
QNetworkAccessManager *networkManager = new QNetworkAccessManager(this); NetworkAccessManager& networkManager = NetworkAccessManager::getInstance();
QUrl settingsJSONURL; QUrl settingsJSONURL;
settingsJSONURL.setScheme("http"); settingsJSONURL.setScheme("http");
@ -500,7 +500,7 @@ void AudioMixer::run() {
qDebug() << "Requesting settings for assignment from domain-server at" << settingsJSONURL.toString(); qDebug() << "Requesting settings for assignment from domain-server at" << settingsJSONURL.toString();
while (!reply || reply->error() != QNetworkReply::NoError) { while (!reply || reply->error() != QNetworkReply::NoError) {
reply = networkManager->get(QNetworkRequest(settingsJSONURL)); reply = networkManager.get(QNetworkRequest(settingsJSONURL));
QEventLoop loop; QEventLoop loop;
QObject::connect(reply, SIGNAL(finished()), &loop, SLOT(quit())); QObject::connect(reply, SIGNAL(finished()), &loop, SLOT(quit()));