X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FCECProcessor.cpp;h=bdcb4d3e816deadbde7385d1dbab0c91e40ddbde;hb=91bea17434cd0cec8c6c7f2a53cb8cdd07e4c446;hp=c179e82837e12e3113fe5a1fd73fc41da531b9d5;hpb=8747dd4fbf6aca45c49391ba754f013f28ca3806;p=deb_libcec.git

diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp
index c179e82..bdcb4d3 100644
--- a/src/lib/CECProcessor.cpp
+++ b/src/lib/CECProcessor.cpp
@@ -39,6 +39,7 @@
 #include "devices/CECRecordingDevice.h"
 #include "devices/CECTuner.h"
 #include "devices/CECTV.h"
+#include "implementations/CECCommandHandler.h"
 #include "LibCEC.h"
 #include "util/StdString.h"
 #include "platform/timeutils.h"
@@ -136,8 +137,9 @@ bool CCECProcessor::Start(void)
   return false;
 }
 
-bool CCECProcessor::TryLogicalAddress(cec_logical_address address, const char *strLabel, unsigned int iIndex)
+bool CCECProcessor::TryLogicalAddress(cec_logical_address address, unsigned int iIndex)
 {
+  const char *strLabel = CCECCommandHandler::ToString(address);
   CStdString strLog;
   strLog.Format("trying logical address '%s'", strLabel);
   AddLog(CEC_LOG_DEBUG, strLog);
@@ -154,12 +156,13 @@ bool CCECProcessor::TryLogicalAddress(cec_logical_address address, const char *s
       m_busDevices[address]->m_strDeviceName = m_strDeviceName;
       m_busDevices[address]->m_bActiveSource = true;
     }
-    m_busDevices[address]->m_powerStatus = (m_types[0] == m_busDevices[address]->m_type) ? CEC_POWER_STATUS_ON : CEC_POWER_STATUS_STANDBY;
-    m_busDevices[address]->m_cecVersion = CEC_VERSION_1_3A;
+    m_busDevices[address]->m_powerStatus = CEC_POWER_STATUS_STANDBY;
+    m_busDevices[address]->m_cecVersion =  CEC_VERSION_1_3A;
+
     m_logicalAddresses.set(address);
 
     // TODO
-    m_busDevices[address]->SetPhysicalAddress(CEC_DEFAULT_PHYSICAL_ADDRESS + (iIndex * 0x100));
+    m_busDevices[address]->SetPhysicalAddress((uint16_t)CEC_DEFAULT_PHYSICAL_ADDRESS + ((uint16_t)iIndex * 0x100));
 
     return true;
   }
