X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FLibCecSharp%2FCecSharpTypes.h;h=74afce605671825b5f67dc62e2b00563810c5a18;hb=b5d801b811b10d640383dcd00255c042d486a857;hp=fb14a54dba9cc00c6ac50d1b695fcacb29656507;hpb=95587b956c69ead0b46d301f5ca70e977890c3fd;p=deb_libcec.git
diff --git a/src/LibCecSharp/CecSharpTypes.h b/src/LibCecSharp/CecSharpTypes.h
index fb14a54..74afce6 100644
--- a/src/LibCecSharp/CecSharpTypes.h
+++ b/src/LibCecSharp/CecSharpTypes.h
@@ -2,7 +2,7 @@
/*
* This file is part of the libCEC(R) library.
*
-* libCEC(R) is Copyright (C) 2011-2012 Pulse-Eight Limited. All rights reserved.
+* libCEC(R) is Copyright (C) 2011-2013 Pulse-Eight Limited. All rights reserved.
* libCEC(R) is an original work, containing original code.
*
* libCEC(R) is a trademark of Pulse-Eight Limited.
@@ -200,7 +200,27 @@ namespace CecSharp
/// The device needs servicing. This is set when the firmware can be upgraded, or when a problem with the firmware is detected.
/// The latest firmware flash tool can be downloaded from http://packages.pulse-eight.net/
///
- ServiceDevice = 1
+ ServiceDevice = 0,
+ ///
+ /// The connection to the adapter was lost, probably because the device got unplugged.
+ ///
+ ConnectionLost,
+ ///
+ /// No permission from the OS to access the adapter.
+ ///
+ PermissionError,
+ ///
+ /// The device is being used by another program.
+ ///
+ PortBusy,
+ ///
+ /// The physical address that is assigned to the adapter is already being used.
+ ///
+ PhysicalAddressError,
+ ///
+ /// The TV does not respond to polls.
+ ///
+ TVPollFailed
};
///
@@ -764,23 +784,32 @@ namespace CecSharp
///
public enum class CecVendorId
{
- Samsung = 0x0000F0,
- LG = 0x00E091,
- Panasonic = 0x008045,
- Pioneer = 0x00E036,
- Onkyo = 0x0009B0,
- Yamaha = 0x00A0DE,
- Philips = 0x00903E,
- Sony = 0x080046,
- Toshiba = 0x000039,
- Akai = 0x0020C7,
- Benq = 0x8065E9,
- Daewoo = 0x009053,
- Grundig = 0x00D0D5,
- Medion = 0x000CB8,
- Sharp = 0x08001F,
- Vizio = 0x6B746D,
- 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
};
///
@@ -1163,7 +1192,55 @@ namespace CecSharp
///
/// v2.0.0
///
- Version2_0_0 = 0x2000
+ Version2_0_0 = 0x2000,
+ ///
+ /// v2.0.1
+ ///
+ Version2_0_1 = 0x2001,
+ ///
+ /// v2.0.2
+ ///
+ Version2_0_2 = 0x2002,
+ ///
+ /// v2.0.3
+ ///
+ Version2_0_3 = 0x2003,
+ ///
+ /// v2.0.4
+ ///
+ Version2_0_4 = 0x2004,
+ ///
+ /// v2.0.5
+ ///
+ Version2_0_5 = 0x2005,
+ ///
+ /// v2.1.0
+ ///
+ Version2_1_0 = 0x2100,
+ ///
+ /// v2.1.1
+ ///
+ Version2_1_1 = 0x2101,
+ ///
+ /// v2.1.2
+ ///
+ Version2_1_2 = 0x2102,
+ ///
+ /// v2.1.3
+ ///
+ Version2_1_3 = 0x2103,
+ ///
+ /// v2.1.4
+ ///
+ Version2_1_4 = 0x2104,
+ ///
+ /// v2.1.4
+ ///
+ Version2_2_0 = 0x2200,
+ ///
+ /// The current version
+ ///
+ CurrentVersion = 0x2200
};
///
@@ -1242,7 +1319,55 @@ namespace CecSharp
///
/// v2.0.0
///
- Version2_0_0 = 0x2000
+ Version2_0_0 = 0x2000,
+ ///
+ /// v2.0.1
+ ///
+ Version2_0_1 = 0x2001,
+ ///
+ /// v2.0.2
+ ///
+ Version2_0_2 = 0x2002,
+ ///
+ /// v2.0.3
+ ///
+ Version2_0_3 = 0x2003,
+ ///
+ /// v2.0.4
+ ///
+ Version2_0_4 = 0x2004,
+ ///
+ /// v2.0.5
+ ///
+ Version2_0_5 = 0x2005,
+ ///
+ /// v2.1.0
+ ///
+ Version2_1_0 = 0x2100,
+ ///
+ /// v2.1.1
+ ///
+ Version2_1_1 = 0x2101,
+ ///
+ /// v2.1.2
+ ///
+ Version2_1_2 = 0x2102,
+ ///
+ /// v2.1.3
+ ///
+ Version2_1_3 = 0x2103,
+ ///
+ /// v2.1.4
+ ///
+ Version2_1_4 = 0x2104,
+ ///
+ /// v2.2.0
+ ///
+ Version2_2_0 = 0x2200,
+ ///
+ /// The current version
+ ///
+ CurrentVersion = 0x2200
};
///
@@ -1265,7 +1390,11 @@ namespace CecSharp
///
/// Raspberry Pi
///
- RaspberryPi = 0x100
+ RaspberryPi = 0x100,
+ ///
+ /// TDA995x
+ ///
+ TDA995x = 0x200
};
///
@@ -1629,8 +1758,8 @@ namespace CecSharp
PhysicalAddress = CEC_DEFAULT_PHYSICAL_ADDRESS;
BaseDevice = (CecLogicalAddress)CEC_DEFAULT_BASE_DEVICE;
HDMIPort = CEC_DEFAULT_HDMI_PORT;
- ClientVersion = CecClientVersion::VersionPre1_5;
- ServerVersion = CecServerVersion::VersionPre1_5;
+ ClientVersion = CecClientVersion::CurrentVersion;
+ ServerVersion = CecServerVersion::CurrentVersion;
TvVendor = CecVendorId::Unknown;
GetSettingsFromROM = false;
@@ -1738,6 +1867,9 @@ namespace CecSharp
if (ServerVersion >= CecServerVersion::Version1_8_2)
AdapterType = (CecAdapterType)config.adapterType;
+
+ if (ServerVersion >= CecServerVersion::Version2_1_0)
+ PowerOnScreensaver = config.bPowerOnScreensaver == 1;
}
///
@@ -1876,6 +2008,11 @@ namespace CecSharp
/// The type of adapter that libCEC is connected to.
///
property CecAdapterType AdapterType;
+
+ ///
+ /// True to power on when quitting the screensaver.
+ ///
+ property bool PowerOnScreensaver;
};
// the callback methods are called by unmanaged code, so we need some delegates for this
@@ -2285,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);
}