repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cec: store the vendor ID when it's sent via CEC_OPCODE_DEVICE_VENDOR_ID. don't respon...
[deb_libcec.git]
/
src
/
lib
/
LibCEC.cpp
diff --git
a/src/lib/LibCEC.cpp
b/src/lib/LibCEC.cpp
index 9498bc9995810d4f1e7c31c22e0dab7e2e2e1e6d..7c0f7927956126f088a9bb5ec443f9c04ebe086b 100644
(file)
--- a/
src/lib/LibCEC.cpp
+++ b/
src/lib/LibCEC.cpp
@@
-78,7
+78,17
@@
bool CLibCEC::Open(const char *strPort, uint32_t iTimeoutMs /* = 10000 */)
return false;
}
return false;
}
- if (!m_comm->Open(strPort, 38400, iTimeoutMs))
+ int64_t iNow = GetTimeMs();
+ int64_t iTarget = iNow + iTimeoutMs;
+
+ bool bOpened(false);
+ while (!bOpened && iNow < iTarget)
+ {
+ bOpened = m_comm->Open(strPort, 38400, iTimeoutMs);
+ iNow = GetTimeMs();
+ }
+
+ if (!bOpened)
{
AddLog(CEC_LOG_ERROR, "could not open a connection");
return false;
{
AddLog(CEC_LOG_ERROR, "could not open a connection");
return false;
@@
-148,7
+158,7
@@
bool CLibCEC::GetNextCommand(cec_command *command)
return m_commandBuffer.Pop(*command);
}
return m_commandBuffer.Pop(*command);
}
-bool CLibCEC::Transmit(const cec_
frame
&data, bool bWaitForAck /* = true */)
+bool CLibCEC::Transmit(const cec_
command
&data, bool bWaitForAck /* = true */)
{
return m_cec ? m_cec->Transmit(data, bWaitForAck) : false;
}
{
return m_cec ? m_cec->Transmit(data, bWaitForAck) : false;
}
@@
-158,6
+168,11
@@
bool CLibCEC::SetLogicalAddress(cec_logical_address iLogicalAddress)
return m_cec ? m_cec->SetLogicalAddress(iLogicalAddress) : false;
}
return m_cec ? m_cec->SetLogicalAddress(iLogicalAddress) : false;
}
+bool CLibCEC::SetPhysicalAddress(uint16_t iPhysicalAddress)
+{
+ return m_cec ? m_cec->SetPhysicalAddress(iPhysicalAddress) : false;
+}
+
bool CLibCEC::PowerOnDevices(cec_logical_address address /* = CECDEVICE_TV */)
{
return m_cec ? m_cec->PowerOnDevices(address) : false;
bool CLibCEC::PowerOnDevices(cec_logical_address address /* = CECDEVICE_TV */)
{
return m_cec ? m_cec->PowerOnDevices(address) : false;
@@
-178,6
+193,11
@@
bool CLibCEC::SetInactiveView(void)
return m_cec ? m_cec->SetInactiveView() : false;
}
return m_cec ? m_cec->SetInactiveView() : false;
}
+bool CLibCEC::SetOSDString(cec_logical_address iLogicalAddress, cec_display_control duration, const char *strMessage)
+{
+ return m_cec ? m_cec->SetOSDString(iLogicalAddress, duration, strMessage) : false;
+}
+
void CLibCEC::AddLog(cec_log_level level, const string &strMessage)
{
if (m_cec)
void CLibCEC::AddLog(cec_log_level level, const string &strMessage)
{
if (m_cec)
@@
-204,20
+224,12
@@
void CLibCEC::AddKey(void)
}
}
}
}
-void CLibCEC::AddCommand(cec_
logical_address source, cec_logical_address destination, cec_opcode opcode, cec_frame *parameters
)
+void CLibCEC::AddCommand(cec_
command &command
)
{
{
- cec_command command;
- command.clear();
-
- command.source = source;
- command.destination = destination;
- command.opcode = opcode;
- if (parameters)
- command.parameters = *parameters;
if (m_commandBuffer.Push(command))
{
CStdString strDebug;
if (m_commandBuffer.Push(command))
{
CStdString strDebug;
- strDebug.Format("stored command '%2x' in the command buffer. buffer size = %d", opcode, m_commandBuffer.Size());
+ strDebug.Format("stored command '%2x' in the command buffer. buffer size = %d",
command.
opcode, m_commandBuffer.Size());
AddLog(CEC_LOG_DEBUG, strDebug);
}
else
AddLog(CEC_LOG_DEBUG, strDebug);
}
else
@@
-239,6
+251,13
@@
void CLibCEC::SetCurrentButton(cec_user_control_code iButtonCode)
{
m_iCurrentButton = iButtonCode;
m_buttontime = GetTimeMs();
{
m_iCurrentButton = iButtonCode;
m_buttontime = GetTimeMs();
+
+ /* push keypress to the keybuffer with 0 duration.
+ push another press to the keybuffer with the duration set when the button is released */
+ cec_keypress key;
+ key.duration = 0;
+ key.keycode = m_iCurrentButton;
+ m_keyBuffer.Push(key);
}
void * CECCreate(const char *strDeviceName, CEC::cec_logical_address iLogicalAddress /*= CEC::CECDEVICE_PLAYBACKDEVICE1 */, uint16_t iPhysicalAddress /* = CEC_DEFAULT_PHYSICAL_ADDRESS */)
}
void * CECCreate(const char *strDeviceName, CEC::cec_logical_address iLogicalAddress /*= CEC::CECDEVICE_PLAYBACKDEVICE1 */, uint16_t iPhysicalAddress /* = CEC_DEFAULT_PHYSICAL_ADDRESS */)