X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fimplementations%2FSLCommandHandler.cpp;h=692a5fd824b51f722e1f89b728660bfa65c8eb9b;hb=3b2bd169c03f74ccca35d9e211bbbc1308c33675;hp=b6b55ae84a101f7bf599d323f2e09bddc664ff9b;hpb=73bbe00fe9228e6a249a3d3b950a00639e0ed647;p=deb_libcec.git

diff --git a/src/lib/implementations/SLCommandHandler.cpp b/src/lib/implementations/SLCommandHandler.cpp
index b6b55ae..692a5fd 100644
--- a/src/lib/implementations/SLCommandHandler.cpp
+++ b/src/lib/implementations/SLCommandHandler.cpp
@@ -68,9 +68,8 @@ CSLCommandHandler::CSLCommandHandler(CCECBusDevice *busDevice) :
     primary->ReplaceHandler(false);
   }
 
-  /* LG TVs don't always reply to CEC version requests, so just set it to 1.3a */
-  if (m_busDevice->GetLogicalAddress() == CECDEVICE_TV)
-    m_busDevice->SetCecVersion(CEC_VERSION_1_3A);
+  /* LG devices don't always reply to CEC version requests, so just set it to 1.3a */
+  m_busDevice->SetCecVersion(CEC_VERSION_1_3A);
 
   /* LG devices always return "korean" as language */
   cec_menu_language lang;
@@ -102,21 +101,21 @@ bool CSLCommandHandler::InitHandler(void)
 
 bool CSLCommandHandler::ActivateSource(void)
 {
-  if (!SLInitialised())
+  if (!m_processor->GetPrimaryDevice()->IsActiveSource())
   {
-    CLibCEC::AddLog(CEC_LOG_NOTICE, "not activating the source until SL has been initialised");
+    CLibCEC::AddLog(CEC_LOG_NOTICE, "not activating the source because we're not marked as active");
     return true;
   }
 
   {
     CLockObject lock(m_SLMutex);
-    if (m_bActiveSourceSent)
-      return true;
     m_bActiveSourceSent = true;
   }
 
   CCECBusDevice *primary = m_processor->GetPrimaryDevice();
   primary->SetActiveSource();
+  primary->SetPowerStatus(CEC_POWER_STATUS_ON);
+  primary->TransmitPowerState(CECDEVICE_TV);
   primary->TransmitImageViewOn();
   primary->TransmitActiveSource();
   return true;
@@ -127,14 +126,22 @@ bool CSLCommandHandler::HandleActiveSource(const cec_command &command)
   if (command.parameters.size == 2)
   {
     uint16_t iAddress = ((uint16_t)command.parameters[0] << 8) | ((uint16_t)command.parameters[1]);
-    if (iAddress != m_processor->GetPrimaryDevice()->GetPhysicalAddress(false))
+    CCECBusDevice *primary = m_processor->GetPrimaryDevice();
+    bool bSendPowerOffState(iAddress != primary->GetPhysicalAddress(false) && primary->IsActiveSource());
+
+    m_processor->SetActiveSource(iAddress);
+    if (bSendPowerOffState)
     {
-      ResetSLState();
+      {
+        CLockObject lock(m_SLMutex);
+        m_bActiveSourceSent = false;
+      }
+      primary->TransmitPowerState(CECDEVICE_TV);
     }
-    return m_processor->SetActiveSource(iAddress);
   }
 
   return true;
+
 }
 
 bool CSLCommandHandler::HandleDeviceVendorId(const cec_command &command)
@@ -220,13 +227,18 @@ void CSLCommandHandler::HandleVendorCommandPowerOn(const cec_command &command)
   if (device)
   {
     SetSLInitialised();
-
-    device->SetPowerStatus(CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON); //XXX
+    device->SetActiveSource();
+    device->SetPowerStatus(CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON);
     device->TransmitPowerState(command.initiator);
-    device->SetPowerStatus(CEC_POWER_STATUS_ON);
 
-    device->SetActiveSource();
-    TransmitImageViewOn(device->GetLogicalAddress(), command.initiator);
+    CEvent::Sleep(2000);
+    device->SetPowerStatus(CEC_POWER_STATUS_ON);
+    device->TransmitPowerState(command.initiator);
+    device->TransmitPhysicalAddress();
+    {
+      CLockObject lock(m_SLMutex);
+      m_bActiveSourceSent = false;
+    }
   }
 }
 void CSLCommandHandler::HandleVendorCommandPowerOnStatus(const cec_command &command)
