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

cleanup indentation in AndroidManifest file

Browse source
This commit is contained in:
Stephen Birarda 2014-11-18 13:38:37 -08:00
parent 86000799ac
commit 9f4e1c8a27
4 changed files with 31 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
gvr-interface/res/drawable/icon.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6 KiB

After

Width:  |  Height:  |  Size: 88 KiB

26
gvr-interface/src/GVRInterface.cpp
View file

@ -17,4 +17,30 @@ GVRInterface::GVRInterface(int argc, char* argv[]) :
QGuiApplication(argc, argv) QGuiApplication(argc, argv)
{ {
NodeList* nodeList = NodeList::createInstance(NodeType::Agent); NodeList* nodeList = NodeList::createInstance(NodeType::Agent);
connect(&nodeList->getNodeSocket(), &QUdpSocket::readyRead, this, &GVRInterface::processDatagrams);
QTimer* domainServerTimer = new QTimer(this);
connect(domainServerTimer, &QTimer::timeout, nodeList, &NodeList::sendDomainServerCheckIn);
domainServerTimer->start(DOMAIN_SERVER_CHECK_IN_MSECS);
QTimer* silentNodeRemovalTimer = new QTimer(this);
connect(silentNodeRemovalTimer, &QTimer::timeout, nodeList, &NodeList::removeSilentNodes);
silentNodeRemovalTimer->start(NODE_SILENCE_THRESHOLD_MSECS);
}
void GVRInterface::processDatagrams() {
NodeList* nodeList = NodeList::getInstance();
HifiSockAddr senderSockAddr;
QByteArray incomingPacket;
while (nodeList->getNodeSocket().hasPendingDatagrams()) {
incomingPacket.resize(nodeList->getNodeSocket().pendingDatagramSize());
nodeList->getNodeSocket().readDatagram(incomingPacket.data(), incomingPacket.size(),
senderSockAddr.getAddressPointer(), senderSockAddr.getPortPointer());
qDebug() << "Processing a packet!";
nodeList->processNodeData(senderSockAddr, incomingPacket);
}
} }

2
gvr-interface/src/GVRInterface.h
View file

@ -18,6 +18,8 @@ class GVRInterface : public QGuiApplication {
Q_OBJECT Q_OBJECT
public: public:
GVRInterface(int argc, char* argv[]); GVRInterface(int argc, char* argv[]);
private slots:
void processDatagrams();
}; };
#endif // hifi_GVRInterface_h #endif // hifi_GVRInterface_h

3
libraries/networking/src/NodeList.cpp
View file

@ -268,6 +268,7 @@ bool NodeList::processSTUNResponse(const QByteArray& packet) {
} }
void NodeList::sendDomainServerCheckIn() { void NodeList::sendDomainServerCheckIn() {
qDebug() << "SEND DOMAIN SERVER CHECK IN";
if (_publicSockAddr.isNull() && !_hasCompletedInitialSTUNFailure) { if (_publicSockAddr.isNull() && !_hasCompletedInitialSTUNFailure) {
// we don't know our public socket and we need to send it to the domain server // we don't know our public socket and we need to send it to the domain server
// send a STUN request to figure it out // send a STUN request to figure it out
@ -276,6 +277,8 @@ void NodeList::sendDomainServerCheckIn() {
handleICEConnectionToDomainServer(); handleICEConnectionToDomainServer();
} else if (!_domainHandler.getIP().isNull()) { } else if (!_domainHandler.getIP().isNull()) {
qDebug() << "SENDING A CHECK IN TO" << _domainHandler.getIP().toString();
bool isUsingDTLS = false; bool isUsingDTLS = false;
PacketType domainPacketType = !_domainHandler.isConnected() PacketType domainPacketType = !_domainHandler.isConnected()