moved device setting init to plugin init

Author: karuppaiyak

HdmiCecSink/HdmiCecSink.cpp

@@ -697,11 +697,11 @@ namespace WPEFramework
            try
            {
                 device::Manager::Initialize();
-                LOGINFO("device::Manager::Initialize success");
+                LOGINFO("HdmiCecSink plugin device::Manager::Initialize success");
            }
            catch(const device::Exception& err)
            {
-                LOGINFO("device::Manager::Initialize failed");
+                LOGINFO("HdmiCecSink plugin device::Manager::Initialize failed");
                 msg = "HdmiCecSink plugin Initialize failed";
                 LOG_DEVICE_EXCEPTION0();
            }
@@ -915,11 +915,11 @@ namespace WPEFramework
         try
         {
             device::Manager::DeInitialize();
-            LOGINFO("device::Manager::DeInitialize success");
+            LOGINFO("HdmiCecSink plugin device::Manager::DeInitialize success");
         }
         catch(const device::Exception& err)
         {
-            LOGINFO("device::Manager::DeInitialize failed");
+            LOGINFO("HdmiCecSink plugin device::Manager::DeInitialize failed");
             LOG_DEVICE_EXCEPTION0();
         }
 

HdmiCecSource/HdmiCecSource.cpp

@@ -70,29 +70,43 @@ namespace WPEFramework
            ASSERT(nullptr == _hdmiCecSource);
            ASSERT(0 == _connectionId);
 
+           try
+           {
+                device::Manager::Initialize();
+                LOGINFO("HdmiCecSource plugin device::Manager::Initialize success");
+           }
+           catch(const device::Exception& err)
+           {
+                LOGINFO("HdmiCecSource plugin device::Manager::Initialize failed");
+                msg = "HdmiCecSource plugin Initialize failed";
+                LOG_DEVICE_EXCEPTION0();
+           }
 
-           _service = service;
-           _service->AddRef();
-           _service->Register(&_notification);
-           _hdmiCecSource = _service->Root<Exchange::IHdmiCecSource>(_connectionId, 5000, _T("HdmiCecSourceImplementation"));
+           if (0 == msg.length())
+           {
+               _service = service;
+               _service->AddRef();
+               _service->Register(&_notification);
+               _hdmiCecSource = _service->Root<Exchange::IHdmiCecSource>(_connectionId, 5000, _T("HdmiCecSourceImplementation"));
 
-           if(nullptr != _hdmiCecSource)
-            {
-                _hdmiCecSource->Configure(service);
-                _hdmiCecSource->Register(&_notification);
-                Exchange::JHdmiCecSource::Register(*this, _hdmiCecSource);
-                LOGINFO("HdmiCecSource plugin is available. Successfully activated HdmiCecSource Plugin");
-            }
-            else
-            {
-                msg = "HdmiCecSource plugin is not available";
-                LOGINFO("HdmiCecSource plugin is not available. Failed to activate HdmiCecSource Plugin");
-            }
+                if(nullptr != _hdmiCecSource)
+                {
+                    _hdmiCecSource->Configure(service);
+                    _hdmiCecSource->Register(&_notification);
+                    Exchange::JHdmiCecSource::Register(*this, _hdmiCecSource);
+                    LOGINFO("HdmiCecSource plugin is available. Successfully activated HdmiCecSource Plugin");
+                }
+                else
+                {
+                    msg = "HdmiCecSource plugin is not available";
+                    LOGINFO("HdmiCecSource plugin is not available. Failed to activate HdmiCecSource Plugin");
+                }
 
-            if (0 != msg.length())
-            {
-                Deinitialize(service);
-            }
+                if (0 != msg.length())
+                {
+                    Deinitialize(service);
+                }
+           }
 
            // On success return empty, to indicate there is no error text.
            return msg;
@@ -153,6 +167,18 @@ namespace WPEFramework
            _service->Unregister(&_notification);
            _service->Release();
            _service = nullptr;
+
+           try
+           {
+               device::Manager::DeInitialize();
+               LOGINFO("HdmiCecSource plugin device::Manager::DeInitialize success");
+           }
+           catch(const device::Exception& err)
+           {
+               LOGINFO("HdmiCecSource plugin device::Manager::DeInitialize failed");
+               LOG_DEVICE_EXCEPTION0();
+           }
+
            LOGINFO("HdmiCecSource plugin is deactivated. Successfully deactivated HdmiCecSource Plugin");
         }
 

HdmiCecSource/HdmiCecSourceImplementation.cpp

@@ -424,7 +424,7 @@ namespace WPEFramework
             try
             {
                 //TODO(MROLLINS) this is probably per process so we either need to be running in our own process or be carefull no other plugin is calling it
-                device::Manager::Initialize();
+                //device::Manager::Initialize();
 
 #ifndef IO_HCEC_ENABLE_IARM
                 device::Host::getInstance().Register(baseInterface<device::Host::IDisplayDeviceEvents>(), "WPE[HdmiCecSource]");