From: Lars Op den Kamp Date: Sat, 17 Nov 2012 02:33:33 +0000 (+0100) Subject: Merge branch 'master' into release X-Git-Tag: upstream/2.2.0~1^2~10 X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=178d498b825f815a2b9f1aaab1d6f5d41b3cd414;hp=92aa0fb3b569b4678bc08d6061d3115517d54252;p=deb_libcec.git Merge branch 'master' into release --- diff --git a/src/lib/implementations/PHCommandHandler.h b/src/lib/implementations/PHCommandHandler.h index cf61c66..38ebfe5 100644 --- a/src/lib/implementations/PHCommandHandler.h +++ b/src/lib/implementations/PHCommandHandler.h @@ -71,7 +71,7 @@ namespace CEC virtual int HandleUserControlRelease(const cec_command& command); virtual bool TransmitVendorID(const cec_logical_address iInitiator, const cec_logical_address iDestination, uint64_t iVendorId, bool bIsReply); virtual int HandleDeviceVendorId(const cec_command& command); - virtual int HandleVendorRemoteButtonUp(const cec_command & UNUSED(command)) { m_iLastKeyCode = CEC_USER_CONTROL_CODE_UNKNOWN; return COMMAND_HANDLED; } + virtual int HandleVendorRemoteButtonUp(const cec_command & command) { return HandleUserControlRelease(command); } uint8_t m_iLastKeyCode; CImageViewOnCheck* m_imageViewOnCheck; };