LibCecSharp: delete the internal callback struct when closing the connection

[deb_libcec.git] / src / LibCecSharp / LibCecSharp.cpp

diff --git a/src/LibCecSharp/LibCecSharp.cpp b/src/LibCecSharp/LibCecSharp.cpp
index 4e76ead7a6ab264252ef97040448e9909fb93729..971dc4d6f7daea3d3370b127ade3a2ec6d8d0f47 100644 (file)
--- a/src/LibCecSharp/LibCecSharp.cpp
+++ b/src/LibCecSharp/LibCecSharp.cpp
@@ -45,19 +45,18 @@ namespace CecSharp
        public:
          LibCecSharp(LibCECConfiguration ^config)
                {
-                       m_configuration = config;
-                       CecCallbackMethods::EnableCallbacks(m_configuration->Callbacks);
-                       if (!InitialiseLibCec())
+                       CecCallbackMethods::EnableCallbacks(config->Callbacks);
+                       if (!InitialiseLibCec(config))
                                throw gcnew Exception("Could not initialise LibCecSharp");
                }
 
                LibCecSharp(String ^ strDeviceName, CecDeviceTypeList ^ deviceTypes)
                {
-                       m_configuration = gcnew LibCECConfiguration();
-                       m_configuration->SetCallbacks(this);
-                       m_configuration->DeviceName  = strDeviceName;
-                       m_configuration->DeviceTypes = deviceTypes;
-                       if (!InitialiseLibCec())
+                       LibCECConfiguration ^config = gcnew LibCECConfiguration();
+                       config->SetCallbacks(this);
+                       config->DeviceName  = strDeviceName;
+                       config->DeviceTypes = deviceTypes;
+                       if (!InitialiseLibCec(config))
                                throw gcnew Exception("Could not initialise LibCecSharp");
                }
           
@@ -74,36 +73,48 @@ namespace CecSharp
                        m_libCec = NULL;
                }
 
-               bool InitialiseLibCec(void)
+               bool InitialiseLibCec(LibCECConfiguration ^config)
                {
                        marshal_context ^ context = gcnew marshal_context();
-                       libcec_configuration config;
-                       GetConfiguration(context, config);
+                       libcec_configuration libCecConfig;
+                       ConvertConfiguration(context, config, libCecConfig);
 
-                       m_libCec = (ICECAdapter *) CECInitialise(&config);
+                       m_libCec = (ICECAdapter *) CECInitialise(&libCecConfig);
 
                        delete context;
                        return m_libCec != NULL;
                }
 
-               void GetConfiguration(marshal_context ^context, libcec_configuration &config)
+         void ConvertConfiguration(marshal_context ^context, LibCECConfiguration ^netConfig, CEC::libcec_configuration &config)
                {
                        config.Clear();
 
-                       _snprintf_s(config.strDeviceName, 13, context->marshal_as<const char*>(m_configuration->DeviceName));
+                       _snprintf_s(config.strDeviceName, 13, context->marshal_as<const char*>(netConfig->DeviceName));
                        for (unsigned int iPtr = 0; iPtr < 5; iPtr++)
-                               config.deviceTypes.types[iPtr] = (cec_device_type)m_configuration->DeviceTypes->Types[iPtr];
-
-                       config.iPhysicalAddress = m_configuration->PhysicalAddress;
-                       config.baseDevice = (cec_logical_address)m_configuration->BaseDevice;
-                       config.iHDMIPort = m_configuration->HDMIPort;
-                       config.clientVersion = (cec_client_version)m_configuration->ClientVersion;
-                       config.bGetSettingsFromROM = m_configuration->GetSettingsFromROM;
-                       config.bPowerOnStartup = m_configuration->PowerOnStartup;
-                       config.bPowerOffShutdown = m_configuration->PowerOffShutdown;
-                       config.bPowerOffScreensaver = m_configuration->PowerOffScreensaver;
-                       config.bPowerOffOnStandby = m_configuration->PowerOffOnStandby;
-                       config.callbacks = &g_cecCallbacks;
+                               config.deviceTypes.types[iPtr] = (cec_device_type)netConfig->DeviceTypes->Types[iPtr];
+
+                       config.iPhysicalAddress     = netConfig->PhysicalAddress;
+                       config.baseDevice           = (cec_logical_address)netConfig->BaseDevice;
+                       config.iHDMIPort            = netConfig->HDMIPort;
+                       config.clientVersion        = (cec_client_version)netConfig->ClientVersion;
+                       config.bGetSettingsFromROM  = netConfig->GetSettingsFromROM;
+                       config.bActivateSource      = netConfig->ActivateSource;
+                       config.tvVendor             = (cec_vendor_id)netConfig->TvVendor;
+                       config.wakeDevices.Clear();
+                       for (int iPtr = 0; iPtr < 16; iPtr++)
+                       {
+                               if (netConfig->WakeDevices->IsSet((CecLogicalAddress)iPtr))
+                                       config.wakeDevices.Set((cec_logical_address)iPtr);
+                       }
+                       config.powerOffDevices.Clear();
+                       for (int iPtr = 0; iPtr < 16; iPtr++)
+                       {
+                               if (netConfig->PowerOffDevices->IsSet((CecLogicalAddress)iPtr))
+                                       config.powerOffDevices.Set((cec_logical_address)iPtr);
+                       }
+                       config.bPowerOffScreensaver = netConfig->PowerOffScreensaver;
+                       config.bPowerOffOnStandby   = netConfig->PowerOffOnStandby;
+                       config.callbacks            = &g_cecCallbacks;
                }
 
        public:
