X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=include%2Fcectypes.h;h=cc0b57ee449877333c85e2b073e217c6c0808a0a;hb=0b7822f9dbac67b733a7cbcb094535fe4a59a086;hp=759eb4fa50c941b24f3eaf27c8d2ecfdd4e6d600;hpb=004b83822a351e1fb6e982a9183a12a430b0b769;p=deb_libcec.git diff --git a/include/cectypes.h b/include/cectypes.h index 759eb4f..cc0b57e 100644 --- a/include/cectypes.h +++ b/include/cectypes.h @@ -97,7 +97,7 @@ namespace CEC { #define CEC_DEFAULT_SETTING_SEND_INACTIVE_SOURCE 1 #define CEC_DEFAULT_SETTING_POWER_OFF_DEVICES_STANDBY 1 #define CEC_DEFAULT_DEVICE_LANGUAGE "eng" -#define CEC_DEFAULT_SETTING_AUTODETECT_ADDRESS 1 +#define CEC_DEFAULT_SETTING_AUTODETECT_ADDRESS 0 #define CEC_DEFAULT_SETTING_GET_SETTINGS_FROM_ROM 0 #define CEC_DEFAULT_TRANSMIT_RETRY_WAIT 500 @@ -112,7 +112,8 @@ namespace CEC { #define CEC_MIN_LIB_VERSION 1 #define CEC_LIB_VERSION_MAJOR 1 -#define CEC_LIB_VERSION_MINOR 6 +#define CEC_LIB_VERSION_MAJOR_STR "1" +#define CEC_LIB_VERSION_MINOR 7 typedef enum cec_abort_reason { @@ -900,6 +901,12 @@ typedef struct cec_command return CEC_OPCODE_NONE; } + + void PushArray(size_t len, uint8_t *data) + { + for (size_t iPtr = 0; iPtr < len; iPtr++) + PushBack(data[iPtr]); + } #endif } cec_command; @@ -908,19 +915,6 @@ typedef struct cec_device_type_list cec_device_type types[5]; /**< the list of device types */ #ifdef __cplusplus - cec_device_type_list operator+ (const cec_device_type_list &other) - { - cec_device_type_list retVal; - for (unsigned int iPtr = 0; iPtr < 5; iPtr++) - { - if (other.types[iPtr] != CEC_DEVICE_TYPE_RESERVED) - retVal.Add(other.types[iPtr]); - if (types[iPtr] != CEC_DEVICE_TYPE_RESERVED) - retVal.Add(types[iPtr]); - } - return retVal; - } - /*! * @deprecated Use Clear() instead. * @brief Clear this list. @@ -963,7 +957,7 @@ typedef struct cec_device_type_list * @param type The type to check. * @return True when set, false otherwise. */ - bool IsSet(const cec_device_type type) const + bool IsSet(cec_device_type type) { bool bReturn(false); for (unsigned int iPtr = 0; !bReturn && iPtr < 5; iPtr++) @@ -1016,9 +1010,6 @@ typedef struct cec_logical_addresses int addresses[16]; /**< the list of addresses */ #ifdef __cplusplus - cec_logical_addresses(void) { Clear(); } - virtual ~cec_logical_addresses(void) { Clear(); } - /*! * @brief Clear this list. */ @@ -1079,7 +1070,7 @@ typedef struct cec_logical_addresses * @param address The address to check. * @return True when set, false otherwise. */ - bool IsSet(const cec_logical_address address) const { return addresses[(int) address] == 1; } + bool IsSet(cec_logical_address address) const { return addresses[(int) address] == 1; } /*! * @brief Check whether an address is set in this list. @@ -1100,34 +1091,15 @@ typedef struct cec_logical_addresses { return !(*this == other); } - - cec_logical_addresses operator+ (const cec_logical_addresses &other) - { - cec_logical_addresses retVal; - for (unsigned int iPtr = 0; iPtr < 16; iPtr++) - { - if (other.IsSet((cec_logical_address)iPtr) || IsSet((cec_logical_address)iPtr)) - retVal.Set((cec_logical_address)iPtr); - } - return retVal; - } - - cec_logical_addresses &operator+= (const cec_logical_addresses &other) - { - for (unsigned int iPtr = 0; iPtr < 16; iPtr++) - { - if (other.IsSet((cec_logical_address)iPtr)) - Set((cec_logical_address)iPtr); - } - return *this; - } #endif } cec_logical_addresses; typedef enum libcec_alert { CEC_ALERT_SERVICE_DEVICE, - CEC_ALERT_CONNECTION_LOST + CEC_ALERT_CONNECTION_LOST, + CEC_ALERT_PERMISSION_ERROR, + CEC_ALERT_PORT_BUSY } libcec_alert; typedef enum libcec_parameter_type @@ -1140,22 +1112,6 @@ struct libcec_parameter { libcec_parameter_type paramType; /**< the type of this parameter */ void* paramData; /**< the value of this parameter */ - -#ifdef __cplusplus - libcec_parameter(void) - { - paramType = CEC_PARAMETER_TYPE_UNKOWN; - paramData = NULL; - } - - libcec_parameter(const char *strMessage) - { - paramType = CEC_PARAMETER_TYPE_STRING; - paramData = (void*)strMessage; - } - - virtual ~libcec_parameter(void) {} -#endif }; struct libcec_configuration; @@ -1241,7 +1197,9 @@ typedef enum cec_client_version CEC_CLIENT_VERSION_1_5_3 = 0x1503, CEC_CLIENT_VERSION_1_6_0 = 0x1600, CEC_CLIENT_VERSION_1_6_1 = 0x1601, - CEC_CLIENT_VERSION_1_6_2 = 0x1602 + CEC_CLIENT_VERSION_1_6_2 = 0x1602, + CEC_CLIENT_VERSION_1_6_3 = 0x1603, + CEC_CLIENT_VERSION_1_7_0 = 0x1700 } cec_client_version; typedef enum cec_server_version @@ -1253,7 +1211,9 @@ typedef enum cec_server_version CEC_SERVER_VERSION_1_5_3 = 0x1503, CEC_SERVER_VERSION_1_6_0 = 0x1600, CEC_SERVER_VERSION_1_6_1 = 0x1601, - CEC_SERVER_VERSION_1_6_2 = 0x1602 + CEC_SERVER_VERSION_1_6_2 = 0x1602, + CEC_SERVER_VERSION_1_6_3 = 0x1603, + CEC_SERVER_VERSION_1_7_0 = 0x1700 } cec_server_version; typedef struct libcec_configuration @@ -1261,7 +1221,7 @@ typedef struct libcec_configuration uint32_t clientVersion; /*!< the version of the client that is connecting */ char strDeviceName[13]; /*!< how to name the device on the CEC bus */ cec_device_type_list deviceTypes; /*!< the CEC device types to emulate */ - uint8_t bAutodetectAddress; /*!< try to autodetect the physical address when 1 */ + uint8_t bAutodetectAddress; /*!< (read only) set to 1 by libCEC when the physical address was autodetected */ uint16_t iPhysicalAddress; /*!< the physical address of the CEC adapter. only used when bAutodetectAddress = 0 or when the adapter doesn't support autodetection */ cec_logical_address baseDevice; /*!< the logical address of the device to which the adapter is connected. only used when iPhysicalAddress = 0 and bAutodetectAddress = 0 or when the adapter doesn't support autodetection */ uint8_t iHDMIPort; /*!< the HDMI port to which the adapter is connected. only used when iPhysicalAddress = 0 and bAutodetectAddress = 0 or when the adapter doesn't support autodetection */ @@ -1282,12 +1242,13 @@ typedef struct libcec_configuration void * callbackParam; /*!< the object to pass along with a call of the callback methods. NULL to ignore */ ICECCallbacks * callbacks; /*!< the callback methods to use. set this to NULL when not using callbacks */ - cec_logical_addresses logicalAddresses; /*!< the current logical addresses. read-only. added in 1.5.3 */ - uint16_t iFirmwareVersion; /*!< the firmware version of the adapter. added in 1.6.0 */ + cec_logical_addresses logicalAddresses; /*!< (read-only) the current logical addresses. added in 1.5.3 */ + uint16_t iFirmwareVersion; /*!< (read-only) the firmware version of the adapter. added in 1.6.0 */ uint8_t bPowerOffDevicesOnStandby; /*!< put devices in standby when the PC/player is put in standby. added in 1.6.0 */ uint8_t bShutdownOnStandby; /*!< shutdown this PC when the TV is switched off. only used when bPowerOffOnStandby = 0. added in 1.6.0 */ char strDeviceLanguage[3]; /*!< the menu language used by the client. 3 character ISO 639-2 country code. see http://http://www.loc.gov/standards/iso639-2/ added in 1.6.2 */ - uint32_t iFirmwareBuildDate; /*!< the build date of the firmware, in seconds since epoch. if not available, this value will be set to 0. added in 1.6.2 */ + uint32_t iFirmwareBuildDate; /*!< (read-only) the build date of the firmware, in seconds since epoch. if not available, this value will be set to 0. added in 1.6.2 */ + uint8_t bMonitorOnly; /*!< won't allocate a CCECClient when starting the connection when set (same as monitor mode). added in 1.6.3 */ #ifdef __cplusplus libcec_configuration(void) { Clear(); } @@ -1313,14 +1274,16 @@ typedef struct libcec_configuration bPowerOffOnStandby == other.bPowerOffOnStandby && bSendInactiveSource == other.bSendInactiveSource && /* libcec 1.5.3+ */ - (other.serverVersion < CEC_SERVER_VERSION_1_5_3 || logicalAddresses == other.logicalAddresses) && + (other.clientVersion < CEC_CLIENT_VERSION_1_5_3 || logicalAddresses == other.logicalAddresses) && /* libcec 1.6.0+ */ - (other.serverVersion < CEC_SERVER_VERSION_1_6_0 || iFirmwareVersion == other.iFirmwareVersion) && - (other.serverVersion < CEC_SERVER_VERSION_1_6_0 || bPowerOffDevicesOnStandby == other.bPowerOffDevicesOnStandby) && - (other.serverVersion < CEC_SERVER_VERSION_1_6_0 || bShutdownOnStandby == other.bShutdownOnStandby) && + (other.clientVersion < CEC_CLIENT_VERSION_1_6_0 || iFirmwareVersion == other.iFirmwareVersion) && + (other.clientVersion < CEC_CLIENT_VERSION_1_6_0 || bPowerOffDevicesOnStandby == other.bPowerOffDevicesOnStandby) && + (other.clientVersion < CEC_CLIENT_VERSION_1_6_0 || bShutdownOnStandby == other.bShutdownOnStandby) && /* libcec 1.6.2+ */ - (other.serverVersion < CEC_SERVER_VERSION_1_6_2 || !strncmp(strDeviceLanguage, other.strDeviceLanguage, 3)) && - (other.serverVersion < CEC_SERVER_VERSION_1_6_2 || iFirmwareBuildDate == other.iFirmwareBuildDate)); + (other.clientVersion < CEC_CLIENT_VERSION_1_6_2 || !strncmp(strDeviceLanguage, other.strDeviceLanguage, 3)) && + (other.clientVersion < CEC_CLIENT_VERSION_1_6_2 || iFirmwareBuildDate == other.iFirmwareBuildDate) && + /* libcec 1.6.3+ */ + (other.clientVersion < CEC_CLIENT_VERSION_1_6_3 || bMonitorOnly == other.bMonitorOnly)); } bool operator!=(const libcec_configuration &other) const @@ -1339,7 +1302,7 @@ typedef struct libcec_configuration tvVendor = (uint64_t)CEC_VENDOR_UNKNOWN; clientVersion = (uint32_t)CEC_CLIENT_VERSION_PRE_1_5; serverVersion = (uint32_t)CEC_SERVER_VERSION_PRE_1_5; - bAutodetectAddress = CEC_DEFAULT_SETTING_AUTODETECT_ADDRESS; + bAutodetectAddress = 0; bGetSettingsFromROM = CEC_DEFAULT_SETTING_GET_SETTINGS_FROM_ROM; bUseTVMenuLanguage = CEC_DEFAULT_SETTING_USE_TV_MENU_LANGUAGE; bActivateSource = CEC_DEFAULT_SETTING_ACTIVATE_SOURCE; @@ -1351,6 +1314,7 @@ typedef struct libcec_configuration bPowerOffDevicesOnStandby = CEC_DEFAULT_SETTING_POWER_OFF_DEVICES_STANDBY; memcpy(strDeviceLanguage, CEC_DEFAULT_DEVICE_LANGUAGE, 3); iFirmwareBuildDate = CEC_FW_BUILD_UNKNOWN; + bMonitorOnly = 0; memset(strDeviceName, 0, 13); deviceTypes.clear();