1 files changed, 14 insertions, 2 deletions
diff --git a/src/tools/media-simulation-server/qivimediadiscoveryqtroadapter.cpp b/src/tools/media-simulation-server/qivimediadiscoveryqtroadapter.cpp
index 98fc70d..926d2bb 100644
--- a/src/tools/media-simulation-server/qivimediadiscoveryqtroadapter.cpp
+++ b/src/tools/media-simulation-server/qivimediadiscoveryqtroadapter.cpp
@@ -47,7 +47,13 @@
 #include <QRemoteObjectRegistryHost>
 
 QIviMediaDiscoveryModelQtRoAdapter::QIviMediaDiscoveryModelQtRoAdapter(MediaDiscoveryBackend *parent)
-    : QIviMediaDiscoveryModelSource (parent)
+    : QIviMediaDiscoveryModelQtRoAdapter(QStringLiteral("QtIviMedia.QIviMediaDiscoveryModel"), parent)
+{
+}
+
+QIviMediaDiscoveryModelQtRoAdapter::QIviMediaDiscoveryModelQtRoAdapter(const QString &remoteObjectsLookupName, MediaDiscoveryBackend *parent)
+    : QIviMediaDiscoveryModelSource(parent)
+    , m_remoteObjectsLookupName(remoteObjectsLookupName)
     , m_backend(parent)
 {
     QMap<QString, QIviServiceObject*> deviceMap = m_backend->deviceMap();
@@ -62,6 +68,12 @@ QIviMediaDiscoveryModelQtRoAdapter::QIviMediaDiscoveryModelQtRoAdapter(MediaDisc
     connect(m_backend, &MediaDiscoveryBackend::deviceRemoved, this, &QIviMediaDiscoveryModelQtRoAdapter::onDeviceRemoved);
 }
 
+
+QString QIviMediaDiscoveryModelQtRoAdapter::remoteObjectsLookupName() const
+{
+    return m_remoteObjectsLookupName;
+}
+
 QStringList QIviMediaDiscoveryModelQtRoAdapter::devices() const
 {
     return QStringList(m_hostMap.keys());
@@ -98,7 +110,7 @@ void QIviMediaDiscoveryModelQtRoAdapter::createDeviceAdapter(QIviMediaDevice *de
     QIviSearchAndBrowseModelInterface *searchAndBrowseBackend = qivi_interface_cast<QIviSearchAndBrowseModelInterface *>(device->interfaceInstance(QStringLiteral(QIviSearchAndBrowseModel_iid)));
 
     searchAndBrowseBackend->initialize();
-    auto instance = new QIviSearchAndBrowseModelQtRoAdapter(searchAndBrowseBackend, QStringLiteral("QIviSearchAndBrowseModel_") + device->name());
+    auto instance = new QIviSearchAndBrowseModelQtRoAdapter(QStringLiteral("QIviSearchAndBrowseModel_") + device->name(), searchAndBrowseBackend);
     Core::instance()->host()->enableRemoting<QIviSearchAndBrowseModelAddressWrapper>(instance);
 
     m_hostMap.insert(device->name(), instance);