X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fimplementations%2FCECCommandHandler.cpp;h=ebd2ec24a829e008dfa55a6aa2c1fc02d9f787f6;hb=02e7043ec09609e351130b648b282f25a3e1f2b9;hp=0178ae069fedcef2123231dc5fadd80f408f4521;hpb=e2800c154cf5ce325adf02f7473ce4686962f383;p=deb_libcec.git diff --git a/src/lib/implementations/CECCommandHandler.cpp b/src/lib/implementations/CECCommandHandler.cpp index 0178ae0..ebd2ec2 100644 --- a/src/lib/implementations/CECCommandHandler.cpp +++ b/src/lib/implementations/CECCommandHandler.cpp @@ -67,9 +67,7 @@ bool CCECCommandHandler::HandleCommand(const cec_command &command) bool bHandled(true); MarkBusy(); - CLibCEC::AddLog(CEC_LOG_NOTICE, ">> %s (%X) -> %s (%X): %s (%2X)", m_processor->ToString(command.initiator), command.initiator, m_processor->ToString(command.destination), command.destination, m_processor->ToString(command.opcode), command.opcode); - - m_processor->AddCommand(command); + CLibCEC::AddCommand(command); switch(command.opcode) { @@ -591,12 +589,10 @@ bool CCECCommandHandler::HandleUserControlPressed(const cec_command &command) { if (m_processor->IsStarted() && m_busDevice->MyLogicalAddressContains(command.destination) && command.parameters.size > 0) { - m_processor->AddKey(); + CLibCEC::AddKey(); if (command.parameters[0] <= CEC_USER_CONTROL_CODE_MAX) { - CLibCEC::AddLog(CEC_LOG_DEBUG, "key pressed: %x", command.parameters[0]); - if (command.parameters[0] == CEC_USER_CONTROL_CODE_POWER || command.parameters[0] == CEC_USER_CONTROL_CODE_POWER_ON_FUNCTION) { @@ -617,7 +613,7 @@ bool CCECCommandHandler::HandleUserControlPressed(const cec_command &command) } else { - m_processor->SetCurrentButton((cec_user_control_code) command.parameters[0]); + CLibCEC::SetCurrentButton((cec_user_control_code) command.parameters[0]); } return true; } @@ -628,7 +624,7 @@ bool CCECCommandHandler::HandleUserControlPressed(const cec_command &command) bool CCECCommandHandler::HandleUserControlRelease(const cec_command &command) { if (m_processor->IsStarted() && m_busDevice->MyLogicalAddressContains(command.destination)) - m_processor->AddKey(); + CLibCEC::AddKey(); return true; }