bump to v2.2.0

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

diff --git a/src/LibCecSharp/CecSharpTypes.h b/src/LibCecSharp/CecSharpTypes.h
index db459e606354a280392466b6a9830a1c0da7583b..74afce605671825b5f67dc62e2b00563810c5a18 100644 (file)
--- a/src/LibCecSharp/CecSharpTypes.h
+++ b/src/LibCecSharp/CecSharpTypes.h
@@ -784,30 +784,32 @@ namespace CecSharp
   /// </summary>
   public enum class CecVendorId
   {
-    Toshiba      = 0x000039,
-    Samsung      = 0x0000F0,
-    Denon        = 0x0005CD,
-    Marantz      = 0x000678,
-    Loewe        = 0x000982,
-    Onkyo        = 0x0009B0,
-    Medion       = 0x000CB8,
-    Toshiba2     = 0x000CE7,
-    Akai         = 0x0020C7,
-    AOC          = 0x002467,
-    Panasonic    = 0x008045,
-    Philips      = 0x00903E,
-    Daewoo       = 0x009053,
-    Yamaha       = 0x00A0DE,
-    Grundig      = 0x00D0D5,
-    Pioneer      = 0x00E036,
-    LG           = 0x00E091,
-    Sharp        = 0x08001F,
-    Sony         = 0x080046,
-    Broadcom     = 0x18C086,
-    Vizio        = 0x6B746D,
-    Benq         = 0x8065E9,
-    HarmanKardon = 0x9C645E,
-    Unknown      = 0
+    Toshiba       = 0x000039,
+    Samsung       = 0x0000F0,
+    Denon         = 0x0005CD,
+    Marantz       = 0x000678,
+    Loewe         = 0x000982,
+    Onkyo         = 0x0009B0,
+    Medion        = 0x000CB8,
+    Toshiba2      = 0x000CE7,
+    PulseEight    = 0x001582,
+    HarmanKardon2 = 0x001950,
+    Akai          = 0x0020C7,
+    AOC           = 0x002467,
+    Panasonic     = 0x008045,
+    Philips       = 0x00903E,
+    Daewoo        = 0x009053,
+    Yamaha        = 0x00A0DE,
+    Grundig       = 0x00D0D5,
+    Pioneer       = 0x00E036,
+    LG            = 0x00E091,
+    Sharp         = 0x08001F,
+    Sony          = 0x080046,
+    Broadcom      = 0x18C086,
+    Vizio         = 0x6B746D,
+    Benq          = 0x8065E9,
+    HarmanKardon  = 0x9C645E,
+    Unknown       = 0
   };
 
   /// <summary>
@@ -1228,9 +1230,17 @@ namespace CecSharp
     /// </summary>
     Version2_1_3   = 0x2103,
     /// <summary>
+    /// v2.1.4
+    /// </summary>
+    Version2_1_4   = 0x2104,
+    /// <summary>
+    /// v2.1.4
+    /// </summary>
+    Version2_2_0   = 0x2200,
+    /// <summary>
     /// The current version
     /// </summary>
-    CurrentVersion = 0x2103
+    CurrentVersion = 0x2200
   };
 
   /// <summary>
@@ -1347,9 +1357,17 @@ namespace CecSharp
     /// </summary>
     Version2_1_3   = 0x2103,
     /// <summary>
+    /// v2.1.4
+    /// </summary>
+    Version2_1_4   = 0x2104,
+    /// <summary>
+    /// v2.2.0
+    /// </summary>
+    Version2_2_0   = 0x2200,
+    /// <summary>
     /// The current version
     /// </summary>
-    CurrentVersion = 0x2103
+    CurrentVersion = 0x2200
   };
 
   /// <summary>
@@ -2404,7 +2422,7 @@ namespace CecSharp
         CecParameterType newType = (CecParameterType)data.paramType;
         if (newType == CecParameterType::ParameterTypeString)
         {
-          System::String ^ newData = gcnew System::String((const char *)data.paramData, 0, 128);
+          System::String ^ newData = gcnew System::String(data.paramData ? (const char *)data.paramData : "", 0, 128);
           CecParameter ^ newParam = gcnew CecParameter(newType, newData);
           iReturn = m_callbacks->ReceiveAlert((CecAlert)alert, newParam);
         }