a seperate resolver for each discovered device

sailfish-spotify · Nov 12, 2018 · a496b4f · a496b4f
1 parent e64adf7
commit a496b4f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/src/qmdnsengine/resolver.cpp b/src/qmdnsengine/resolver.cpp
@@ -104,6 +104,7 @@ void ResolverPrivate::onTimeout()
     foreach (Record record, existing()) {
         emit q->resolved(record.name(), record.address());
     }
+    qDebug() << "ResolverPrivate::onTimeout on " << name;
 }
 
 Resolver::Resolver(AbstractServer *server, const QByteArray &name, Cache *cache, QObject *parent)

diff --git a/src/spmdns.cpp b/src/spmdns.cpp
@@ -11,7 +11,6 @@ SPMDNS::SPMDNS(QObject *parent) : QObject(parent) {
     this->server = new  QMdnsEngine::Server();
     this->cache = new QMdnsEngine::Cache();
     this->browser = new QMdnsEngine::Browser(server, "_spotify-connect._tcp.local.", cache);
-    resolver = nullptr;
 
     connect(browser, &QMdnsEngine::Browser::serviceAdded, this, &SPMDNS::serviceAddedCallback);
     connect(browser, &QMdnsEngine::Browser::serviceUpdated, this, &SPMDNS::serviceUpdatedCallback);
@@ -34,12 +33,17 @@ void SPMDNS::serviceChangedHandler(const QMdnsEngine::Service &service, bool add
         emit serviceUpdated(json);
 
     // resolve it
-    if(resolver) {
-        delete resolver;
-        resolver = nullptr;
+    if(resolvers.contains(service.hostname())) { // already one
+        //qDebug() << "Resolver already exists for: " << service.hostname();
+        QMdnsEngine::Resolver * old = resolvers[service.hostname()];
+        resolvers.remove(service.hostname());
+        delete old;
     }
-    resolver = new QMdnsEngine::Resolver(server, service.hostname(), cache);
+
+    QMdnsEngine::Resolver * resolver = new QMdnsEngine::Resolver(server, service.hostname(), cache);
     connect(resolver, &QMdnsEngine::Resolver::resolved, this, &SPMDNS::resolvedCallback);
+    resolvers[service.hostname()] = resolver;
+    //qDebug() << "Created resolver for: " << service.hostname();
 }
 
 void SPMDNS::serviceAddedCallback(const QMdnsEngine::Service &service) {

diff --git a/src/spmdns.h b/src/spmdns.h
@@ -2,6 +2,7 @@
 #define MDNS_H
 
 #include <QObject>
+#include <QMap>
 
 #include "qmdnsengine/server.h"
 #include "qmdnsengine/service.h"
@@ -37,7 +38,7 @@ protected slots:
     QMdnsEngine::Server * server;
     QMdnsEngine::Cache * cache;
     QMdnsEngine::Browser * browser;
-    QMdnsEngine::Resolver * resolver;
+    QMap <QString, QMdnsEngine::Resolver *> resolvers;
 };
 
 #endif // MDNS_H