X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fimplementations%2FSLCommandHandler.cpp;h=9cd8ab6e3617e75d9a19f4e576534186e5365215;hb=19cbfa8fb49b15e018856146700ff3d5dc3016ee;hp=c23099eb0d2c408ba0ef6f37f7fccdef7055dcae;hpb=7837bab3f716a157f901a43bf6367e6203e4c60b;p=deb_libcec.git

diff --git a/src/lib/implementations/SLCommandHandler.cpp b/src/lib/implementations/SLCommandHandler.cpp
index c23099e..9cd8ab6 100644
--- a/src/lib/implementations/SLCommandHandler.cpp
+++ b/src/lib/implementations/SLCommandHandler.cpp
@@ -53,8 +53,18 @@ CSLCommandHandler::CSLCommandHandler(CCECBusDevice *busDevice) :
     m_bSLEnabled(false),
     m_bVendorIdSent(false)
 {
-  /* TODO set to powered off until we fixed the connect on start loop issue */
-  m_processor->m_busDevices[m_processor->GetLogicalAddresses().primary]->m_powerStatus = CEC_POWER_STATUS_STANDBY;
+}
+
+void CSLCommandHandler::SetLGDeckStatus(void)
+{
+  /* LG TVs only route keypresses when the deck status is set to 0x20 */
+  CCECBusDevice *device = m_processor->GetDeviceByType(CEC_DEVICE_TYPE_PLAYBACK_DEVICE);
+  if (device)
+    ((CCECPlaybackDevice *)device)->SetDeckStatus(CEC_DECK_INFO_OTHER_STATUS_LG);
+
+  device = m_processor->GetDeviceByType(CEC_DEVICE_TYPE_RECORDING_DEVICE);
+  if (device)
+    ((CCECPlaybackDevice *)device)->SetDeckStatus(CEC_DECK_INFO_OTHER_STATUS_LG);
 }
 
 bool CSLCommandHandler::HandleVendorCommand(const cec_command &command)
@@ -87,23 +97,6 @@ bool CSLCommandHandler::HandleVendorCommand(const cec_command &command)
   return false;
 }
 
