X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fimplementations%2FRLCommandHandler.cpp;h=e969cac9963df23474c2d6c00357ba2dfe265a45;hb=e7c95b16bb716f2ec3ffab0384cdb846933b8e3e;hp=6956a218ab8c4156518fe2db584ad2f2894d16c2;hpb=0b83551352338fb45b285c44d6baccd867f05b6d;p=deb_libcec.git diff --git a/src/lib/implementations/RLCommandHandler.cpp b/src/lib/implementations/RLCommandHandler.cpp index 6956a21..e969cac 100644 --- a/src/lib/implementations/RLCommandHandler.cpp +++ b/src/lib/implementations/RLCommandHandler.cpp @@ -1,7 +1,7 @@ /* * This file is part of the libCEC(R) library. * - * libCEC(R) is Copyright (C) 2011-2012 Pulse-Eight Limited. All rights reserved. + * libCEC(R) is Copyright (C) 2011-2013 Pulse-Eight Limited. All rights reserved. * libCEC(R) is an original work, containing original code. * * libCEC(R) is a trademark of Pulse-Eight Limited. @@ -37,10 +37,14 @@ #include "lib/devices/CECBusDevice.h" #include "lib/CECProcessor.h" #include "lib/LibCEC.h" +#include "lib/CECClient.h" using namespace CEC; using namespace PLATFORM; +#define RL_KEY_TOP_MENU 0x10 +#define RL_KEY_DVD_MENU 0x11 + CRLCommandHandler::CRLCommandHandler(CCECBusDevice *busDevice, int32_t iTransmitTimeout /* = CEC_DEFAULT_TRANSMIT_TIMEOUT */, int32_t iTransmitWait /* = CEC_DEFAULT_TRANSMIT_WAIT */, @@ -79,3 +83,58 @@ bool CRLCommandHandler::InitHandler(void) return true; } + +int CRLCommandHandler::HandleDeviceVendorCommandWithId(const cec_command &command) +{ + if (!m_processor->IsHandledByLibCEC(command.destination)) + return CEC_ABORT_REASON_INVALID_OPERAND; + + if (command.parameters.size < 4) + return CEC_ABORT_REASON_INVALID_OPERAND; + + // check whether the vendor id matches + if (command.parameters[0] != 0x00 || + command.parameters[1] != 0x00 || + command.parameters[2] != 0x39) + return CEC_ABORT_REASON_INVALID_OPERAND; + + bool bHandled(false); + CCECClient* client = m_processor->GetClient(command.destination); + if (client) + { + switch (command.parameters[3]) + { + // user control pressed + case CEC_OPCODE_USER_CONTROL_PRESSED: + if (command.parameters.size == 5) + { + switch (command.parameters[4]) + { + // top menu -> root menu + case RL_KEY_TOP_MENU: + client->SetCurrentButton(CEC_USER_CONTROL_CODE_ROOT_MENU); + break; + // dvd menu -> contents menu + case RL_KEY_DVD_MENU: + client->SetCurrentButton(CEC_USER_CONTROL_CODE_CONTENTS_MENU); + break; + default: + break; + } + bHandled = true; + } + break; + // user control released + case CEC_OPCODE_USER_CONTROL_RELEASE: + client->AddKey(); + bHandled = true; + break; + default: + break; + } + } + + return bHandled ? + COMMAND_HANDLED : + CCECCommandHandler::HandleDeviceVendorCommandWithId(command); +}