SL clean up and attempt to fix issue #176

[deb_libcec.git] / src / lib / implementations / SLCommandHandler.h

diff --git a/src/lib/implementations/SLCommandHandler.h b/src/lib/implementations/SLCommandHandler.h
index 0eb6c8656e25170519279e9035c0bce66930da89..166bac02609e9027515d8e3cf658dd9affb978e5 100644 (file)
--- a/src/lib/implementations/SLCommandHandler.h
+++ b/src/lib/implementations/SLCommandHandler.h
@@ -2,7 +2,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.
@@ -32,25 +32,27 @@
  */
 
 #include "CECCommandHandler.h"
-#include "../platform/util/timeutils.h"
 
 namespace CEC
 {
   class CSLCommandHandler : public CCECCommandHandler
   {
   public:
-    CSLCommandHandler(CCECBusDevice *busDevice);
+    CSLCommandHandler(CCECBusDevice *busDevice,
+                      int32_t iTransmitTimeout = CEC_DEFAULT_TRANSMIT_TIMEOUT,
+                      int32_t iTransmitWait = CEC_DEFAULT_TRANSMIT_WAIT,
+                      int8_t iTransmitRetries = CEC_DEFAULT_TRANSMIT_RETRIES,
+                      int64_t iActiveSourcePending = 0);
     virtual ~CSLCommandHandler(void) {};
 
     bool InitHandler(void);
+    bool ActivateSource(bool bTransmitDelayedCommandsOnly = false);
 
   protected:
-    bool HandleActiveSource(const cec_command &command);
-    bool HandleDeviceVendorId(const cec_command &command);
-    bool HandleVendorCommand(const cec_command &command);
+    int HandleVendorCommand(const cec_command &command);
 
-    void HandleVendorCommand01(const cec_command &command);
-    void TransmitVendorCommand0205(const cec_logical_address iSource, const cec_logical_address iDestination);
+    void HandleVendorCommandSLInit(const cec_command &command);
+    void TransmitVendorCommandSLAckInit(const cec_logical_address iSource, const cec_logical_address iDestination);
 
     void HandleVendorCommandPowerOn(const cec_command &command);
     void HandleVendorCommandPowerOnStatus(const cec_command &command);
@@ -58,21 +60,19 @@ namespace CEC
     void HandleVendorCommandSLConnect(const cec_command &command);
     void TransmitVendorCommandSetDeviceMode(const cec_logical_address iSource, const cec_logical_address iDestination, const cec_device_type type);
 
-    bool HandleGiveDevicePowerStatus(const cec_command &command);
-    bool HandleGiveDeckStatus(const cec_command &command);
-    bool HandleRequestActiveSource(const cec_command &command);
-    bool HandleFeatureAbort(const cec_command &command);
-    bool HandleStandby(const cec_command &command);
-    bool TransmitMenuState(const cec_logical_address UNUSED(iInitiator), const cec_logical_address UNUSED(iDestination), cec_menu_state UNUSED(menuState)) { return true; }
+    int HandleGiveDevicePowerStatus(const cec_command &command);
+    int HandleGiveDeckStatus(const cec_command &command);
+    int HandleRequestActiveSource(const cec_command &command);
+    int HandleFeatureAbort(const cec_command &command);
+    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);
 
     void ResetSLState(void);
     bool SLInitialised(void);
     void SetSLInitialised(void);
-    bool ActiveSourceSent(void);
 
     bool               m_bSLEnabled;
-    bool               m_bActiveSourceSent;
     PLATFORM::CTimeout m_resetPowerState;
     PLATFORM::CMutex   m_SLMutex;
   };