LibCecSharp: fixed - set the primary LA in CecLogicalAddresses
[deb_libcec.git] / src / LibCecSharp / LibCecSharp.cpp
index c02c4ea8a66c65546f9d5fbf4609276939dc325b..634edc5ecbb62abafb8a911488049e680c7a5439 100644 (file)
@@ -45,13 +45,15 @@ namespace CecSharp
        public:
          LibCecSharp(LibCECConfiguration ^config)
                {
-                       CecCallbackMethods::EnableCallbacks(config->Callbacks);
+      m_callbacks = config->Callbacks;
+                       CecCallbackMethods::EnableCallbacks(m_callbacks);
                        if (!InitialiseLibCec(config))
                                throw gcnew Exception("Could not initialise LibCecSharp");
                }
 
                LibCecSharp(String ^ strDeviceName, CecDeviceTypeList ^ deviceTypes)
                {
+      m_callbacks = gcnew CecCallbackMethods();
                        LibCECConfiguration ^config = gcnew LibCECConfiguration();
                        config->SetCallbacks(this);
                        config->DeviceName  = strDeviceName;
@@ -80,6 +82,7 @@ namespace CecSharp
                        ConvertConfiguration(context, config, libCecConfig);
 
                        m_libCec = (ICECAdapter *) CECInitialise(&libCecConfig);
+                       config->Update(libCecConfig);
 
                        delete context;
                        return m_libCec != NULL;
@@ -89,16 +92,18 @@ namespace CecSharp
                {
                        config.Clear();
 
-                       _snprintf_s(config.strDeviceName, 13, context->marshal_as<const char*>(netConfig->DeviceName));
+                       const char *strDeviceName = context->marshal_as<const char*>(netConfig->DeviceName);
+                       memcpy_s(config.strDeviceName, 13, strDeviceName, 13);
                        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,9 +117,28 @@ namespace CecSharp
                                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;
+                       config.bPowerOffScreensaver = netConfig->PowerOffScreensaver ? 1 : 0;
+                       config.bPowerOffOnStandby   = netConfig->PowerOffOnStandby ? 1 : 0;
+
+                       if (netConfig->ServerVersion >= CecServerVersion::Version1_5_1)
+                               config.bSendInactiveSource  = netConfig->SendInactiveSource ? 1 : 0;
+
+                       if (netConfig->ServerVersion >= CecServerVersion::Version1_6_0)
+                       {
+                               config.bPowerOffDevicesOnStandby  = netConfig->PowerOffDevicesOnStandby ? 1 : 0;
+                               config.bShutdownOnStandby         = netConfig->ShutdownOnStandby ? 1 : 0;
+                       }
+
+                       if (netConfig->ServerVersion >= CecServerVersion::Version1_6_2)
+                       {
+                               const char *strDeviceLanguage = context->marshal_as<const char*>(netConfig->DeviceLanguage);
+                               memcpy_s(config.strDeviceLanguage, 3, strDeviceLanguage, 3);
+                       }
+
+                       if (netConfig->ServerVersion >= CecServerVersion::Version1_6_3)
+                         config.bMonitorOnly = netConfig->MonitorOnlyClient ? 1 : 0;
+
+                       config.callbacks = &g_cecCallbacks;
                }
 
        public:
@@ -138,6 +162,8 @@ namespace CecSharp
 
                bool Open(String ^ strPort, int iTimeoutMs)
                {
+      CecCallbackMethods::EnableCallbacks(m_callbacks);
+      EnableCallbacks(m_callbacks);
                        marshal_context ^ context = gcnew marshal_context();
                        const char* strPortC = context->marshal_as<const char*>(strPort);
                        bool bReturn = m_libCec->Open(strPortC, iTimeoutMs);
@@ -146,18 +172,23 @@ namespace CecSharp
                }
 
                void Close(void)
+               {
+                       DisableCallbacks();
+                       m_libCec->Close();
+               }
+
+               virtual void DisableCallbacks(void) override
                {
                        // 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();
+                       if (m_libCec)
+                               m_libCec->EnableCallbacks(NULL, NULL);
                }
 
                virtual bool EnableCallbacks(CecCallbackMethods ^ callbacks) override
                {
                        if (m_libCec && CecCallbackMethods::EnableCallbacks(callbacks))
-                               return m_libCec->EnableCallbacks(NULL, &g_cecCallbacks);
+                               return m_libCec->EnableCallbacks((void*)GetCallbackPtr(), &g_cecCallbacks);
 
                        return false;
                }
@@ -203,7 +234,7 @@ namespace CecSharp
                        cec_keypress key;
                        if (m_libCec->GetNextKeypress(&key))
                        {
-                               return gcnew CecKeypress(key.keycode, key.duration);
+                               return gcnew CecKeypress((CecUserControlCode)key.keycode, key.duration);
                        }
 
                        return gcnew CecKeypress();
@@ -328,6 +359,11 @@ namespace CecSharp
                        return (CecPowerStatus) m_libCec->GetDevicePowerStatus((cec_logical_address) logicalAddress);
                }
 
