X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2FLibCecSharp%2FLibCecSharp.cpp;h=81c857fb2fed67c2475365eab980289d32aaf21b;hb=1664420dd2cd46c9daafeb541c45d055d176bcdc;hp=014dea00741571e7d6b9c2af440d5ab83551e2df;hpb=3efda01ac7b070e09012a5725112eb44c17001b4;p=deb_libcec.git

diff --git a/src/LibCecSharp/LibCecSharp.cpp b/src/LibCecSharp/LibCecSharp.cpp
index 014dea0..81c857f 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;
@@ -82,7 +84,6 @@ namespace CecSharp
 			m_libCec = (ICECAdapter *) CECInitialise(&libCecConfig);
 			config->Update(libCecConfig);
 
-
 			delete context;
 			return m_libCec != NULL;
 		}
@@ -91,7 +92,8 @@ 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];
 
@@ -117,7 +119,26 @@ namespace CecSharp
 			}
 			config.bPowerOffScreensaver = netConfig->PowerOffScreensaver ? 1 : 0;
 			config.bPowerOffOnStandby   = netConfig->PowerOffOnStandby ? 1 : 0;
-			config.callbacks            = &g_cecCallbacks;
+
+			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:
@@ -141,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);
@@ -165,7 +188,7 @@ namespace CecSharp
 		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;
 		}
@@ -211,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();
@@ -478,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);
@@ -550,7 +598,19 @@ namespace CecSharp
 			return gcnew String(retVal);
 		}
 
+		String ^ GetLibInfo()
+		{
+			const char *retVal = m_libCec->GetLibInfo();
+			return gcnew String(retVal);
+		}
+
+		void InitVideoStandalone()
+		{
+			m_libCec->InitVideoStandalone();
+		}
+
 	private:
 		ICECAdapter *        m_libCec;
+    CecCallbackMethods ^ m_callbacks;
 	};
 }