@@ -137,7 +148,9 @@ namespace CecSharp
                void Close(void)
                {
                        // delete the callbacks, since these might already have been destroyed in .NET
+                       CecCallbackMethods::DisableCallbacks();
                        m_libCec->EnableCallbacks(NULL, NULL);
+                       m_libCec->StandbyDevices();
                        m_libCec->Close();
                }
 
@@ -423,11 +436,24 @@ namespace CecSharp
                                configuration->PhysicalAddress = config.iPhysicalAddress;
                                configuration->PowerOffOnStandby = config.bPowerOffOnStandby == 1;
                                configuration->PowerOffScreensaver = config.bPowerOffScreensaver == 1;
-                               configuration->PowerOffShutdown = config.bPowerOffShutdown == 1;
-                               configuration->PowerOnStartup = config.bPowerOnStartup == 1;
+                               configuration->ActivateSource = config.bActivateSource == 1;
+                               configuration->TvVendor = (CecVendorId)config.tvVendor;
+
+                               configuration->WakeDevices->Clear();
+                               int iDevices(0);
+                               for (uint8_t iPtr = 0; iPtr <= 16; iPtr++)
+                                       if (config.wakeDevices[iPtr])
+                                               configuration->WakeDevices->Addresses[iDevices++] = (CecLogicalAddress)iPtr;
+
+                               configuration->PowerOffDevices->Clear();
+                               iDevices = 0;
+                               for (uint8_t iPtr = 0; iPtr <= 16; iPtr++)
+                                       if (config.powerOffDevices[iPtr])
+                                               configuration->PowerOffDevices->Addresses[iDevices++] = (CecLogicalAddress)iPtr;
+
                                configuration->UseTVMenuLanguage = config.bUseTVMenuLanguage == 1;
                                for (unsigned int iPtr = 0; iPtr < 5; iPtr++)
-                                       m_configuration->DeviceTypes->Types[iPtr] = (CecDeviceType)config.deviceTypes.types[iPtr];
+                                       configuration->DeviceTypes->Types[iPtr] = (CecDeviceType)config.deviceTypes.types[iPtr];
                                return true;
                        }
                        return false;
@@ -442,7 +468,7 @@ namespace CecSharp
                {
                        marshal_context ^ context = gcnew marshal_context();
                        libcec_configuration config;
-                       GetConfiguration(context, config);
+                       ConvertConfiguration(context, configuration, config);
 
                        bool bReturn = m_libCec->PersistConfiguration(&config);
 
@@ -450,6 +476,18 @@ namespace CecSharp
                        return bReturn;
                }
 
+               bool SetConfiguration(LibCECConfiguration ^configuration)
+               {
+                       marshal_context ^ context = gcnew marshal_context();
+                       libcec_configuration config;
+                       ConvertConfiguration(context, configuration, config);
+
+                       bool bReturn = m_libCec->SetConfiguration(&config);
+
+                       delete context;
+                       return bReturn;
+               }
+
                String ^ ToString(CecLogicalAddress iAddress)
                {
                        const char *retVal = m_libCec->ToString((cec_logical_address)iAddress);
@@ -512,6 +550,5 @@ namespace CecSharp
 
        private:
                ICECAdapter *        m_libCec;
-               LibCECConfiguration ^m_configuration;
        };
 }