From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Sun, 4 Dec 2011 20:47:41 +0000 (+0100)
Subject: cec: LG devices always return 'korean' as menu language. set the language for all... 
X-Git-Tag: upstream/2.2.0~1^2~44^2~40
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=37acf382b4a151ba018ecd3558fdd5b8cc585077;p=deb_libcec.git

cec: LG devices always return 'korean' as menu language. set the language for all LG devices to english
---

diff --git a/src/lib/implementations/SLCommandHandler.cpp b/src/lib/implementations/SLCommandHandler.cpp
index 76007cc..32ff889 100644
--- a/src/lib/implementations/SLCommandHandler.cpp
+++ b/src/lib/implementations/SLCommandHandler.cpp
@@ -194,42 +194,54 @@ bool CSLCommandHandler::HandleReceiveFailed(void)
 
 bool CSLCommandHandler::InitHandler(void)
 {
-  if (m_busDevice->GetLogicalAddress() != CECDEVICE_TV)
-    return true;
-
   if (m_bSLEnabled)
     return true;
   m_bSLEnabled = true;
 
   CCECBusDevice *primary = m_busDevice->GetProcessor()->m_busDevices[m_busDevice->GetProcessor()->GetLogicalAddresses().primary];
   primary->SetVendorId(CEC_VENDOR_LG);
-  primary->TransmitVendorID(CECDEVICE_TV);
-  primary->TransmitPhysicalAddress();
 
-  cec_command command;
-  cec_command::Format(command, m_busDevice->GetProcessor()->GetLogicalAddresses().primary, CECDEVICE_TV, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
-  m_busDevice->GetProcessor()->Transmit(command);
+  if (m_busDevice->GetLogicalAddress() == CECDEVICE_TV)
+  {
+    primary->TransmitVendorID(CECDEVICE_TV);
+    primary->TransmitPhysicalAddress();
+
+    cec_command command;
+    cec_command::Format(command, m_busDevice->GetProcessor()->GetLogicalAddresses().primary, CECDEVICE_TV, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
+    m_busDevice->GetProcessor()->Transmit(command);
 
-  /* LG TVs don't always reply to CEC version requests, so just set it to 1.3a */
-  m_busDevice->GetProcessor()->m_busDevices[CECDEVICE_TV]->SetCecVersion(CEC_VERSION_1_3A);
+    /* 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 TVs only route keypresses when the deck status is set to 0x20 */
-  cec_logical_addresses addr = m_busDevice->GetProcessor()->GetLogicalAddresses();
-  for (uint8_t iPtr = 0; iPtr < 15; iPtr++)
-  {
-    CCECBusDevice *device = m_busDevice->GetProcessor()->m_busDevices[iPtr];
+  /* LG devices always return "korean" as language */
+  cec_menu_language lang;
+  lang.device = m_busDevice->GetLogicalAddress();
+  snprintf(lang.language, 4, "eng");
+  m_busDevice->SetMenuLanguage(lang);
 
-    /* increase the transmit timeout because the tv is keeping the bus busy at times */
-    device->SetTransmitTimeout(3000);
-    if (addr[iPtr])
+  if (m_busDevice->GetLogicalAddress() == CECDEVICE_TV)
+  {
+    /* LG TVs only route keypresses when the deck status is set to 0x20 */
+    cec_logical_addresses addr = m_busDevice->GetProcessor()->GetLogicalAddresses();
+    for (uint8_t iPtr = 0; iPtr < 15; iPtr++)
     {
-      if (device && (device->GetType() == CEC_DEVICE_TYPE_PLAYBACK_DEVICE ||
-                     device->GetType() == CEC_DEVICE_TYPE_RECORDING_DEVICE))
+      CCECBusDevice *device = m_busDevice->GetProcessor()->m_busDevices[iPtr];
+
+      /* increase the transmit timeout because the tv is keeping the bus busy at times */
+      device->SetTransmitTimeout(5000);
+
+      if (addr[iPtr])
       {
-        ((CCECPlaybackDevice *)device)->SetDeckStatus(CEC_DECK_INFO_OTHER_STATUS_LG);
-        TransmitDeckStatus(CECDEVICE_TV);
+        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);
+          TransmitDeckStatus(CECDEVICE_TV);
+        }
       }
     }
   }
+
   return true;
 }