X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2FLibCecSharp%2FCecSharpTypes.h;h=563bb0a3e608dcf84c7dd9f86afb624bc2867aa1;hb=4f5046734389cc554448da5cee93970f3091348b;hp=8a7410ea954403bf43214a3375881dbb8516181f;hpb=f6db051ead727101f38bd98fa4f5a589f1d00be0;p=deb_libcec.git

diff --git a/src/LibCecSharp/CecSharpTypes.h b/src/LibCecSharp/CecSharpTypes.h
index 8a7410e..563bb0a 100644
--- a/src/LibCecSharp/CecSharpTypes.h
+++ b/src/LibCecSharp/CecSharpTypes.h
@@ -784,27 +784,32 @@ namespace CecSharp
   /// </summary>
   public enum class CecVendorId
   {
-    Toshiba   = 0x000039,
-    Samsung   = 0x0000F0,
-    Denon     = 0x0005CD,
-    Loewe     = 0x000982,
-    Onkyo     = 0x0009B0,
-    Medion    = 0x000CB8,
-    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,
-    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>
@@ -1217,9 +1222,21 @@ namespace CecSharp
     /// </summary>
     Version2_1_1   = 0x2101,
     /// <summary>
+    /// v2.1.2
+    /// </summary>
+    Version2_1_2   = 0x2102,
+    /// <summary>
+    /// v2.1.3
+    /// </summary>
+    Version2_1_3   = 0x2103,
+    /// <summary>
+    /// v2.1.4
+    /// </summary>
+    Version2_1_4   = 0x2104,
+	/// <summary>
     /// The current version
     /// </summary>
-    CurrentVersion = 0x2101
+    CurrentVersion = 0x2104
   };
 
   /// <summary>
@@ -1328,9 +1345,21 @@ namespace CecSharp
     /// </summary>
     Version2_1_1   = 0x2101,
     /// <summary>
+    /// v2.1.2
+    /// </summary>
+    Version2_1_2   = 0x2102,
+    /// <summary>
+    /// v2.1.3
+    /// </summary>
+    Version2_1_3   = 0x2103,
+	/// <summary>
+    /// v2.1.4
+    /// </summary>
+    Version2_1_4   = 0x2104,
+    /// <summary>
     /// The current version
     /// </summary>
-    CurrentVersion = 0x2101
+    CurrentVersion = 0x2104
   };
 
   /// <summary>
@@ -1721,8 +1750,8 @@ namespace CecSharp
       PhysicalAddress     = CEC_DEFAULT_PHYSICAL_ADDRESS;
       BaseDevice          = (CecLogicalAddress)CEC_DEFAULT_BASE_DEVICE;
       HDMIPort            = CEC_DEFAULT_HDMI_PORT;
-      ClientVersion       = CecClientVersion::Version2_1_1;
-      ServerVersion       = CecServerVersion::Version2_1_1;
+      ClientVersion       = CecClientVersion::CurrentVersion;
+      ServerVersion       = CecServerVersion::CurrentVersion;
       TvVendor            = CecVendorId::Unknown;
 
       GetSettingsFromROM  = false;
@@ -2385,7 +2414,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);
         }