LibCecSharp: don't use an int but a CecUserControlCode in a CecKeypress

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

diff --git a/src/LibCecSharp/CecSharpTypes.h b/src/LibCecSharp/CecSharpTypes.h
index 1e808196a881de53bdc045d21a81be02a1f5dd10..f17ee610162d3778f2c937a79cd3beb7305d3ecb 100644 (file)
--- a/src/LibCecSharp/CecSharpTypes.h
+++ b/src/LibCecSharp/CecSharpTypes.h
@@ -247,6 +247,7 @@ namespace CecSharp
                F5                          = 0x75,
                Data                        = 0x76,
                Max                         = 0x76,
+               SamsungReturn               = 0x91,
                Unknown
        };
 
@@ -355,7 +356,8 @@ namespace CecSharp
                Version1_5_3  = 0x1503,
                Version1_6_0  = 0x1600,
                Version1_6_1  = 0x1601,
-    Version1_6_2  = 0x1602
+    Version1_6_2  = 0x1602,
+    Version1_6_3  = 0x1603
        };
 
        public enum class CecServerVersion
@@ -367,7 +369,8 @@ namespace CecSharp
                Version1_5_3  = 0x1503,
                Version1_6_0  = 0x1600,
                Version1_6_1  = 0x1601,
-    Version1_6_2  = 0x1602
+    Version1_6_2  = 0x1602,
+    Version1_6_3  = 0x1603
        };
 
        public ref class CecAdapter
@@ -508,7 +511,7 @@ namespace CecSharp
        public ref class CecKeypress
        {
        public:
-               CecKeypress(int iKeycode, unsigned int iDuration)
+               CecKeypress(CecUserControlCode iKeycode, unsigned int iDuration)
                {
                        Keycode  = iKeycode;
                        Duration = iDuration;
@@ -517,14 +520,14 @@ namespace CecSharp
 
                CecKeypress(void)
                {
-                       Keycode  = 0;
+                       Keycode  = CecUserControlCode::Unknown;
                        Duration = 0;
                        Empty    = true;
                }
 
-               property bool         Empty;
-               property int          Keycode;
-               property unsigned int Duration;
+               property bool               Empty;
+               property CecUserControlCode Keycode;
+               property unsigned int       Duration;
        };
 
        public ref class CecLogMessage
@@ -582,10 +585,13 @@ namespace CecSharp
 
                        PowerOffScreensaver = CEC_DEFAULT_SETTING_POWER_OFF_SCREENSAVER == 1;
                        PowerOffOnStandby   = CEC_DEFAULT_SETTING_POWER_OFF_ON_STANDBY == 1;
-      SendInactiveSource  = CEC_DEFAULT_SETTING_SEND_INACTIVE_SOURCE == 1;
-      LogicalAddresses    = gcnew CecLogicalAddresses();
-      FirmwareVersion     = 1;
-      PowerOffDevicesOnStandby = CEC_DEFAULT_SETTING_POWER_OFF_DEVICES_STANDBY == 1;
+
+                       SendInactiveSource  = CEC_DEFAULT_SETTING_SEND_INACTIVE_SOURCE == 1;
+                       LogicalAddresses    = gcnew CecLogicalAddresses();
+                       FirmwareVersion     = 1;
+                       PowerOffDevicesOnStandby = CEC_DEFAULT_SETTING_POWER_OFF_DEVICES_STANDBY == 1;
+                       ShutdownOnStandby   = CEC_DEFAULT_SETTING_SHUTDOWN_ON_STANDBY == 1;
+                       DeviceLanguage      = "";
                }
 
                void SetCallbacks(CecCallbackMethods ^callbacks)
@@ -626,22 +632,29 @@ namespace CecSharp
                        PowerOffScreensaver = config.bPowerOffScreensaver == 1;
                        PowerOffOnStandby = config.bPowerOffOnStandby == 1;
 
-      if (ServerVersion >= CecServerVersion::Version1_5_1)
-        SendInactiveSource = config.bSendInactiveSource == 1;
+                       if (ServerVersion >= CecServerVersion::Version1_5_1)
+                               SendInactiveSource = config.bSendInactiveSource == 1;
 
-      if (ServerVersion >= CecServerVersion::Version1_5_3)
-      {
-        LogicalAddresses->Clear();
-                         for (uint8_t iPtr = 0; iPtr <= 16; iPtr++)
-                                 if (config.logicalAddresses[iPtr])
-                                       LogicalAddresses->Set((CecLogicalAddress)iPtr);
-      }
+                       if (ServerVersion >= CecServerVersion::Version1_5_3)
+                       {
+                               LogicalAddresses->Clear();
+                               for (uint8_t iPtr = 0; iPtr <= 16; iPtr++)
+                                       if (config.logicalAddresses[iPtr])
+                                               LogicalAddresses->Set((CecLogicalAddress)iPtr);
+                       }
 
-      if (ServerVersion >= CecServerVersion::Version1_6_0)
-      {
-        FirmwareVersion          = config.iFirmwareVersion;
-        PowerOffDevicesOnStandby = config.bPowerOffDevicesOnStandby == 1;
-      }
+                       if (ServerVersion >= CecServerVersion::Version1_6_0)
+                       {
+                               FirmwareVersion          = config.iFirmwareVersion;
+                               PowerOffDevicesOnStandby = config.bPowerOffDevicesOnStandby == 1;
+                               ShutdownOnStandby        = config.bShutdownOnStandby == 1;
+                       }
+
+                       if (ServerVersion >= CecServerVersion::Version1_6_2)
+                               DeviceLanguage = gcnew System::String(config.strDeviceLanguage);
+
+                       if (ServerVersion >= CecServerVersion::Version1_6_3)
+                         MonitorOnlyClient = config.bMonitorOnly == 1;
                }
 
                property System::String ^     DeviceName;
@@ -662,11 +675,13 @@ namespace CecSharp
                property CecLogicalAddresses ^PowerOffDevices;
                property bool                 PowerOffScreensaver;
                property bool                 PowerOffOnStandby;
-    property bool                 SendInactiveSource;
-    property CecLogicalAddresses ^LogicalAddresses;
-    property uint16_t             FirmwareVersion;
-    property bool                 PowerOffDevicesOnStandby;
-
+               property bool                 SendInactiveSource;
+               property CecLogicalAddresses ^LogicalAddresses;
+               property uint16_t             FirmwareVersion;
+               property bool                 PowerOffDevicesOnStandby;
+               property bool                 ShutdownOnStandby;
+               property bool                 MonitorOnlyClient;
+               property System::String ^     DeviceLanguage;
                property CecCallbackMethods ^ Callbacks;
        };
 
@@ -823,7 +838,7 @@ namespace CecSharp
                {
                        int iReturn(0);
                        if (m_bHasCallbacks)
-                               iReturn = m_callbacks->ReceiveKeypress(gcnew CecKeypress(key.keycode, key.duration));
+                               iReturn = m_callbacks->ReceiveKeypress(gcnew CecKeypress((CecUserControlCode)key.keycode, key.duration));
                        return iReturn;
                }