@@ -172,32 +175,32 @@ bool CCECProcessor::TryLogicalAddress(cec_logical_address address, const char *s
 bool CCECProcessor::FindLogicalAddressRecordingDevice(unsigned int iIndex)
 {
   AddLog(CEC_LOG_DEBUG, "detecting logical address for type 'recording device'");
-  return TryLogicalAddress(CECDEVICE_RECORDINGDEVICE1, "recording 1", iIndex) ||
-      TryLogicalAddress(CECDEVICE_RECORDINGDEVICE2, "recording 2", iIndex) ||
-      TryLogicalAddress(CECDEVICE_RECORDINGDEVICE3, "recording 3", iIndex);
+  return TryLogicalAddress(CECDEVICE_RECORDINGDEVICE1, iIndex) ||
+      TryLogicalAddress(CECDEVICE_RECORDINGDEVICE2, iIndex) ||
+      TryLogicalAddress(CECDEVICE_RECORDINGDEVICE3, iIndex);
 }
 
 bool CCECProcessor::FindLogicalAddressTuner(unsigned int iIndex)
 {
   AddLog(CEC_LOG_DEBUG, "detecting logical address for type 'tuner'");
-  return TryLogicalAddress(CECDEVICE_TUNER1, "tuner 1", iIndex) ||
-      TryLogicalAddress(CECDEVICE_TUNER2, "tuner 2", iIndex) ||
-      TryLogicalAddress(CECDEVICE_TUNER3, "tuner 3", iIndex) ||
-      TryLogicalAddress(CECDEVICE_TUNER4, "tuner 4", iIndex);
+  return TryLogicalAddress(CECDEVICE_TUNER1, iIndex) ||
+      TryLogicalAddress(CECDEVICE_TUNER2, iIndex) ||
+      TryLogicalAddress(CECDEVICE_TUNER3, iIndex) ||
+      TryLogicalAddress(CECDEVICE_TUNER4, iIndex);
 }
 
 bool CCECProcessor::FindLogicalAddressPlaybackDevice(unsigned int iIndex)
 {
   AddLog(CEC_LOG_DEBUG, "detecting logical address for type 'playback device'");
-  return TryLogicalAddress(CECDEVICE_PLAYBACKDEVICE1, "playback 1", iIndex) ||
-      TryLogicalAddress(CECDEVICE_PLAYBACKDEVICE2, "playback 2", iIndex) ||
-      TryLogicalAddress(CECDEVICE_PLAYBACKDEVICE3, "playback 3", iIndex);
+  return TryLogicalAddress(CECDEVICE_PLAYBACKDEVICE1, iIndex) ||
+      TryLogicalAddress(CECDEVICE_PLAYBACKDEVICE2, iIndex) ||
+      TryLogicalAddress(CECDEVICE_PLAYBACKDEVICE3, iIndex);
 }
 
 bool CCECProcessor::FindLogicalAddressAudioSystem(unsigned int iIndex)
 {
   AddLog(CEC_LOG_DEBUG, "detecting logical address for type 'audio'");
-  return TryLogicalAddress(CECDEVICE_AUDIOSYSTEM, "audio", iIndex);
+  return TryLogicalAddress(CECDEVICE_AUDIOSYSTEM, iIndex);
 }
 
 bool CCECProcessor::FindLogicalAddresses(void)
@@ -266,7 +269,7 @@ void *CCECProcessor::Process(void)
       else if (m_communication->IsOpen() && m_communication->Read(msg, 50))
       {
         m_controller->AddLog(msg.is_error() ? CEC_LOG_WARNING : CEC_LOG_DEBUG, msg.ToString());
-        if ((bParseFrame = (ParseMessage(msg) && !IsStopped())))
+        if ((bParseFrame = (ParseMessage(msg) && !IsStopped())) == true)
           command = m_currentframe;
       }
     }
@@ -288,14 +291,84 @@ void *CCECProcessor::Process(void)
   return NULL;
 }
 
-bool CCECProcessor::SetActiveView(void)
+bool CCECProcessor::SetActiveSource(cec_device_type type /* = CEC_DEVICE_TYPE_RESERVED */)
 {
+  bool bReturn(false);
+
   if (!IsRunning())
-    return false;
+    return bReturn;
 
-  if (!m_logicalAddresses.empty() && m_busDevices[m_logicalAddresses.primary])
-    return m_busDevices[m_logicalAddresses.primary]->TransmitActiveView();
-  return false;
+  cec_logical_address addr = m_logicalAddresses.primary;
+
+  if (type != CEC_DEVICE_TYPE_RESERVED)
+  {
+    for (uint8_t iPtr = 0; iPtr < 16; iPtr++)
+    {
+      if (m_logicalAddresses[iPtr] && m_busDevices[iPtr]->m_type == type)
+      {
+        addr = (cec_logical_address) iPtr;
+        break;
+      }
+    }
+  }
+
+  return SetStreamPath(m_busDevices[addr]->GetPhysicalAddress());
+}
+
+bool CCECProcessor::SetActiveView(void)
+{
+  return SetActiveSource();
+}
+
+bool CCECProcessor::SetDeckControlMode(cec_deck_control_mode mode, bool bSendUpdate /* = true */)
+{
+  bool bReturn(false);
+
+  CCECBusDevice *device = GetDeviceByType(CEC_DEVICE_TYPE_PLAYBACK_DEVICE);
+  if (device)
+  {
+    ((CCECPlaybackDevice *) device)->SetDeckControlMode(mode);
+    if (bSendUpdate)
+      ((CCECPlaybackDevice *) device)->TransmitDeckStatus(CECDEVICE_TV);
+    bReturn = true;
+  }
+
+  return bReturn;
+}
+
+bool CCECProcessor::SetDeckInfo(cec_deck_info info, bool bSendUpdate /* = true */)
+{
+  bool bReturn(false);
+
+  CCECBusDevice *device = GetDeviceByType(CEC_DEVICE_TYPE_PLAYBACK_DEVICE);
+  if (device)
+  {
+    ((CCECPlaybackDevice *) device)->SetDeckStatus(info);
+    if (bSendUpdate)
+      ((CCECPlaybackDevice *) device)->TransmitDeckStatus(CECDEVICE_TV);
+    bReturn = true;
+  }
+
+  return bReturn;
+}
+
+bool CCECProcessor::SetStreamPath(uint16_t iStreamPath)
+{
+  bool bReturn(false);
+
+  CCECBusDevice *device = GetDeviceByPhysicalAddress(iStreamPath);
+  if (device)
+  {
+    for (unsigned int iPtr = 0; iPtr < 16; iPtr++)
+      m_busDevices[iPtr]->m_bActiveSource = false;
+
+    device->m_bActiveSource = true;
+    device->m_powerStatus   = CEC_POWER_STATUS_ON;
+
+    bReturn = true;
+  }
+
+  return bReturn;
 }
 
 bool CCECProcessor::SetInactiveView(void)