@@ -266,16 +278,16 @@ bool CSLCommandHandler::HandleGiveDeckStatus(const cec_command &command)
     {
       if (command.parameters.size > 0)
       {
+        ((CCECPlaybackDevice *) device)->SetDeckStatus(!device->IsActiveSource() ? CEC_DECK_INFO_OTHER_STATUS : CEC_DECK_INFO_OTHER_STATUS_LG);
         if (command.parameters[0] == CEC_STATUS_REQUEST_ON)
         {
-          ((CCECPlaybackDevice *) device)->SetDeckStatus(CEC_DECK_INFO_STOP);
-          return ((CCECPlaybackDevice *) device)->TransmitDeckStatus(command.initiator) &&
-              device->TransmitImageViewOn() &&
-              device->TransmitPhysicalAddress();
+          bool bReturn = ((CCECPlaybackDevice *) device)->TransmitDeckStatus(command.initiator);
+          if (!ActiveSourceSent())
+            ActivateSource();
+          return bReturn;
         }
         else if (command.parameters[0] == CEC_STATUS_REQUEST_ONCE)
         {
-          ((CCECPlaybackDevice *) device)->SetDeckStatus(CEC_DECK_INFO_OTHER_STATUS_LG);
           return ((CCECPlaybackDevice *) device)->TransmitDeckStatus(command.initiator);
         }
       }
@@ -308,7 +320,7 @@ bool CSLCommandHandler::HandleGiveDevicePowerStatus(const cec_command &command)
       else if (m_resetPowerState.IsSet() && m_resetPowerState.TimeLeft() > 0)
       {
         /* TODO assume that we've bugged out. the return button no longer works after this */
-        CLibCEC::AddLog(CEC_LOG_NOTICE, "LG seems to have bugged out. resetting to 'in transition standby to on'");
+        CLibCEC::AddLog(CEC_LOG_WARNING, "FIXME: LG seems to have bugged out. resetting to 'in transition standby to on'. the return button will not work");
         {
           CLockObject lock(m_SLMutex);
           m_bActiveSourceSent = false;
@@ -333,7 +345,10 @@ bool CSLCommandHandler::HandleRequestActiveSource(const cec_command &command)
 {
   if (m_processor->IsRunning())
   {
-    CLibCEC::AddLog(CEC_LOG_DEBUG, ">> %i requests active source, ignored", (uint8_t) command.initiator);
+    if (ActiveSourceSent())
+      CLibCEC::AddLog(CEC_LOG_DEBUG, ">> %i requests active source, ignored", (uint8_t) command.initiator);
+    else
+      ActivateSource();
     return true;
   }
   return false;
@@ -354,7 +369,10 @@ bool CSLCommandHandler::HandleFeatureAbort(const cec_command &command)
 bool CSLCommandHandler::HandleStandby(const cec_command &command)
 {
   if (command.initiator == CECDEVICE_TV)
-    ResetSLState();
+  {
+    CLockObject lock(m_SLMutex);
+    m_bActiveSourceSent = false;
+  }
 
   return CCECCommandHandler::HandleStandby(command);
 }
@@ -391,6 +409,7 @@ bool CSLCommandHandler::PowerOn(const cec_logical_address iInitiator, const cec_
 {
   if (iDestination != CECDEVICE_TV)
   {
+    /* LG devices only allow themselves to be woken up by the TV with a vendor command */
     cec_command command;
     cec_command::Format(command, CECDEVICE_TV, iDestination, CEC_OPCODE_VENDOR_COMMAND);
     command.PushBack(SL_COMMAND_POWER_ON);