-bool CSLCommandHandler::HandleGiveDeckStatus(const cec_command &command)
-{
-  if (command.parameters.size == 1)
-  {
-    if (command.parameters[0] == CEC_STATUS_REQUEST_ONCE ||
-        command.parameters[0] == CEC_STATUS_REQUEST_ON)
-    {
-      TransmitDeckStatus(command.initiator);
-    }
-    else
-    {
-      CCECCommandHandler::HandleGiveDeckStatus(command);
-    }
-  }
-  return true;
-}
-
 void CSLCommandHandler::HandleVendorCommand01(const cec_command &command)
 {
   TransmitVendorCommand0205(command.destination, command.initiator);
@@ -116,7 +109,7 @@ void CSLCommandHandler::TransmitVendorCommand0205(const cec_logical_address iSou
   response.PushBack(SL_COMMAND_UNKNOWN_02);
   response.PushBack(SL_COMMAND_UNKNOWN_03);
 
-  Transmit(response);
+  Transmit(response, false);
 }
 
 void CSLCommandHandler::TransmitVendorCommand05(const cec_logical_address iSource, const cec_logical_address iDestination)
@@ -126,15 +119,16 @@ void CSLCommandHandler::TransmitVendorCommand05(const cec_logical_address iSourc
   cec_command::Format(response, iSource, iDestination, CEC_OPCODE_VENDOR_COMMAND);
   response.PushBack(SL_COMMAND_CONNECT_ACCEPT);
   response.PushBack((uint8_t)iSource);
-  Transmit(response);
+  Transmit(response, false);
 }
 
 void CSLCommandHandler::HandleVendorCommandPowerOn(const cec_command &command)
 {
-  CCECBusDevice *device = m_processor->m_busDevices[m_processor->GetLogicalAddresses().primary];
+  CCECBusDevice *device = m_processor->GetPrimaryDevice();
   if (device)
   {
     m_bSLEnabled = true;
+    SetLGDeckStatus();
     device->SetPowerStatus(CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON);
     device->TransmitPowerState(command.initiator);
     device->TransmitVendorID(command.initiator);
@@ -145,10 +139,10 @@ void CSLCommandHandler::HandleVendorCommandPowerOn(const cec_command &command)
 void CSLCommandHandler::HandleVendorCommandSLConnect(const cec_command &command)
 {
   m_bSLEnabled = true;
+  m_processor->m_busDevices[command.initiator]->SetActiveSource();
   m_processor->m_busDevices[command.destination]->TransmitActiveSource();
-  m_processor->SetStreamPath(m_processor->m_busDevices[command.destination]->GetPhysicalAddress(false));
   TransmitVendorCommand05(command.destination, command.initiator);
-  TransmitDeckStatus(command.initiator);
+  SetLGDeckStatus();
 }
 
 void CSLCommandHandler::HandleVendorCommandPowerOnStatus(const cec_command &command)
@@ -162,17 +156,6 @@ void CSLCommandHandler::HandleVendorCommandPowerOnStatus(const cec_command &comm
   }
 }
 
-void CSLCommandHandler::TransmitDeckStatus(const cec_logical_address iDestination)
-{
-  /* set deck status for the playback device */
-  CCECBusDevice *primary = m_processor->m_busDevices[m_processor->GetLogicalAddresses().primary];
-  if (primary->GetType() == CEC_DEVICE_TYPE_PLAYBACK_DEVICE || primary->GetType() == CEC_DEVICE_TYPE_RECORDING_DEVICE)
-  {
-    ((CCECPlaybackDevice *)primary)->SetDeckStatus(CEC_DECK_INFO_OTHER_STATUS_LG);
-    ((CCECPlaybackDevice *)primary)->TransmitDeckStatus(iDestination);
-  }
-}
-
 bool CSLCommandHandler::TransmitLGVendorId(const cec_logical_address iInitiator, const cec_logical_address iDestination)
 {
   cec_command response;
@@ -181,18 +164,12 @@ bool CSLCommandHandler::TransmitLGVendorId(const cec_logical_address iInitiator,
   response.parameters.PushBack((uint8_t) (((uint64_t)CEC_VENDOR_LG >> 8) & 0xFF));
   response.parameters.PushBack((uint8_t) ((uint64_t)CEC_VENDOR_LG & 0xFF));
 
-  Transmit(response);
-  return true;
-}
+  Transmit(response, false);
 
-bool CSLCommandHandler::HandleGiveDeviceVendorId(const cec_command &command)
-{
-  /* imitate LG devices */
-  CCECBusDevice *device = GetDevice(command.destination);
-  if (device)
-    device->SetVendorId(CEC_VENDOR_LG);
+  cec_command::Format(response, iInitiator, iDestination, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
+  Transmit(response);
 
-  return CCECCommandHandler::HandleGiveDeviceVendorId(command);
+  return true;
 }
 
 bool CSLCommandHandler::HandleCommand(const cec_command &command)
@@ -213,9 +190,11 @@ bool CSLCommandHandler::HandleCommand(const cec_command &command)
         {
           m_bVendorIdSent = true;
           TransmitLGVendorId(m_processor->GetLogicalAddresses().primary, CECDEVICE_BROADCAST);
+          m_processor->GetPrimaryDevice()->SetPowerStatus(CEC_POWER_STATUS_STANDBY);
         }
       }
       bHandled = true;
+      break;
     default:
       break;
     }
@@ -246,26 +225,19 @@ bool CSLCommandHandler::HandleReceiveFailed(void)
 
 bool CSLCommandHandler::InitHandler(void)
 {
-  m_processor->SetStandardLineTimeout(3);
-  m_processor->SetRetryLineTimeout(3);
+  if (m_bHandlerInited)
+    return true;
+  m_bHandlerInited = true;
 
-  /* increase the number of retries because the tv is keeping the bus busy at times */
-  m_iTransmitWait    = 2000;
-  m_iTransmitRetries = 4;
-  m_iTransmitTimeout = 500;
+  CCECBusDevice *primary = m_processor->GetPrimaryDevice();
 
-  CCECBusDevice *primary = m_processor->m_busDevices[m_processor->GetLogicalAddresses().primary];
+  /* imitate LG devices */
   if (m_busDevice->GetLogicalAddress() != primary->GetLogicalAddress())
-  {
     primary->SetVendorId(CEC_VENDOR_LG, false);
-    primary->TransmitVendorID(CECDEVICE_TV, false);
-  }
 
+  /* LG TVs don't always reply to CEC version requests, so just set it to 1.3a */
   if (m_busDevice->GetLogicalAddress() == CECDEVICE_TV)
-  {
-    /* LG TVs 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;
@@ -273,27 +245,9 @@ bool CSLCommandHandler::InitHandler(void)
   snprintf(lang.language, 4, "eng");
   m_busDevice->SetMenuLanguage(lang);
 
-  if (m_busDevice->GetLogicalAddress() == CECDEVICE_TV)
-  {
-    m_processor->SetActiveSource();
-
-    /* LG TVs only route keypresses when the deck status is set to 0x20 */
-    cec_logical_addresses addr = m_processor->GetLogicalAddresses();
-    for (uint8_t iPtr = 0; iPtr < 15; iPtr++)
-    {
-      CCECBusDevice *device = m_processor->m_busDevices[iPtr];
-
-      if (addr[iPtr])
-      {
-        if (device && (device->GetType() == CEC_DEVICE_TYPE_PLAYBACK_DEVICE ||
-                       device->GetType() == CEC_DEVICE_TYPE_RECORDING_DEVICE))
-        {
-          ((CCECPlaybackDevice *)device)->SetDeckStatus(CEC_DECK_INFO_OTHER_STATUS_LG);
-          ((CCECPlaybackDevice *)device)->TransmitDeckStatus(CECDEVICE_TV);
-        }
-      }
-    }
-  }
+  /* reply with LGs vendor id */
+  if (m_busDevice->GetLogicalAddress() != primary->GetLogicalAddress())
+    primary->TransmitVendorID(CECDEVICE_TV, false);
 
   return true;
 }
@@ -308,9 +262,22 @@ bool CSLCommandHandler::TransmitPowerOn(const cec_logical_address iInitiator, co
     cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_VENDOR_COMMAND);
     command.parameters.PushBack((uint8_t)SL_COMMAND_POWER_ON);
     command.parameters.PushBack(0x00);
-    return Transmit(command);
+    return Transmit(command, false);
   }
 
-  return CCECCommandHandler::TransmitPowerOn(iInitiator, iDestination);
+  return CCECCommandHandler::TransmitImageViewOn(iInitiator, iDestination);
 }
 
+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 == 0)
+      return m_processor->GetPrimaryDevice()->TransmitPhysicalAddress();
+    else
+      return m_processor->SetActiveSource(iAddress);
+  }
+
+  return true;
+}