cec: moved the autodetect address api call to libcec_configuration. only send power...

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

diff --git a/src/LibCecSharp/LibCecSharp.cpp b/src/LibCecSharp/LibCecSharp.cpp
index 9c1c44ad0a7ca5db1eba0822809eee24a0893265..4bf39f06354378f82ab4d0fc4f9b13d5b707f33b 100644 (file)
--- a/src/LibCecSharp/LibCecSharp.cpp
+++ b/src/LibCecSharp/LibCecSharp.cpp
@@ -93,12 +93,13 @@ namespace CecSharp
                        for (unsigned int iPtr = 0; iPtr < 5; iPtr++)
                                config.deviceTypes.types[iPtr] = (cec_device_type)netConfig->DeviceTypes->Types[iPtr];
 
+                       config.bAutodetectAddress   = netConfig->AutodetectAddress ? 1 : 0;
                        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.bGetSettingsFromROM  = netConfig->GetSettingsFromROM ? 1 : 0;
+                       config.bActivateSource      = netConfig->ActivateSource ? 1 : 0;
                        config.tvVendor             = (cec_vendor_id)netConfig->TvVendor;
                        config.wakeDevices.Clear();
                        for (int iPtr = 0; iPtr < 16; iPtr++)
@@ -112,8 +113,8 @@ namespace CecSharp
                                if (netConfig->PowerOffDevices->IsSet((CecLogicalAddress)iPtr))
                                        config.powerOffDevices.Set((cec_logical_address)iPtr);
                        }
-                       config.bPowerOffScreensaver = netConfig->PowerOffScreensaver;
-                       config.bPowerOffOnStandby   = netConfig->PowerOffOnStandby;
+                       config.bPowerOffScreensaver = netConfig->PowerOffScreensaver ? 1 : 0;
+                       config.bPowerOffOnStandby   = netConfig->PowerOffOnStandby ? 1 : 0;
                        config.callbacks            = &g_cecCallbacks;
                }
 
@@ -147,12 +148,18 @@ namespace CecSharp
 
                void Close(void)
                {
-                       // delete the callbacks, since these might already have been destroyed in .NET
-                       m_libCec->EnableCallbacks(NULL, NULL);
-                       m_libCec->StandbyDevices();
+                       DisableCallbacks();
                        m_libCec->Close();
                }
 
+               virtual void DisableCallbacks(void) override
+               {
+                       // delete the callbacks, since these might already have been destroyed in .NET
+                       CecCallbackMethods::DisableCallbacks();
+                       if (m_libCec)
+                               m_libCec->EnableCallbacks(NULL, NULL);
+               }
+
                virtual bool EnableCallbacks(CecCallbackMethods ^ callbacks) override
                {
                        if (m_libCec && CecCallbackMethods::EnableCallbacks(callbacks))
@@ -429,6 +436,7 @@ namespace CecSharp
 
                        if (m_libCec->GetCurrentConfiguration(&config))
                        {
+                               configuration->AutodetectAddress = config.bAutodetectAddress == 1;
                                configuration->BaseDevice = (CecLogicalAddress)config.baseDevice;
                                configuration->DeviceName = gcnew String(config.strDeviceName);
                                configuration->HDMIPort = config.iHDMIPort;
@@ -439,16 +447,14 @@ namespace CecSharp
                                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->WakeDevices->Set((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->PowerOffDevices->Set((CecLogicalAddress)iPtr);
 
                                configuration->UseTVMenuLanguage = config.bUseTVMenuLanguage == 1;
                                for (unsigned int iPtr = 0; iPtr < 5; iPtr++)