cec: added RescanDevices()/cec_rescan_devices() to the interface, to let libCEC force...

[deb_libcec.git] / src / LibCecSharp / CecSharpTypes.h

diff --git a/src/LibCecSharp/CecSharpTypes.h b/src/LibCecSharp/CecSharpTypes.h
index 212d8181e3a758dbc7d69c0312011170ffec6962..5d617941b0f4316c422cd257c249d5aba62281b8 100644 (file)
--- 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:
@@ -366,12 +373,12 @@ namespace CecSharp
                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)
@@ -518,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;
@@ -545,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
@@ -662,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;
@@ -730,32 +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();
-                               int iDevices(0);
-                               for (uint8_t iPtr = 0; iPtr <= 16; iPtr++)
-                                       if (config.wakeDevices[iPtr])
-                                               netConfig->WakeDevices->Addresses[iDevices++] = (CecLogicalAddress)iPtr;
-
-                               netConfig->PowerOffDevices->Clear();
-                               iDevices = 0;
-                               for (uint8_t iPtr = 0; iPtr <= 16; iPtr++)
-                                       if (config.powerOffDevices[iPtr])
-                                               netConfig->PowerOffDevices->Addresses[iDevices++] = (CecLogicalAddress)iPtr;
-
-                               netConfig->PowerOffScreensaver = config.bPowerOffScreensaver == 1;
-                               netConfig->PowerOffOnStandby = config.bPowerOffOnStandby == 1;
-
+                               netConfig->Update(config);
                                iReturn = m_callbacks->ConfigurationChanged(netConfig);
                        }
                        return iReturn;