Merge branch 'development'

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

diff --git a/src/LibCecSharp/CecSharpTypes.h b/src/LibCecSharp/CecSharpTypes.h
index 43aaff935ca0b75e8bfe0b8cc78523820cdf3831..9be7ab5b87b64285b63e5bde5290a3e51f86e4ba 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
        };
 
@@ -356,7 +357,8 @@ namespace CecSharp
                Version1_6_0  = 0x1600,
                Version1_6_1  = 0x1601,
     Version1_6_2  = 0x1602,
-    Version1_6_3  = 0x1603
+    Version1_6_3  = 0x1603,
+    Version1_7_0  = 0x1700
        };
 
        public enum class CecServerVersion
@@ -369,7 +371,8 @@ namespace CecSharp
                Version1_6_0  = 0x1600,
                Version1_6_1  = 0x1601,
     Version1_6_2  = 0x1602,
-    Version1_6_3  = 0x1603
+    Version1_6_3  = 0x1603,
+    Version1_7_0  = 0x1700
        };
 
        public ref class CecAdapter
@@ -510,7 +513,7 @@ namespace CecSharp
        public ref class CecKeypress
        {
        public:
-               CecKeypress(int iKeycode, unsigned int iDuration)
+               CecKeypress(CecUserControlCode iKeycode, unsigned int iDuration)
                {
                        Keycode  = iKeycode;
                        Duration = iDuration;
@@ -519,14 +522,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
@@ -837,7 +840,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;
                }