added changelog and bumped version numbers for 1.6.3
[deb_libcec.git] / src / LibCecSharp / LibCecSharp.cpp
index 1c073d9baedaae0e15989df8daf2821f54447c63..97329b3e9cd773e8dd531528c3c815dc24588261 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;
@@ -89,19 +91,54 @@ 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.bPowerOnStartup      = netConfig->PowerOnStartup;
-                       config.bPowerOffShutdown    = netConfig->PowerOffShutdown;
-                       config.bPowerOffScreensaver = netConfig->PowerOffScreensaver;
-                       config.bPowerOffOnStandby   = netConfig->PowerOffOnStandby;
+                       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++)
+                       {
+                               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 ? 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;
                }
 
@@ -126,6 +163,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);
@@ -135,11 +174,18 @@ namespace CecSharp
 
                void Close(void)
                {
-                       // delete the callbacks, since these might already have been destroyed in .NET
-                       m_libCec->EnableCallbacks(NULL, NULL);
+                       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))
@@ -314,6 +360,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();
@@ -416,17 +467,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->PowerOffShutdown = config.bPowerOffShutdown == 1;
-                               configuration->PowerOnStartup = config.bPowerOnStartup == 1;
-                               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;
@@ -461,6 +502,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);
@@ -521,7 +587,20 @@ 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);
+               }
+
        private:
                ICECAdapter *        m_libCec;
+    CecCallbackMethods ^ m_callbacks;
        };
 }