From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Fri, 21 Jun 2013 13:27:05 +0000 (+0200)
Subject: HandleVendorRemoteButtonUp -> HandleUserControlRelease for all vendors
X-Git-Tag: upstream/2.2.0~1^2~3^2~37
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=3befc9811e59359c014c33c1276f869d5b59ac09;p=deb_libcec.git

HandleVendorRemoteButtonUp -> HandleUserControlRelease for all vendors
---

diff --git a/src/lib/implementations/ANCommandHandler.cpp b/src/lib/implementations/ANCommandHandler.cpp
index 115fa88..7e0e9b9 100644
--- a/src/lib/implementations/ANCommandHandler.cpp
+++ b/src/lib/implementations/ANCommandHandler.cpp
@@ -76,11 +76,6 @@ int CANCommandHandler::HandleVendorRemoteButtonDown(const cec_command &command)
   return COMMAND_HANDLED;
 }
 
-int CANCommandHandler::HandleVendorRemoteButtonUp(const cec_command &command)
-{
-  return HandleUserControlRelease(command);
-}
-
 bool CANCommandHandler::PowerOn(const cec_logical_address iInitiator, const cec_logical_address iDestination)
 {
   if (iDestination == CECDEVICE_AUDIOSYSTEM)
diff --git a/src/lib/implementations/ANCommandHandler.h b/src/lib/implementations/ANCommandHandler.h
index ab0184a..595170a 100644
--- a/src/lib/implementations/ANCommandHandler.h
+++ b/src/lib/implementations/ANCommandHandler.h
@@ -46,7 +46,6 @@ namespace CEC
     virtual ~CANCommandHandler(void) {};
 
     int HandleVendorRemoteButtonDown(const cec_command &command);
-    int HandleVendorRemoteButtonUp(const cec_command &command);
     int HandleDeviceVendorCommandWithId(const cec_command &command);
 
   protected:
diff --git a/src/lib/implementations/CECCommandHandler.h b/src/lib/implementations/CECCommandHandler.h
index 9902a08..5ad5ab0 100644
--- a/src/lib/implementations/CECCommandHandler.h
+++ b/src/lib/implementations/CECCommandHandler.h
@@ -138,7 +138,7 @@ namespace CEC
     virtual int HandleUserControlRelease(const cec_command &command);
     virtual int HandleVendorCommand(const cec_command &command);
     virtual int HandleVendorRemoteButtonDown(const cec_command& command);
-    virtual int HandleVendorRemoteButtonUp(const cec_command & UNUSED(command)) { return COMMAND_HANDLED; }
+    virtual int HandleVendorRemoteButtonUp(const cec_command& command) { return HandleUserControlRelease(command); }
     virtual void UnhandledCommand(const cec_command &command, const cec_abort_reason reason);
     virtual void RequestEmailFromCustomer(const cec_command& command);
 
diff --git a/src/lib/implementations/PHCommandHandler.h b/src/lib/implementations/PHCommandHandler.h
index f6f3fcc..5e30047 100644
--- a/src/lib/implementations/PHCommandHandler.h
+++ b/src/lib/implementations/PHCommandHandler.h
@@ -71,7 +71,6 @@ 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 & command) { return HandleUserControlRelease(command); }
     uint8_t            m_iLastKeyCode;
     CImageViewOnCheck* m_imageViewOnCheck;
   };
diff --git a/src/lib/implementations/SLCommandHandler.h b/src/lib/implementations/SLCommandHandler.h
index ac8cb5c..9ce444b 100644
--- a/src/lib/implementations/SLCommandHandler.h
+++ b/src/lib/implementations/SLCommandHandler.h
@@ -68,7 +68,6 @@ namespace CEC
     int HandleStandby(const cec_command &command);
     bool TransmitMenuState(const cec_logical_address UNUSED(iInitiator), const cec_logical_address UNUSED(iDestination), cec_menu_state UNUSED(menuState), bool UNUSED(bIsReply)) { return true; }
     bool PowerOn(const cec_logical_address iInitiator, const cec_logical_address iDestination);
-    int HandleVendorRemoteButtonUp(const cec_command& command) { return HandleUserControlRelease(command); }
 
     void ResetSLState(void);
     bool SLInitialised(void);