Merge branch 'master' into pwielders-patch-1

rdkcentral · Jan 31, 2024 · 8ea11c7 · 8ea11c7
2 parents c8b47e1 + e09d145
commit 8ea11c7
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 43 deletions.
diff --git a/BluetoothControl/BluetoothControl.cpp b/BluetoothControl/BluetoothControl.cpp
@@ -233,13 +233,6 @@ namespace Plugin {
     {
         ASSERT(service != nullptr);
 
-        PluginHost::ISubSystem* subSystems(service->SubSystems());
-        ASSERT(subSystems != nullptr);
-        if (subSystems != nullptr) {
-            subSystems->Set(PluginHost::ISubSystem::NOT_BLUETOOTH, nullptr);
-            subSystems->Release();
-        }
-
         if (Connector().IsOpen() == true) {
 
             Exchange::JBluetoothControl::Unregister(*this);

diff --git a/Compositor/Compositor.cpp b/Compositor/Compositor.cpp
@@ -217,17 +217,6 @@ namespace Plugin {
 
             _service->Unregister(&_notification);
 
-            // We would actually need to handle setting the Graphics event in the CompositorImplementation. For now, we do it here.
-            PluginHost::ISubSystem* subSystems = _service->SubSystems();
-
-            ASSERT(subSystems != nullptr);
-
-            if (subSystems != nullptr) {
-                // Set Graphics event. We need to set up a handler for this at a later moment
-                subSystems->Set(PluginHost::ISubSystem::NOT_GRAPHICS, nullptr);
-                subSystems->Release();
-            }
-
             if (_composition != nullptr) {
                 UnregisterAll();
                 _composition->Unregister(&_notification);

diff --git a/Streamer/Streamer.cpp b/Streamer/Streamer.cpp
@@ -102,14 +102,6 @@ namespace Plugin {
                     connection->Terminate();
                     connection->Release();
                 }
-
-                PluginHost::ISubSystem* subSystem = service->SubSystems();
-                if (subSystem != nullptr) {
-                    if (subSystem->IsActive(PluginHost::ISubSystem::STREAMING) == true) {
-                        subSystem->Set(PluginHost::ISubSystem::NOT_STREAMING, nullptr);
-                        subSystem->Release();
-                    }
-                }
             }
 
             _service->Release();

diff --git a/Svalbard/Svalbard.cpp b/Svalbard/Svalbard.cpp
@@ -73,14 +73,6 @@ namespace Plugin {
     {
         ASSERT(service != nullptr);
 
-        PluginHost::ISubSystem* subSystems(service->SubSystems());
-        ASSERT(subSystems != nullptr);
-
-        if (subSystems != nullptr) {
-            subSystems->Set(PluginHost::ISubSystem::NOT_CRYPTOGRAPHY, nullptr);
-            subSystems->Release();
-        }
-
         if (_service != nullptr) {
             ASSERT(_service == service);
 

diff --git a/WebServer/WebServer.cpp b/WebServer/WebServer.cpp
@@ -105,7 +105,7 @@ namespace Plugin {
         return message;
     }
 
-    /* virtual */ void WebServer::Deinitialize(PluginHost::IShell* service)
+    /* virtual */ void WebServer::Deinitialize(PluginHost::IShell* service VARIABLE_IS_NOT_USED)
     {
         if (_service != nullptr) {
             ASSERT(_service == _service);
@@ -114,14 +114,6 @@ namespace Plugin {
 
             if (_server != nullptr) {
 
-                PluginHost::ISubSystem* subSystem = service->SubSystems();
-                if (subSystem != nullptr) {
-                    if (subSystem->IsActive(PluginHost::ISubSystem::WEBSOURCE) == true) {
-                        subSystem->Set(PluginHost::ISubSystem::NOT_WEBSOURCE, nullptr);
-                        subSystem->Release();
-                    }
-                }
-
                 if (_memory != nullptr) {
                     _memory->Release();
                     _memory = nullptr;