repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cec: check whether callback methods are set to a valid ptr
[deb_libcec.git]
/
src
/
lib
/
adapter
/
USBCECAdapterMessage.cpp
diff --git
a/src/lib/adapter/USBCECAdapterMessage.cpp
b/src/lib/adapter/USBCECAdapterMessage.cpp
index c23c21b24b91c016d5852b2c92a383af77597e67..e8c575da1a637416ec8510b379d7acbaf428e11f 100644
(file)
--- a/
src/lib/adapter/USBCECAdapterMessage.cpp
+++ b/
src/lib/adapter/USBCECAdapterMessage.cpp
@@
-41,7
+41,7
@@
CCECAdapterMessage::CCECAdapterMessage(void)
Clear();
}
Clear();
}
-CCECAdapterMessage::CCECAdapterMessage(const cec_command &command, uint8_t i
MaxTries /* = 1 */, uint8_t iLineTimeout /* = 3 */, uint8_t iRetry
LineTimeout /* = 3 */)
+CCECAdapterMessage::CCECAdapterMessage(const cec_command &command, uint8_t iLineTimeout /* = 3 */)
{
Clear();
{
Clear();
@@
-88,15
+88,7
@@
CCECAdapterMessage::CCECAdapterMessage(const cec_command &command, uint8_t iMaxT
// set timeout
transmit_timeout = command.transmit_timeout;
// set timeout
transmit_timeout = command.transmit_timeout;
- /* set the number of retries */
- if (command.opcode == CEC_OPCODE_NONE) //TODO
- maxTries = 1;
- else if (command.initiator != CECDEVICE_BROADCAST)
- maxTries = iMaxTries;
-
lineTimeout = iLineTimeout;
lineTimeout = iLineTimeout;
- retryTimeout = iRetryLineTimeout;
- tries = 0;
}
CStdString CCECAdapterMessage::ToString(void) const
}
CStdString CCECAdapterMessage::ToString(void) const
@@
-257,10
+249,7
@@
void CCECAdapterMessage::Clear(void)
transmit_timeout = CEC_DEFAULT_TRANSMIT_TIMEOUT;
response.Clear();
packet.Clear();
transmit_timeout = CEC_DEFAULT_TRANSMIT_TIMEOUT;
response.Clear();
packet.Clear();
- maxTries = CEC_DEFAULT_TRANSMIT_RETRIES + 1;
- tries = 0;
lineTimeout = 3;
lineTimeout = 3;
- retryTimeout = 3;
bNextByteIsEscaped = false;
}
bNextByteIsEscaped = false;
}