repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cec: fix loop when initialising LG
[deb_libcec.git]
/
src
/
cec-config
/
cec-config.cpp
diff --git
a/src/cec-config/cec-config.cpp
b/src/cec-config/cec-config.cpp
index 2897e2dddb740fc7f2bb6ceba00e5224510b97b5..3fc7af3f656ced928b4d220c8b15950e8c86c031 100644
(file)
--- a/
src/cec-config/cec-config.cpp
+++ b/
src/cec-config/cec-config.cpp
@@
-50,12
+50,10
@@
using namespace PLATFORM;
CMutex g_outputMutex;
CMutex g_outputMutex;
-CMutex g_responseMutex;
-CCondition g_responseCondtion;
+CEvent g_responseEvent;
cec_opcode g_lastCommand = CEC_OPCODE_NONE;
cec_opcode g_lastCommand = CEC_OPCODE_NONE;
-CMutex g_keyMutex;
-CCondition g_keyCondtion;
+CEvent g_keyEvent;
cec_user_control_code g_lastKey = CEC_USER_CONTROL_CODE_UNKNOWN;
ICECCallbacks g_callbacks;
cec_user_control_code g_lastKey = CEC_USER_CONTROL_CODE_UNKNOWN;
ICECCallbacks g_callbacks;
@@
-129,17
+127,15
@@
int CecLogMessage(void *UNUSED(cbParam), const cec_log_message &message)
int CecKeyPress(void *UNUSED(cbParam), const cec_keypress &key)
{
int CecKeyPress(void *UNUSED(cbParam), const cec_keypress &key)
{
- CLockObject lock(g_keyMutex);
g_lastKey = key.keycode;
g_lastKey = key.keycode;
- g_key
Condtion
.Signal();
+ g_key
Event
.Signal();
return 0;
}
int CecCommand(void *UNUSED(cbParam), const cec_command &command)
{
return 0;
}
int CecCommand(void *UNUSED(cbParam), const cec_command &command)
{
- CLockObject lock(g_responseMutex);
g_lastCommand = command.opcode;
g_lastCommand = command.opcode;
- g_response
Condtion
.Signal();
+ g_response
Event
.Signal();
return 0;
}
return 0;
}
@@
-326,8
+322,7
@@
bool PowerOnTV(uint64_t iTimeout = 60000)
g_parser->PowerOnDevices(CECDEVICE_TV);
while (iTarget > iNow)
{
g_parser->PowerOnDevices(CECDEVICE_TV);
while (iTarget > iNow)
{
- CLockObject lock(g_responseMutex);
- g_responseCondtion.Wait(g_responseMutex, (uint32_t)(iTarget - iNow));
+ g_responseEvent.Wait((uint32_t)(iTarget - iNow));
if (g_lastCommand == CEC_OPCODE_REQUEST_ACTIVE_SOURCE)
break;
iNow = GetTimeMs();
if (g_lastCommand == CEC_OPCODE_REQUEST_ACTIVE_SOURCE)
break;
iNow = GetTimeMs();
@@
-343,7
+338,7
@@
bool PowerOnTV(uint64_t iTimeout = 60000)
return currentTvPower == CEC_POWER_STATUS_ON;
}
return currentTvPower == CEC_POWER_STATUS_ON;
}
-int main (int
argc, char *argv[]
)
+int main (int
UNUSED(argc), char *UNUSED(argv[])
)
{
PrintToStdOut("=== USB-CEC Adapter Configuration ===\n");
if (!OpenConnection())
{
PrintToStdOut("=== USB-CEC Adapter Configuration ===\n");
if (!OpenConnection())