AVInput COM-RPC Support: Moved ARM init into AVInput

Author: pahearn73

AVInput/AVInput.cpp

@@ -89,6 +89,10 @@ namespace Plugin {
         _avInput = service->Root<Exchange::IAVInput>(_connectionId, 5000, _T("AVInputImplementation"));
 
         if (nullptr != _avInput) {
+            // <pca>
+            _avInput->InitializeIARM();
+            // </pca>
+
             // Register for notifications
             _avInput->Register(_avInputNotification.baseInterface<Exchange::IAVInput::IDevicesChangedNotification>());
             _avInput->Register(_avInputNotification.baseInterface<Exchange::IAVInput::ISignalChangedNotification>());
@@ -117,6 +121,10 @@ namespace Plugin {
         _service->Unregister(&_avInputNotification);
 
         if (nullptr != _avInput) {
+            // <pca>
+            _avInput->DeinitializeIARM();
+            // </pca>
+
             _avInput->Unregister(_avInputNotification.baseInterface<Exchange::IAVInput::IDevicesChangedNotification>());
             _avInput->Unregister(_avInputNotification.baseInterface<Exchange::IAVInput::ISignalChangedNotification>());
             _avInput->Unregister(_avInputNotification.baseInterface<Exchange::IAVInput::IInputStatusChangedNotification>());

AVInput/AVInputImplementation.cpp

@@ -49,12 +49,16 @@ namespace Plugin {
     {
         LOGINFO("Create AVInputImplementation Instance");
         AVInputImplementation::_instance = this;
-        InitializeIARM();
+        // <pca>
+        //InitializeIARM();
+        // </pca>
     }
 
     AVInputImplementation::~AVInputImplementation()
     {
-        DeinitializeIARM();
+        // <pca>
+        //DeinitializeIARM();
+        // </pca>
 
         AVInputImplementation::_instance = nullptr;
         _service = nullptr;

AVInput/AVInputImplementation.h

@@ -117,6 +117,11 @@ namespace Plugin {
                 _avInputImplementation->Dispatch(_event, _params);
             }
 
+            // <pca>
+            void InitializeIARM();
+            void DeinitializeIARM();
+            // </pca>
+
         protected:
 
             Job(AVInputImplementation* avInputImplementation, Event event, ParamsType& params)
@@ -201,8 +206,10 @@ namespace Plugin {
         int m_primVolume;
         int m_inputVolume; // Player Volume
 
-        void InitializeIARM();
-        void DeinitializeIARM();
+        // <pca>
+        // void InitializeIARM();
+        // void DeinitializeIARM();
+        // </pca>
 
         void dispatchEvent(Event, const ParamsType params);
         void Dispatch(Event event, const ParamsType params);