@@ -335,12 +408,26 @@ bool CCECProcessor::SetLogicalAddress(cec_logical_address iLogicalAddress)
   return true;
 }
 
+bool CCECProcessor::SetMenuState(cec_menu_state state, bool bSendUpdate /* = true */)
+{
+  for (uint8_t iPtr = 0; iPtr < 16; iPtr++)
+  {
+    if (m_logicalAddresses[iPtr])
+      m_busDevices[iPtr]->SetMenuState(state);
+  }
+
+  if (bSendUpdate)
+    m_busDevices[m_logicalAddresses.primary]->TransmitMenuState(CECDEVICE_TV);
+
+  return true;
+}
+
 bool CCECProcessor::SetPhysicalAddress(uint16_t iPhysicalAddress)
 {
   if (!m_logicalAddresses.empty() && m_busDevices[m_logicalAddresses.primary])
   {
     m_busDevices[m_logicalAddresses.primary]->SetPhysicalAddress(iPhysicalAddress);
-    return m_busDevices[m_logicalAddresses.primary]->TransmitActiveView();
+    return SetActiveView();
   }
   return false;
 }
@@ -365,6 +452,38 @@ bool CCECProcessor::PollDevice(cec_logical_address iAddress)
   return false;
 }
 
+CCECBusDevice *CCECProcessor::GetDeviceByPhysicalAddress(uint16_t iPhysicalAddress) const
+{
+  CCECBusDevice *device = NULL;
+
+  for (unsigned int iPtr = 0; iPtr < 16; iPtr++)
+  {
+    if (m_busDevices[iPtr]->GetPhysicalAddress() == iPhysicalAddress)
+    {
+      device = m_busDevices[iPtr];
+      break;
+    }
+  }
+
+  return device;
+}
+
+CCECBusDevice *CCECProcessor::GetDeviceByType(cec_device_type type) const
+{
+  CCECBusDevice *device = NULL;
+
+  for (unsigned int iPtr = 0; iPtr < 16; iPtr++)
+  {
+    if (m_busDevices[iPtr]->m_type == type)
+    {
+      device = m_busDevices[iPtr];
+      break;
+    }
+  }
+
+  return device;
+}
+
 cec_version CCECProcessor::GetDeviceCecVersion(cec_logical_address iAddress)
 {
   return m_busDevices[iAddress]->GetCecVersion();
@@ -436,7 +555,7 @@ bool CCECProcessor::Transmit(CCECAdapterMessage *output)
   return bReturn;
 }
 
-void CCECProcessor::TransmitAbort(cec_logical_address address, cec_opcode opcode, ECecAbortReason reason /* = CEC_ABORT_REASON_UNRECOGNIZED_OPCODE */)
+void CCECProcessor::TransmitAbort(cec_logical_address address, cec_opcode opcode, cec_abort_reason reason /* = CEC_ABORT_REASON_UNRECOGNIZED_OPCODE */)
 {
   m_controller->AddLog(CEC_LOG_DEBUG, "<< transmitting abort message");