X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FLibCecSharp%2FCecSharpTypes.h;h=5d617941b0f4316c422cd257c249d5aba62281b8;hb=cec99a5b6baac7c4c6cf8699abd87ad068db6bd1;hp=f385cdaa15264402487328daf2f608bfaffc7c2d;hpb=63851508ba8fac60c03c1899bf98595481a161c5;p=deb_libcec.git

diff --git a/src/LibCecSharp/CecSharpTypes.h b/src/LibCecSharp/CecSharpTypes.h
index f385cda..5d61794 100644
--- a/src/LibCecSharp/CecSharpTypes.h
+++ b/src/LibCecSharp/CecSharpTypes.h
@@ -329,6 +329,12 @@ namespace CecSharp
 		Version1_5_0  = 0x1500
 	};
 
+  public enum class CecServerVersion
+	{
+		VersionPre1_5 = 0,
+		Version1_5_0  = 0x1500
+	};
+
 	public ref class CecAdapter
 	{
 	public:
@@ -519,10 +525,12 @@ namespace CecSharp
 		{
 			DeviceName          = "";
 			DeviceTypes         = gcnew CecDeviceTypeList();
+			AutodetectAddress  = true;
 			PhysicalAddress     = CEC_DEFAULT_PHYSICAL_ADDRESS;
 			BaseDevice          = (CecLogicalAddress)CEC_DEFAULT_BASE_DEVICE;
 			HDMIPort            = CEC_DEFAULT_HDMI_PORT;
 			ClientVersion       = CecClientVersion::VersionPre1_5;
+			ServerVersion       = CecServerVersion::VersionPre1_5;
 			TvVendor            = CecVendorId::Unknown;
 
 			GetSettingsFromROM  = false;
@@ -546,12 +554,48 @@ namespace CecSharp
 			Callbacks = callbacks;
 		}
 
+		void Update(const CEC::libcec_configuration &config)
+		{
+			DeviceName = gcnew System::String(config.strDeviceName);
+
+			for (unsigned int iPtr = 0; iPtr < 5; iPtr++)
+				DeviceTypes->Types[iPtr] = (CecDeviceType)config.deviceTypes.types[iPtr];
+
+			AutodetectAddress  = config.bAutodetectAddress == 1;
+			PhysicalAddress    = config.iPhysicalAddress;
+			BaseDevice         = (CecLogicalAddress)config.baseDevice;
+			HDMIPort           = config.iHDMIPort;
+			ClientVersion      = (CecClientVersion)config.clientVersion;
+			ServerVersion      = (CecServerVersion)config.serverVersion;
+			TvVendor           = (CecVendorId)config.tvVendor;
+
+			// player specific settings
+			GetSettingsFromROM = config.bGetSettingsFromROM == 1;
+			UseTVMenuLanguage = config.bUseTVMenuLanguage == 1;
+			ActivateSource = config.bActivateSource == 1;
+
+			WakeDevices->Clear();
+			for (uint8_t iPtr = 0; iPtr <= 16; iPtr++)
+				if (config.wakeDevices[iPtr])
+					WakeDevices->Set((CecLogicalAddress)iPtr);
+
+			PowerOffDevices->Clear();
+			for (uint8_t iPtr = 0; iPtr <= 16; iPtr++)
+				if (config.powerOffDevices[iPtr])
+					PowerOffDevices->Set((CecLogicalAddress)iPtr);
+
+			PowerOffScreensaver = config.bPowerOffScreensaver == 1;
+			PowerOffOnStandby = config.bPowerOffOnStandby == 1;
+		}
+
 		property System::String ^     DeviceName;
 		property CecDeviceTypeList ^  DeviceTypes;
+		property bool                 AutodetectAddress;
 		property uint16_t             PhysicalAddress;
 		property CecLogicalAddress    BaseDevice;
 		property uint8_t              HDMIPort;
 		property CecClientVersion     ClientVersion;
+		property CecServerVersion     ServerVersion;
 		property CecVendorId          TvVendor;
 
 		// player specific settings
@@ -738,30 +782,7 @@ namespace CecSharp
 			if (m_bHasCallbacks)
 			{
 				LibCECConfiguration ^netConfig = gcnew LibCECConfiguration();
-			  netConfig->DeviceName = gcnew System::String(config.strDeviceName);
-				for (unsigned int iPtr = 0; iPtr < 5; iPtr++)
-				  netConfig->DeviceTypes->Types[iPtr] = (CecDeviceType)config.deviceTypes.types[iPtr];
-
-				netConfig->PhysicalAddress = config.iPhysicalAddress;
-				netConfig->BaseDevice = (CecLogicalAddress)config.baseDevice;
-				netConfig->HDMIPort = config.iHDMIPort;
-				netConfig->ClientVersion = (CecClientVersion)config.clientVersion;
-				netConfig->GetSettingsFromROM = config.bGetSettingsFromROM == 1;
-				netConfig->ActivateSource = config.bActivateSource == 1;
-
-				netConfig->WakeDevices->Clear();
-				for (uint8_t iPtr = 0; iPtr <= 16; iPtr++)
-					if (config.wakeDevices[iPtr])
-						netConfig->WakeDevices->Set((CecLogicalAddress)iPtr);
-
-				netConfig->PowerOffDevices->Clear();
-				for (uint8_t iPtr = 0; iPtr <= 16; iPtr++)
-					if (config.powerOffDevices[iPtr])
-						netConfig->PowerOffDevices->Set((CecLogicalAddress)iPtr);
-
-				netConfig->PowerOffScreensaver = config.bPowerOffScreensaver == 1;
-				netConfig->PowerOffOnStandby = config.bPowerOffOnStandby == 1;
-
+				netConfig->Update(config);
 				iReturn = m_callbacks->ConfigurationChanged(netConfig);
 			}
 			return iReturn;