repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bump to v2.1.3
[deb_libcec.git]
/
include
/
cectypes.h
diff --git
a/include/cectypes.h
b/include/cectypes.h
index 3a004aab31e35f617b104452ddf481d6f1e04266..01adebee49e856d20da9a882aa978d6e8799fc8a 100644
(file)
--- a/
include/cectypes.h
+++ b/
include/cectypes.h
@@
-2,7
+2,7
@@
/*
* This file is part of the libCEC(R) library.
*
/*
* This file is part of the libCEC(R) library.
*
- * libCEC(R) is Copyright (C) 2011-201
2
Pulse-Eight Limited. All rights reserved.
+ * libCEC(R) is Copyright (C) 2011-201
3
Pulse-Eight Limited. All rights reserved.
* libCEC(R) is an original work, containing original code.
*
* libCEC(R) is a trademark of Pulse-Eight Limited.
* libCEC(R) is an original work, containing original code.
*
* libCEC(R) is a trademark of Pulse-Eight Limited.
@@
-174,6
+174,11
@@
namespace CEC {
*/
#define CEC_DEFAULT_SETTING_POWER_OFF_SCREENSAVER 1
*/
#define CEC_DEFAULT_SETTING_POWER_OFF_SCREENSAVER 1
+/*!
+ * default value for settings "wake up when deactivating the screensaver"
+ */
+#define CEC_DEFAULT_SETTING_POWER_ON_SCREENSAVER 1
+
/*!
* default value for settings "power off on standby"
*/
/*!
* default value for settings "power off on standby"
*/
@@
-826,6
+831,7
@@
typedef enum cec_vendor_id
CEC_VENDOR_LOEWE = 0x000982,
CEC_VENDOR_ONKYO = 0x0009B0,
CEC_VENDOR_MEDION = 0x000CB8,
CEC_VENDOR_LOEWE = 0x000982,
CEC_VENDOR_ONKYO = 0x0009B0,
CEC_VENDOR_MEDION = 0x000CB8,
+ CEC_VENDOR_TOSHIBA2 = 0x000CE7,
CEC_VENDOR_AKAI = 0x0020C7,
CEC_VENDOR_AOC = 0x002467,
CEC_VENDOR_PANASONIC = 0x008045,
CEC_VENDOR_AKAI = 0x0020C7,
CEC_VENDOR_AOC = 0x002467,
CEC_VENDOR_PANASONIC = 0x008045,
@@
-910,6
+916,16
@@
typedef struct cec_datapacket
return *this;
}
return *this;
}
+ bool operator ==(const struct cec_datapacket& packet) const
+ {
+ if (size != packet.size)
+ return false;
+ for (uint8_t iPtr = 0; iPtr < size; iPtr++)
+ if (packet.data[iPtr] != data[iPtr])
+ return false;
+ return true;
+ }
+
bool IsEmpty(void) const { return size == 0; } /**< @return True when this packet is empty, false otherwise. */
bool IsFull(void) const { return size == 100; } /**< @return True when this packet is false, false otherwise. */
bool IsEmpty(void) const { return size == 0; } /**< @return True when this packet is empty, false otherwise. */
bool IsFull(void) const { return size == 100; } /**< @return True when this packet is false, false otherwise. */
@@
-1276,7
+1292,8
@@
typedef enum libcec_alert
CEC_ALERT_CONNECTION_LOST,
CEC_ALERT_PERMISSION_ERROR,
CEC_ALERT_PORT_BUSY,
CEC_ALERT_CONNECTION_LOST,
CEC_ALERT_PERMISSION_ERROR,
CEC_ALERT_PORT_BUSY,
- CEC_ALERT_PHYSICAL_ADDRESS_ERROR
+ CEC_ALERT_PHYSICAL_ADDRESS_ERROR,
+ CEC_ALERT_TV_POLL_FAILED
} libcec_alert;
typedef enum libcec_parameter_type
} libcec_alert;
typedef enum libcec_parameter_type
@@
-1400,7
+1417,10
@@
typedef enum cec_client_version
CEC_CLIENT_VERSION_2_0_4 = 0x2004,
CEC_CLIENT_VERSION_2_0_5 = 0x2005,
CEC_CLIENT_VERSION_2_1_0 = 0x2100,
CEC_CLIENT_VERSION_2_0_4 = 0x2004,
CEC_CLIENT_VERSION_2_0_5 = 0x2005,
CEC_CLIENT_VERSION_2_1_0 = 0x2100,
- CEC_CLIENT_VERSION_CURRENT = 0x2100
+ CEC_CLIENT_VERSION_2_1_1 = 0x2101,
+ CEC_CLIENT_VERSION_2_1_2 = 0x2102,
+ CEC_CLIENT_VERSION_2_1_3 = 0x2103,
+ CEC_CLIENT_VERSION_CURRENT = 0x2103
} cec_client_version;
typedef enum cec_server_version
} cec_client_version;
typedef enum cec_server_version
@@
-1429,7
+1449,10
@@
typedef enum cec_server_version
CEC_SERVER_VERSION_2_0_4 = 0x2004,
CEC_SERVER_VERSION_2_0_5 = 0x2005,
CEC_SERVER_VERSION_2_1_0 = 0x2100,
CEC_SERVER_VERSION_2_0_4 = 0x2004,
CEC_SERVER_VERSION_2_0_5 = 0x2005,
CEC_SERVER_VERSION_2_1_0 = 0x2100,
- CEC_SERVER_VERSION_CURRENT = 0x2100
+ CEC_SERVER_VERSION_2_1_1 = 0x2101,
+ CEC_SERVER_VERSION_2_1_2 = 0x2102,
+ CEC_SERVER_VERSION_2_1_3 = 0x2103,
+ CEC_SERVER_VERSION_CURRENT = 0x2103
} cec_server_version;
struct libcec_configuration
} cec_server_version;
struct libcec_configuration
@@
-1452,6
+1475,7
@@
struct libcec_configuration
uint8_t bUseTVMenuLanguage; /*!< use the menu language of the TV in the player application */
uint8_t bActivateSource; /*!< make libCEC the active source on the bus when starting the player application */
uint8_t bPowerOffScreensaver; /*!< put devices in standby mode when activating the screensaver */
uint8_t bUseTVMenuLanguage; /*!< use the menu language of the TV in the player application */
uint8_t bActivateSource; /*!< make libCEC the active source on the bus when starting the player application */
uint8_t bPowerOffScreensaver; /*!< put devices in standby mode when activating the screensaver */
+ uint8_t bPowerOnScreensaver; /*!< wake devices when deactivating the screensaver */
uint8_t bPowerOffOnStandby; /*!< put this PC in standby mode when the TV is switched off. only used when bShutdownOnStandby = 0 */
uint8_t bSendInactiveSource; /*!< send an 'inactive source' message when stopping the player. added in 1.5.1 */
uint8_t bPowerOffOnStandby; /*!< put this PC in standby mode when the TV is switched off. only used when bShutdownOnStandby = 0 */
uint8_t bSendInactiveSource; /*!< send an 'inactive source' message when stopping the player. added in 1.5.1 */
@@
-1504,8
+1528,9
@@
struct libcec_configuration
cecVersion == other.cecVersion &&
adapterType == other.adapterType &&
iDoubleTapTimeoutMs == other.iDoubleTapTimeoutMs &&
cecVersion == other.cecVersion &&
adapterType == other.adapterType &&
iDoubleTapTimeoutMs == other.iDoubleTapTimeoutMs &&
- (other.clientVersion <= CEC_CLIENT_VERSION_2_0_4 || comboKey == other.comboKey) &&
- (other.clientVersion <= CEC_CLIENT_VERSION_2_0_4 || iComboKeyTimeoutMs == other.iComboKeyTimeoutMs));
+ (other.clientVersion <= CEC_CLIENT_VERSION_2_0_4 || comboKey == other.comboKey) &&
+ (other.clientVersion <= CEC_CLIENT_VERSION_2_0_4 || iComboKeyTimeoutMs == other.iComboKeyTimeoutMs) &&
+ (other.clientVersion < CEC_CLIENT_VERSION_2_1_0 || bPowerOnScreensaver == other.bPowerOnScreensaver));
}
bool operator!=(const libcec_configuration &other) const
}
bool operator!=(const libcec_configuration &other) const
@@
-1529,6
+1554,7
@@
struct libcec_configuration
bUseTVMenuLanguage = CEC_DEFAULT_SETTING_USE_TV_MENU_LANGUAGE;
bActivateSource = CEC_DEFAULT_SETTING_ACTIVATE_SOURCE;
bPowerOffScreensaver = CEC_DEFAULT_SETTING_POWER_OFF_SCREENSAVER;
bUseTVMenuLanguage = CEC_DEFAULT_SETTING_USE_TV_MENU_LANGUAGE;
bActivateSource = CEC_DEFAULT_SETTING_ACTIVATE_SOURCE;
bPowerOffScreensaver = CEC_DEFAULT_SETTING_POWER_OFF_SCREENSAVER;
+ bPowerOnScreensaver = CEC_DEFAULT_SETTING_POWER_ON_SCREENSAVER;
bPowerOffOnStandby = CEC_DEFAULT_SETTING_POWER_OFF_ON_STANDBY;
bShutdownOnStandby = CEC_DEFAULT_SETTING_SHUTDOWN_ON_STANDBY;
bSendInactiveSource = CEC_DEFAULT_SETTING_SEND_INACTIVE_SOURCE;
bPowerOffOnStandby = CEC_DEFAULT_SETTING_POWER_OFF_ON_STANDBY;
bShutdownOnStandby = CEC_DEFAULT_SETTING_SHUTDOWN_ON_STANDBY;
bSendInactiveSource = CEC_DEFAULT_SETTING_SEND_INACTIVE_SOURCE;