X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2FLibCecSharp%2FLibCecSharp.cpp;h=7f0667a84066d92245f91ba1827c7aa263aabcdc;hb=142d9730b03e137b8cf5b11c2435e5544ea235dc;hp=9c1c44ad0a7ca5db1eba0822809eee24a0893265;hpb=b7907707d9d2d9e6ae198ebecf6864cb30484327;p=deb_libcec.git

diff --git a/src/LibCecSharp/LibCecSharp.cpp b/src/LibCecSharp/LibCecSharp.cpp
index 9c1c44a..7f0667a 100644
--- a/src/LibCecSharp/LibCecSharp.cpp
+++ b/src/LibCecSharp/LibCecSharp.cpp
@@ -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,16 +91,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,8 +116,29 @@ 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;
+
+			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;
 		}
 
@@ -138,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);
@@ -147,12 +174,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))
@@ -202,7 +235,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();
@@ -327,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();
@@ -429,30 +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->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++)
-					configuration->DeviceTypes->Types[iPtr] = (CecDeviceType)config.deviceTypes.types[iPtr];
+				configuration->Update(config);
 				return true;
 			}
 			return false;
@@ -487,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);
@@ -547,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;
 	};
 }