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

diff --git a/src/LibCecSharp/CecSharpTypes.h b/src/LibCecSharp/CecSharpTypes.h
index 2a32724..5d61794 100644
--- a/src/LibCecSharp/CecSharpTypes.h
+++ b/src/LibCecSharp/CecSharpTypes.h
@@ -236,6 +236,7 @@ namespace CecSharp
 		Onkyo     = 0x09B0,
 		Yamaha    = 0xA0DE,
 		Philips   = 0x903E,
+		Sony      = 0x080046,
 		Unknown   = 0
 	};
 
@@ -328,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:
@@ -360,13 +367,23 @@ namespace CecSharp
 		CecLogicalAddresses(void)
 		{
 			Addresses = gcnew array<CecLogicalAddress>(16);
+			Clear();
+		}
+
+		void Clear(void)
+		{
 			for (unsigned int iPtr = 0; iPtr < 16; iPtr++)
-				Addresses[iPtr] = CecLogicalAddress::Unregistered;
+				Addresses[iPtr] = CecLogicalAddress::Unknown;
 		}
 
 		bool IsSet(CecLogicalAddress iAddress)
 		{
-			return Addresses[(unsigned int)iAddress] != CecLogicalAddress::Unregistered;
+			return Addresses[(unsigned int)iAddress] != CecLogicalAddress::Unknown;
+		}
+
+	  void Set(CecLogicalAddress iAddress)
+		{
+			Addresses[(unsigned int)iAddress] = iAddress;
 		}
 
 		property CecLogicalAddress          Primary;
@@ -508,15 +525,26 @@ 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;
 			UseTVMenuLanguage   = CEC_DEFAULT_SETTING_USE_TV_MENU_LANGUAGE == 1;
-			PowerOnStartup      = CEC_DEFAULT_SETTING_POWER_ON_STARTUP == 1;
-			PowerOffShutdown    = CEC_DEFAULT_SETTING_POWER_OFF_SHUTDOWN == 1;
+			ActivateSource      = CEC_DEFAULT_SETTING_ACTIVATE_SOURCE == 1;
+
+			WakeDevices         = gcnew CecLogicalAddresses();
+			if (CEC_DEFAULT_SETTING_ACTIVATE_SOURCE == 1)
+				WakeDevices->Set(CecLogicalAddress::Tv);
+
+			PowerOffDevices     = gcnew CecLogicalAddresses();
+			if (CEC_DEFAULT_SETTING_POWER_OFF_SHUTDOWN == 1)
+				PowerOffDevices->Set(CecLogicalAddress::Broadcast);
+
 			PowerOffScreensaver = CEC_DEFAULT_SETTING_POWER_OFF_SCREENSAVER == 1;
 			PowerOffOnStandby   = CEC_DEFAULT_SETTING_POWER_OFF_ON_STANDBY == 1;
 		}
@@ -526,22 +554,60 @@ namespace CecSharp
 			Callbacks = callbacks;
 		}
 
-		property System::String ^    DeviceName;
-		property CecDeviceTypeList ^ DeviceTypes;
-		property uint16_t            PhysicalAddress;
-		property CecLogicalAddress   BaseDevice;
-		property uint8_t             HDMIPort;
-		property CecClientVersion    ClientVersion;
+		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
-		property bool                GetSettingsFromROM;
-		property bool                UseTVMenuLanguage;
-		property bool                PowerOnStartup;
-		property bool                PowerOffShutdown;
-		property bool                PowerOffScreensaver;
-		property bool                PowerOffOnStandby;
-
-		property CecCallbackMethods ^Callbacks;
+		property bool                 GetSettingsFromROM;
+		property bool                 UseTVMenuLanguage;
+		property bool                 ActivateSource;
+		property CecLogicalAddresses ^WakeDevices;
+		property CecLogicalAddresses ^PowerOffDevices;
+		property bool                 PowerOffScreensaver;
+		property bool                 PowerOffOnStandby;
+
+		property CecCallbackMethods ^ Callbacks;
 	};
 
 	// the callback methods are called by unmanaged code, so we need some delegates for this
@@ -641,8 +707,15 @@ namespace CecSharp
    }
 
 	public:
+		virtual void DisableCallbacks(void)
+		{
+			if (m_bHasCallbacks)
+				delete m_callbacks;
+			m_bHasCallbacks = false;
+		}
 		virtual bool EnableCallbacks(CecCallbackMethods ^ callbacks)
 		{
+			DisableCallbacks();
 			if (!m_bHasCallbacks)
 			{
 				m_bHasCallbacks = true;
@@ -709,20 +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->PowerOnStartup = config.bPowerOnStartup == 1;
-				netConfig->PowerOffShutdown = config.bPowerOffShutdown == 1;
-				netConfig->PowerOffScreensaver = config.bPowerOffScreensaver == 1;
-				netConfig->PowerOffOnStandby = config.bPowerOffOnStandby == 1;
-
+				netConfig->Update(config);
 				iReturn = m_callbacks->ConfigurationChanged(netConfig);
 			}
 			return iReturn;