X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fadapter%2FAdapterMessage.h;h=2ba59a1946d85f447c44a8977f2d6e0385e53eba;hb=b492c10e731625d7c000654de2372b54339f7c8d;hp=26acd90d2f5d03e4079a98c52f5b01709f890704;hpb=5dcf9f25c9b94a9c7a1892cce6e94857ae413a48;p=deb_libcec.git diff --git a/src/lib/adapter/AdapterMessage.h b/src/lib/adapter/AdapterMessage.h index 26acd90..2ba59a1 100644 --- a/src/lib/adapter/AdapterMessage.h +++ b/src/lib/adapter/AdapterMessage.h @@ -2,7 +2,7 @@ /* * This file is part of the libCEC(R) library. * - * libCEC(R) is Copyright (C) 2011 Pulse-Eight Limited. All rights reserved. + * libCEC(R) is Copyright (C) 2011-2012 Pulse-Eight Limited. All rights reserved. * libCEC(R) is an original work, containing original code. * * libCEC(R) is a trademark of Pulse-Eight Limited. @@ -31,6 +31,8 @@ * http://www.pulse-eight.net/ */ +#include "../platform/util/StdString.h" + namespace CEC { typedef enum cec_adapter_message_state @@ -255,13 +257,14 @@ namespace CEC void Clear(void) { - state = ADAPTER_MESSAGE_STATE_UNKNOWN; - transmit_timeout = 0; + state = ADAPTER_MESSAGE_STATE_UNKNOWN; + transmit_timeout = CEC_DEFAULT_TRANSMIT_TIMEOUT; packet.Clear(); - maxTries = CEC_DEFAULT_TRANSMIT_RETRIES + 1; - tries = 0; - reply = MSGCODE_NOTHING; - isTransmission = true; + maxTries = CEC_DEFAULT_TRANSMIT_RETRIES + 1; + tries = 0; + reply = MSGCODE_NOTHING; + isTransmission = true; + expectControllerAck = true; } void Shift(uint8_t iShiftBy) @@ -354,6 +357,7 @@ namespace CEC cec_adapter_message_state state; int32_t transmit_timeout; bool isTransmission; + bool expectControllerAck; PLATFORM::CMutex mutex; PLATFORM::CCondition condition; };