AVInput COM-RPC Support: Debugging unit tests

Author: pahearn73

AVInput/AVInput.cpp

@@ -86,6 +86,10 @@ namespace Plugin {
 
         if (nullptr != _avInput) {
 
+            // <pca> 2
+            _avInput->initialize(_avInputNotification);
+            // </pca>
+
             // Register for notifications
             _avInput->RegisterDevicesChangedNotification(_avInputNotification.baseInterface<Exchange::IAVInput::IDevicesChangedNotification>());
             _avInput->RegisterSignalChangedNotification(_avInputNotification.baseInterface<Exchange::IAVInput::ISignalChangedNotification>());
@@ -115,6 +119,11 @@ namespace Plugin {
 
         if (nullptr != _avInput) {
 
+            // <pca> 2
+            _avInput->deinitialize();
+            // If this works move the stuff below to AVInputImplementation::deinitialize()
+            // </pca>
+
             _avInput->UnregisterDevicesChangedNotification(_avInputNotification.baseInterface<Exchange::IAVInput::IDevicesChangedNotification>());
             _avInput->UnregisterSignalChangedNotification(_avInputNotification.baseInterface<Exchange::IAVInput::ISignalChangedNotification>());
             _avInput->UnregisterInputStatusChangedNotification(_avInputNotification.baseInterface<Exchange::IAVInput::IInputStatusChangedNotification>());

AVInput/AVInputImplementation.cpp

@@ -53,37 +53,73 @@ namespace Plugin {
 
         AVInputImplementation::_instance = this;
 
+        // <pca> 2
+        // try {
+        //     device::Manager::Initialize();
+        //     LOGINFO("device::Manager::Initialize success");
+        //     if (!_registeredDsEventHandlers) {
+        //         _registeredDsEventHandlers = true;
+        //         device::Host::getInstance().Register(baseInterface<device::Host::IHdmiInEvents>(), "WPE::AVInputHdmi");
+        //         device::Host::getInstance().Register(baseInterface<device::Host::ICompositeInEvents>(), "WPE::AVInputComp");
+        //     }
+        // }
+        // catch(const device::Exception& err) {
+        //     LOGINFO("AVInput: Initialization failed due to device::manager::Initialize()");
+        //     LOG_DEVICE_EXCEPTION0();
+        // }
+        // </pca>
+    }
+
+    AVInputImplementation::~AVInputImplementation()
+    {
+        device::Host::getInstance().UnRegister(baseInterface<device::Host::IHdmiInEvents>());
+        device::Host::getInstance().UnRegister(baseInterface<device::Host::ICompositeInEvents>());
+        _registeredDsEventHandlers = false;
+        try {
+            device::Manager::DeInitialize();
+            LOGINFO("device::Manager::DeInitialize success");
+        }
+        catch(const device::Exception& err) {
+            LOGINFO("device::Manager::DeInitialize failed due to device::Manager::DeInitialize()");
+            LOG_DEVICE_EXCEPTION0();
+        }
+
+        AVInputImplementation::_instance = nullptr;
+    }
+
+    // <pca> 2
+    void initialize(Core::Sink<Notification> notification)
+    {
         try {
             device::Manager::Initialize();
-            LOGINFO("device::Manager::Initialize success");
+            LOGINFO("initialize: device::Manager::Initialize success");
             if (!_registeredDsEventHandlers) {
                 _registeredDsEventHandlers = true;
                 device::Host::getInstance().Register(baseInterface<device::Host::IHdmiInEvents>(), "WPE::AVInputHdmi");
                 device::Host::getInstance().Register(baseInterface<device::Host::ICompositeInEvents>(), "WPE::AVInputComp");
             }
         }
         catch(const device::Exception& err) {
-            LOGINFO("AVInput: Initialization failed due to device::manager::Initialize()");
+            LOGINFO("initialize: Initialization failed due to device::manager::Initialize()");
             LOG_DEVICE_EXCEPTION0();
         }
     }
 
-    AVInputImplementation::~AVInputImplementation()
+    void deinitialize()
     {
         device::Host::getInstance().UnRegister(baseInterface<device::Host::IHdmiInEvents>());
         device::Host::getInstance().UnRegister(baseInterface<device::Host::ICompositeInEvents>());
         _registeredDsEventHandlers = false;
         try {
             device::Manager::DeInitialize();
-            LOGINFO("device::Manager::DeInitialize success");
+            LOGINFO("deinitialize: device::Manager::DeInitialize success");
         }
         catch(const device::Exception& err) {
-            LOGINFO("device::Manager::DeInitialize failed due to device::Manager::DeInitialize()");
+            LOGINFO("deinitialize: device::Manager::DeInitialize failed due to device::Manager::DeInitialize()");
             LOG_DEVICE_EXCEPTION0();
         }
-
-        AVInputImplementation::_instance = nullptr;
     }
+    // </pca>
 
     template <typename T>
     Core::hresult AVInputImplementation::Register(std::list<T*>& list, T* notification)

AVInput/AVInputImplementation.h

@@ -105,6 +105,11 @@ namespace Plugin {
             return static_cast<T*>(this);
         }
 
+        // <pca> 2
+        void initialize(Core::Sink<Notification> notification);
+        void deinitialize();
+        // </pca>
+
         class EXTERNAL Job : public Core::IDispatch {
 
         public: