X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcec-config%2Fcec-config.cpp;h=3fc7af3f656ced928b4d220c8b15950e8c86c031;hb=a463f9549c71ddd76661e6d23928385a3267d01d;hp=a853f9169f2adda9c0ea8073052e93a694d446f4;hpb=39b1216c4883c7a3a351283e61e58891699ef091;p=deb_libcec.git diff --git a/src/cec-config/cec-config.cpp b/src/cec-config/cec-config.cpp index a853f91..3fc7af3 100644 --- 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_responseMutex; -CCondition g_responseCondtion; +CEvent g_responseEvent; 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; @@ -129,17 +127,15 @@ int CecLogMessage(void *UNUSED(cbParam), const cec_log_message &message) int CecKeyPress(void *UNUSED(cbParam), const cec_keypress &key) { - CLockObject lock(g_keyMutex); g_lastKey = key.keycode; - g_keyCondtion.Signal(); + g_keyEvent.Signal(); return 0; } int CecCommand(void *UNUSED(cbParam), const cec_command &command) { - CLockObject lock(g_responseMutex); g_lastCommand = command.opcode; - g_responseCondtion.Signal(); + g_responseEvent.Signal(); return 0; } @@ -326,8 +322,7 @@ bool PowerOnTV(uint64_t iTimeout = 60000) 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();