+               void RescanActiveDevices(void)
+               {
+                       m_libCec->RescanActiveDevices();
+               }
+
                CecLogicalAddresses ^ GetActiveDevices(void)
                {
                        CecLogicalAddresses ^ retVal = gcnew CecLogicalAddresses();
@@ -430,28 +466,7 @@ namespace CecSharp
 
                        if (m_libCec->GetCurrentConfiguration(&config))
                        {
-                               configuration->BaseDevice = (CecLogicalAddress)config.baseDevice;
-                               configuration->DeviceName = gcnew String(config.strDeviceName);
-                               configuration->HDMIPort = config.iHDMIPort;
-                               configuration->PhysicalAddress = config.iPhysicalAddress;
-                               configuration->PowerOffOnStandby = config.bPowerOffOnStandby == 1;
-                               configuration->PowerOffScreensaver = config.bPowerOffScreensaver == 1;
-                               configuration->ActivateSource = config.bActivateSource == 1;
-                               configuration->TvVendor = (CecVendorId)config.tvVendor;
-
-                               configuration->WakeDevices->Clear();
-                               for (uint8_t iPtr = 0; iPtr <= 16; iPtr++)
-                                       if (config.wakeDevices[iPtr])
-                                               configuration->WakeDevices->Set((CecLogicalAddress)iPtr);
-
-                               configuration->PowerOffDevices->Clear();
-                               for (uint8_t iPtr = 0; iPtr <= 16; iPtr++)
-                                       if (config.powerOffDevices[iPtr])
-                                               configuration->PowerOffDevices->Set((CecLogicalAddress)iPtr);
-
-                               configuration->UseTVMenuLanguage = config.bUseTVMenuLanguage == 1;
-                               for (unsigned int iPtr = 0; iPtr < 5; iPtr++)
-                                       configuration->DeviceTypes->Types[iPtr] = (CecDeviceType)config.deviceTypes.types[iPtr];
+                               configuration->Update(config);
                                return true;
                        }
                        return false;
@@ -486,6 +501,31 @@ namespace CecSharp
                        return bReturn;
                }
 
+    bool IsLibCECActiveSource()
+    {
+      return m_libCec->IsLibCECActiveSource();
+    }
+
+    bool GetDeviceInformation(String ^ port, LibCECConfiguration ^configuration, uint32_t timeoutMs)
+    {
+      bool bReturn(false);
+      marshal_context ^ context = gcnew marshal_context();
+
+      libcec_configuration config;
+                       config.Clear();
+
+      const char* strPortC = port->Length > 0 ? context->marshal_as<const char*>(port) : NULL;
+
+      if (m_libCec->GetDeviceInformation(strPortC, &config, timeoutMs))
+                       {
+                               configuration->Update(config);
+        bReturn = true;
+                       }
+
+      delete context;
+      return bReturn;
+    }
+
                String ^ ToString(CecLogicalAddress iAddress)
                {
                        const char *retVal = m_libCec->ToString((cec_logical_address)iAddress);
@@ -546,7 +586,26 @@ namespace CecSharp
                        return gcnew String(retVal);
                }
 
+               String ^ ToString(CecClientVersion version)
+               {
+                       const char *retVal = m_libCec->ToString((cec_client_version)version);
+                       return gcnew String(retVal);
+               }
+
+               String ^ ToString(CecServerVersion version)
+               {
+                       const char *retVal = m_libCec->ToString((cec_server_version)version);
+                       return gcnew String(retVal);
+               }
+
+               String ^ GetLibInfo()
+               {
+                       const char *retVal = m_libCec->GetLibInfo();
+                       return gcnew String(retVal);
+               }
+
        private:
                ICECAdapter *        m_libCec;
+    CecCallbackMethods ^ m_callbacks;
        };
 }