X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2FLibCecSharp%2FCecSharpTypes.h;h=74afce605671825b5f67dc62e2b00563810c5a18;hb=b5d801b811b10d640383dcd00255c042d486a857;hp=450400529046dc71f2c86dbfd65631dfaf168a11;hpb=ac03cf2784851df9eb42106828a0d88b5fda7d12;p=deb_libcec.git diff --git a/src/LibCecSharp/CecSharpTypes.h b/src/LibCecSharp/CecSharpTypes.h index 4504005..74afce6 100644 --- a/src/LibCecSharp/CecSharpTypes.h +++ b/src/LibCecSharp/CecSharpTypes.h @@ -784,30 +784,32 @@ namespace CecSharp /// 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 }; /// @@ -1228,9 +1230,17 @@ namespace CecSharp /// Version2_1_3 = 0x2103, /// + /// v2.1.4 + /// + Version2_1_4 = 0x2104, + /// + /// v2.1.4 + /// + Version2_2_0 = 0x2200, + /// /// The current version /// - CurrentVersion = 0x2103 + CurrentVersion = 0x2200 }; /// @@ -1347,9 +1357,17 @@ namespace CecSharp /// Version2_1_3 = 0x2103, /// + /// v2.1.4 + /// + Version2_1_4 = 0x2104, + /// + /// v2.2.0 + /// + Version2_2_0 = 0x2200, + /// /// The current version /// - CurrentVersion = 0x2103 + CurrentVersion = 0x2200 }; /// @@ -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); }