cec: don't send deck status updates when sending an active source message for samsung
[deb_libcec.git] / src / lib / implementations / CECCommandHandler.cpp
index d2c6020dd12361f97f3352c4b668202432acfefb..9f442be160d6ebf52711cc507c15e932dbb791f7 100644 (file)
 #include "CECCommandHandler.h"
 #include "../devices/CECBusDevice.h"
 #include "../devices/CECAudioSystem.h"
+#include "../devices/CECPlaybackDevice.h"
 #include "../CECProcessor.h"
 
 using namespace CEC;
+using namespace std;
+
+CCECCommandHandler::CCECCommandHandler(CCECBusDevice *busDevice) :
+    m_busDevice(busDevice),
+    m_processor(m_busDevice->GetProcessor()),
+    m_iTransmitTimeout(CEC_DEFAULT_TRANSMIT_TIMEOUT),
+    m_iTransmitWait(CEC_DEFAULT_TRANSMIT_WAIT),
+    m_iTransmitRetries(CEC_DEFAULT_TRANSMIT_RETRIES),
+    m_bHandlerInited(false),
+    m_iUseCounter(0),
+    m_expectedResponse(CEC_OPCODE_NONE),
+    m_bOPTSendDeckStatusUpdateOnActiveSource(true),
+    m_vendorId(CEC_VENDOR_UNKNOWN)
+{
+}
 
-CCECCommandHandler::CCECCommandHandler(CCECBusDevice *busDevice)
+CCECCommandHandler::~CCECCommandHandler(void)
 {
-  m_busDevice = busDevice;
+  CLockObject lock(&m_processor->m_transmitMutex);
+  CLockObject receiveLock(&m_receiveMutex);
+  m_condition.Broadcast();
 }
 
 bool CCECCommandHandler::HandleCommand(const cec_command &command)
 {
   bool bHandled(true);
 
-  if (m_busDevice->MyLogicalAddressContains(command.destination))
+  MarkBusy();
+  CStdString strLog;
+  strLog.Format(">> %s (%X) -> %s (%X): %s (%2X)", m_processor->ToString(command.initiator), command.initiator, m_processor->ToString(command.destination), command.destination, m_processor->ToString(command.opcode), command.opcode);
+  m_busDevice->AddLog(CEC_LOG_NOTICE, strLog);
+
+  m_processor->AddCommand(command);
+
+  switch(command.opcode)
   {
-    switch(command.opcode)
-    {
-    case CEC_OPCODE_REPORT_POWER_STATUS:
-      HandleReportPowerStatus(command);
-      break;
-    case CEC_OPCODE_CEC_VERSION:
-      HandleDeviceCecVersion(command);
-      break;
-    case CEC_OPCODE_SET_MENU_LANGUAGE:
-      HandleSetMenuLanguage(command);
-      m_busDevice->GetProcessor()->AddCommand(command);
-      break;
-    case CEC_OPCODE_GIVE_PHYSICAL_ADDRESS:
+  case CEC_OPCODE_REPORT_POWER_STATUS:
+    HandleReportPowerStatus(command);
+    break;
+  case CEC_OPCODE_CEC_VERSION:
+    HandleDeviceCecVersion(command);
+    break;
+  case CEC_OPCODE_SET_MENU_LANGUAGE:
+    HandleSetMenuLanguage(command);
+    break;
+  case CEC_OPCODE_GIVE_PHYSICAL_ADDRESS:
+    if (m_processor->IsInitialised())
       HandleGivePhysicalAddress(command);
-      break;
-    case CEC_OPCODE_GIVE_OSD_NAME:
+    break;
+  case CEC_OPCODE_GIVE_OSD_NAME:
+    if (m_processor->IsInitialised())
       HandleGiveOSDName(command);
-      break;
-    case CEC_OPCODE_GIVE_DEVICE_VENDOR_ID:
+    break;
+  case CEC_OPCODE_GIVE_DEVICE_VENDOR_ID:
+    if (m_processor->IsInitialised())
       HandleGiveDeviceVendorId(command);
-      break;
-    case CEC_OPCODE_DEVICE_VENDOR_ID:
-      HandleDeviceVendorId(command);
-      break;
-    case CEC_OPCODE_VENDOR_COMMAND_WITH_ID:
-      HandleDeviceVendorCommandWithId(command);
-      break;
-    case CEC_OPCODE_GIVE_DECK_STATUS:
+    break;
+  case CEC_OPCODE_DEVICE_VENDOR_ID:
+    HandleDeviceVendorId(command);
+    break;
+  case CEC_OPCODE_VENDOR_COMMAND_WITH_ID:
+    HandleDeviceVendorCommandWithId(command);
+    break;
+  case CEC_OPCODE_GIVE_DECK_STATUS:
+    if (m_processor->IsInitialised())
       HandleGiveDeckStatus(command);
-      break;
-    case CEC_OPCODE_MENU_REQUEST:
+    break;
+  case CEC_OPCODE_DECK_CONTROL:
+    HandleDeckControl(command);
+    break;
+  case CEC_OPCODE_MENU_REQUEST:
+    if (m_processor->IsInitialised())
       HandleMenuRequest(command);
-      break;
-    case CEC_OPCODE_GIVE_DEVICE_POWER_STATUS:
+    break;
+  case CEC_OPCODE_GIVE_DEVICE_POWER_STATUS:
+    if (m_processor->IsInitialised())
       HandleGiveDevicePowerStatus(command);
-      break;
-    case CEC_OPCODE_GET_CEC_VERSION:
+    break;
+  case CEC_OPCODE_GET_CEC_VERSION:
+    if (m_processor->IsInitialised())
       HandleGetCecVersion(command);
-      break;
-    case CEC_OPCODE_USER_CONTROL_PRESSED:
+    break;
+  case CEC_OPCODE_USER_CONTROL_PRESSED:
+    if (m_processor->IsInitialised())
       HandleUserControlPressed(command);
-      break;
-    case CEC_OPCODE_USER_CONTROL_RELEASE:
+    break;
+  case CEC_OPCODE_USER_CONTROL_RELEASE:
+    if (m_processor->IsInitialised())
       HandleUserControlRelease(command);
-      break;
-    case CEC_OPCODE_GIVE_AUDIO_STATUS:
+    break;
+  case CEC_OPCODE_GIVE_AUDIO_STATUS:
+    if (m_processor->IsInitialised())
       HandleGiveAudioStatus(command);
-      break;
-    case CEC_OPCODE_GIVE_SYSTEM_AUDIO_MODE_STATUS:
+    break;
+  case CEC_OPCODE_GIVE_SYSTEM_AUDIO_MODE_STATUS:
+    if (m_processor->IsInitialised())
       HandleGiveSystemAudioModeStatus(command);
-      break;
-    default:
-      UnhandledCommand(command);
-      m_busDevice->GetProcessor()->AddCommand(command);
-      bHandled = false;
-      break;
-    }
-  }
-  else if (command.destination == CECDEVICE_BROADCAST)
-  {
-    CStdString strLog;
-    switch (command.opcode)
-    {
-    case CEC_OPCODE_SET_MENU_LANGUAGE:
-      HandleSetMenuLanguage(command);
-      m_busDevice->GetProcessor()->AddCommand(command);
-      break;
-    case CEC_OPCODE_REQUEST_ACTIVE_SOURCE:
+    break;
+  case CEC_OPCODE_SYSTEM_AUDIO_MODE_REQUEST:
+    if (m_processor->IsInitialised())
+      HandleSystemAudioModeRequest(command);
+    break;
+  case CEC_OPCODE_REPORT_AUDIO_STATUS:
+    HandleReportAudioStatus(command);
+    break;
+  case CEC_OPCODE_SYSTEM_AUDIO_MODE_STATUS:
+    HandleSystemAudioModeStatus(command);
+    break;
+  case CEC_OPCODE_SET_SYSTEM_AUDIO_MODE:
+    HandleSetSystemAudioMode(command);
+    break;
+  case CEC_OPCODE_REQUEST_ACTIVE_SOURCE:
+    if (m_processor->IsInitialised())
       HandleRequestActiveSource(command);
-      break;
-    case CEC_OPCODE_SET_STREAM_PATH:
-      HandleSetStreamPath(command);
-      m_busDevice->GetProcessor()->AddCommand(command);
-      break;
-    case CEC_OPCODE_ROUTING_CHANGE:
-      HandleRoutingChange(command);
-      m_busDevice->GetProcessor()->AddCommand(command);
-      break;
-    case CEC_OPCODE_DEVICE_VENDOR_ID:
-      HandleDeviceVendorId(command);
-      break;
-    case CEC_OPCODE_VENDOR_COMMAND_WITH_ID:
-      HandleDeviceVendorCommandWithId(command);
-     break;
-    default:
-      UnhandledCommand(command);
-      m_busDevice->GetProcessor()->AddCommand(command);
-      bHandled = false;
-      break;
-    }
+    break;
+  case CEC_OPCODE_SET_STREAM_PATH:
+    HandleSetStreamPath(command);
+    break;
+  case CEC_OPCODE_ROUTING_CHANGE:
+    HandleRoutingChange(command);
+    break;
+  case CEC_OPCODE_ROUTING_INFORMATION:
+    HandleRoutingInformation(command);
+    break;
+  case CEC_OPCODE_STANDBY:
+    if (m_processor->IsInitialised())
+      HandleStandby(command);
+    break;
+  case CEC_OPCODE_ACTIVE_SOURCE:
+    HandleActiveSource(command);
+    break;
+  case CEC_OPCODE_REPORT_PHYSICAL_ADDRESS:
+    HandleReportPhysicalAddress(command);
+    break;
+  case CEC_OPCODE_SET_OSD_NAME:
+    HandleSetOSDName(command);
+    break;
+  case CEC_OPCODE_IMAGE_VIEW_ON:
+    HandleImageViewOn(command);
+    break;
+  case CEC_OPCODE_TEXT_VIEW_ON:
+    HandleTextViewOn(command);
+    break;
+  case CEC_OPCODE_FEATURE_ABORT:
+    HandleFeatureAbort(command);
+    break;
+  case CEC_OPCODE_VENDOR_COMMAND:
+    HandleVendorCommand(command);
+    break;
+  default:
+    UnhandledCommand(command);
+    bHandled = false;
+    break;
   }
-  else
+
+  if (bHandled)
   {
-    CStdString strLog;
-    strLog.Format("ignoring frame: we're not at destination %x", command.destination);
-    m_busDevice->AddLog(CEC_LOG_DEBUG, strLog.c_str());
-    bHandled = false;
+    CLockObject lock(&m_receiveMutex);
+    if (m_expectedResponse == CEC_OPCODE_NONE ||
+        m_expectedResponse == command.opcode)
+      m_condition.Signal();
   }
 
+  MarkReady();
   return bHandled;
 }
 
+bool CCECCommandHandler::HandleActiveSource(const cec_command &command)
+{
+  if (command.parameters.size == 2)
+  {
+    uint16_t iAddress = ((uint16_t)command.parameters[0] << 8) | ((uint16_t)command.parameters[1]);
+    return m_processor->SetActiveSource(iAddress);
+  }
+
+  return true;
+}
+
+bool CCECCommandHandler::HandleDeckControl(const cec_command &command)
+{
+  CCECBusDevice *device = GetDevice(command.destination);
+  if (device && (device->GetType() == CEC_DEVICE_TYPE_PLAYBACK_DEVICE || device->GetType() == CEC_DEVICE_TYPE_RECORDING_DEVICE) && command.parameters.size > 0)
+  {
+    ((CCECPlaybackDevice *) device)->SetDeckControlMode((cec_deck_control_mode) command.parameters[0]);
+    return true;
+  }
+
+  return false;
+}
+
 bool CCECCommandHandler::HandleDeviceCecVersion(const cec_command &command)
 {
   if (command.parameters.size == 1)
@@ -164,96 +241,171 @@ bool CCECCommandHandler::HandleDeviceCecVersion(const cec_command &command)
 
 bool CCECCommandHandler::HandleDeviceVendorCommandWithId(const cec_command &command)
 {
-  CCECBusDevice *device = GetDevice(command.initiator);
-  if (device)
-    device->SetVendorId(command.parameters);
+  if (m_processor->IsStarted() && m_busDevice->MyLogicalAddressContains(command.destination))
+    m_processor->TransmitAbort(command.initiator, command.opcode, CEC_ABORT_REASON_REFUSED);
 
   return true;
 }
 
 bool CCECCommandHandler::HandleDeviceVendorId(const cec_command &command)
 {
-  CCECBusDevice *device = GetDevice(command.initiator);
-  if (device)
-    device->SetVendorId(command.parameters);
+  return SetVendorId(command);
+}
 
+bool CCECCommandHandler::HandleFeatureAbort(const cec_command &command)
+{
+  if (command.parameters.size == 2)
+  {
+    m_processor->m_busDevices[command.initiator]->SetUnsupportedFeature((cec_opcode)command.parameters[0]);
+  }
   return true;
 }
 
 bool CCECCommandHandler::HandleGetCecVersion(const cec_command &command)
 {
-  CCECBusDevice *device = GetDevice(command.destination);
-  if (device)
-    return device->TransmitCECVersion(command.initiator);
+  if (m_processor->IsStarted() && m_busDevice->MyLogicalAddressContains(command.destination))
+  {
+    CCECBusDevice *device = GetDevice(command.destination);
+    if (device)
+      return device->TransmitCECVersion(command.initiator);
+  }
 
   return false;
 }
 
 bool CCECCommandHandler::HandleGiveAudioStatus(const cec_command &command)
 {
-  CCECBusDevice *device = GetDevice(command.destination);
-  if (device && device->GetType() == CEC_DEVICE_TYPE_AUDIO_SYSTEM)
-    return ((CCECAudioSystem *) device)->TransmitAudioStatus(command.initiator);
+  if (m_processor->IsStarted() && m_busDevice->MyLogicalAddressContains(command.destination))
+  {
+    CCECBusDevice *device = GetDevice(command.destination);
+    if (device && device->GetType() == CEC_DEVICE_TYPE_AUDIO_SYSTEM)
+      return ((CCECAudioSystem *) device)->TransmitAudioStatus(command.initiator);
+  }
 
   return false;
 }
 
 bool CCECCommandHandler::HandleGiveDeckStatus(const cec_command &command)
 {
-  CCECBusDevice *device = GetDevice(command.destination);
-  if (device)
-    return device->TransmitDeckStatus(command.initiator);
+  if (m_processor->IsStarted() && m_busDevice->MyLogicalAddressContains(command.destination))
+  {
+    CCECBusDevice *device = GetDevice(command.destination);
+    if (device && (device->GetType() == CEC_DEVICE_TYPE_PLAYBACK_DEVICE || device->GetType() == CEC_DEVICE_TYPE_RECORDING_DEVICE))
+      return ((CCECPlaybackDevice *) device)->TransmitDeckStatus(command.initiator);
+  }
 
   return false;
 }
 
 bool CCECCommandHandler::HandleGiveDevicePowerStatus(const cec_command &command)
 {
-  CCECBusDevice *device = GetDevice(command.destination);
-  if (device)
-    return device->TransmitPowerState(command.initiator);
+  if (m_processor->IsStarted() && m_busDevice->MyLogicalAddressContains(command.destination))
+  {
+    CCECBusDevice *device = GetDevice(command.destination);
+    if (device)
+      return device->TransmitPowerState(command.initiator);
+  }
 
   return false;
 }
 
 bool CCECCommandHandler::HandleGiveDeviceVendorId(const cec_command &command)
 {
-  CCECBusDevice *device = GetDevice(command.destination);
-  if (device)
-    return device->TransmitVendorID(command.initiator);
+  if (m_processor->IsStarted() && m_busDevice->MyLogicalAddressContains(command.destination))
+  {
+    CCECBusDevice *device = GetDevice(command.destination);
+    if (device)
+      return device->TransmitVendorID(command.initiator);
+  }
 
   return false;
 }
 
 bool CCECCommandHandler::HandleGiveOSDName(const cec_command &command)
 {
-  CCECBusDevice *device = GetDevice(command.destination);
-  if (device)
-    return device->TransmitOSDName(command.initiator);
+  if (m_processor->IsStarted() && m_busDevice->MyLogicalAddressContains(command.destination))
+  {
+    CCECBusDevice *device = GetDevice(command.destination);
+    if (device)
+      return device->TransmitOSDName(command.initiator);
+  }
 
   return false;
 }
 
 bool CCECCommandHandler::HandleGivePhysicalAddress(const cec_command &command)
 {
-  CCECBusDevice *device = GetDevice(command.destination);
-  if (device)
-    return device->TransmitPhysicalAddress();
+  if (m_processor->IsStarted() && m_busDevice->MyLogicalAddressContains(command.destination))
+  {
+    CCECBusDevice *device = GetDevice(command.destination);
+    if (device)
+    {
+      device->SetActiveSource();
+      return device->TransmitPhysicalAddress() &&
+          device->TransmitActiveSource();
+    }
+  }
 
   return false;
 }
 
-bool CCECCommandHandler::HandleMenuRequest(const cec_command &command)
+bool CCECCommandHandler::HandleGiveSystemAudioModeStatus(const cec_command &command)
 {
-  if (command.parameters[0] == CEC_MENU_REQUEST_TYPE_QUERY)
+  if (m_processor->IsStarted() && m_busDevice->MyLogicalAddressContains(command.destination))
   {
     CCECBusDevice *device = GetDevice(command.destination);
-    if (device)
-      return device->TransmitMenuState(command.initiator);
+    if (device && device->GetType() == CEC_DEVICE_TYPE_AUDIO_SYSTEM)
+      return ((CCECAudioSystem *) device)->TransmitSystemAudioModeStatus(command.initiator);
   }
+
   return false;
 }
 
+bool CCECCommandHandler::HandleImageViewOn(const cec_command &command)
+{
+  m_processor->m_busDevices[command.initiator]->SetActiveSource();
+  return true;
+}
+
+bool CCECCommandHandler::HandleMenuRequest(const cec_command &command)
+{
+  if (m_processor->IsStarted() && m_busDevice->MyLogicalAddressContains(command.destination))
+  {
+    if (command.parameters[0] == CEC_MENU_REQUEST_TYPE_QUERY)
+    {
+      CCECBusDevice *device = GetDevice(command.destination);
+      if (device)
+        return device->TransmitMenuState(command.initiator);
+    }
+  }
+
+  return false;
+}
+
+bool CCECCommandHandler::HandleReportAudioStatus(const cec_command &command)
+{
+  if (command.parameters.size == 1)
+  {
+    CCECBusDevice *device = GetDevice(command.initiator);
+    if (device && device->GetType() == CEC_DEVICE_TYPE_AUDIO_SYSTEM)
+    {
+      ((CCECAudioSystem *)device)->SetAudioStatus(command.parameters[0]);
+      return true;
+    }
+  }
+  return false;
+}
+
+bool CCECCommandHandler::HandleReportPhysicalAddress(const cec_command &command)
+{
+  if (command.parameters.size == 3)
+  {
+    uint16_t iNewAddress = ((uint16_t)command.parameters[0] << 8) | ((uint16_t)command.parameters[1]);
+    SetPhysicalAddress(command.initiator, iNewAddress);
+  }
+  return true;
+}
+
 bool CCECCommandHandler::HandleReportPowerStatus(const cec_command &command)
 {
   if (command.parameters.size == 1)
@@ -267,12 +419,18 @@ bool CCECCommandHandler::HandleReportPowerStatus(const cec_command &command)
 
 bool CCECCommandHandler::HandleRequestActiveSource(const cec_command &command)
 {
-  CStdString strLog;
-  strLog.Format(">> %i requests active source", (uint8_t) command.initiator);
-  m_busDevice->AddLog(CEC_LOG_DEBUG, strLog.c_str());
-  CCECBusDevice *device = m_busDevice->GetProcessor()->m_busDevices[m_busDevice->GetMyLogicalAddress()];
-  if (device)
-    return device->TransmitActiveSource();
+  if (m_processor->IsStarted())
+  {
+    CStdString strLog;
+    strLog.Format(">> %i requests active source", (uint8_t) command.initiator);
+    m_busDevice->AddLog(CEC_LOG_DEBUG, strLog.c_str());
+
+    vector<CCECBusDevice *> devices;
+    for (int iDevicePtr = (int)GetMyDevices(devices)-1; iDevicePtr >=0; iDevicePtr--)
+      devices[iDevicePtr]->TransmitActiveSource();
+
+    return true;
+  }
   return false;
 }
 
@@ -285,11 +443,22 @@ bool CCECCommandHandler::HandleRoutingChange(const cec_command &command)
 
     CCECBusDevice *device = GetDevice(command.initiator);
     if (device)
-      device->SetPhysicalAddress(iNewAddress, iOldAddress);
+      device->SetStreamPath(iNewAddress, iOldAddress);
   }
   return true;
 }
 
+bool CCECCommandHandler::HandleRoutingInformation(const cec_command &command)
+{
+  if (command.parameters.size == 2)
+  {
+    uint16_t iNewAddress = ((uint16_t)command.parameters[0] << 8) | ((uint16_t)command.parameters[1]);
+    m_processor->SetActiveSource(iNewAddress);
+  }
+
+  return false;
+}
+
 bool CCECCommandHandler::HandleSetMenuLanguage(const cec_command &command)
 {
   if (command.parameters.size == 3)
@@ -303,56 +472,170 @@ bool CCECCommandHandler::HandleSetMenuLanguage(const cec_command &command)
         language.language[iPtr] = command.parameters[iPtr];
       language.language[3] = 0;
       device->SetMenuLanguage(language);
+      return true;
     }
   }
-  return true;
+  return false;
+}
+
+bool CCECCommandHandler::HandleSetOSDName(const cec_command &command)
+{
+  if (command.parameters.size > 0)
+  {
+    CCECBusDevice *device = GetDevice(command.initiator);
+    if (device)
+    {
+      char buf[1024];
+      for (uint8_t iPtr = 0; iPtr < command.parameters.size; iPtr++)
+        buf[iPtr] = (char)command.parameters[iPtr];
+      buf[command.parameters.size] = 0;
+
+      CStdString strName(buf);
+      device->SetOSDName(strName);
+
+      return true;
+    }
+  }
+  return false;
 }
 
 bool CCECCommandHandler::HandleSetStreamPath(const cec_command &command)
 {
-  if (command.parameters.size >= 2)
+  if (m_processor->IsStarted() && command.parameters.size >= 2)
   {
-    int streamaddr = ((uint16_t)command.parameters[0] << 8) | ((uint16_t)command.parameters[1]);
+    uint16_t iStreamAddress = ((uint16_t)command.parameters[0] << 8) | ((uint16_t)command.parameters[1]);
     CStdString strLog;
-    strLog.Format(">> %i requests stream path from physical address %04x", command.initiator, streamaddr);
+    strLog.Format(">> %i sets stream path to physical address %04x", command.initiator, iStreamAddress);
     m_busDevice->AddLog(CEC_LOG_DEBUG, strLog.c_str());
-    CCECBusDevice *device = GetDeviceByPhysicalAddress(streamaddr);
-    if (device)
-      return device->TransmitActiveSource();
+
+    /* one of the device handled by libCEC has been made active */
+    CCECBusDevice *device = GetDeviceByPhysicalAddress(iStreamAddress);
+    if (device && m_busDevice->MyLogicalAddressContains(device->GetLogicalAddress()))
+    {
+      device->SetActiveSource();
+      device->TransmitActiveSource();
+    }
   }
+  return false;
+}
+
+bool CCECCommandHandler::HandleSystemAudioModeRequest(const cec_command &command)
+{
+  if (m_processor->IsStarted() && m_busDevice->MyLogicalAddressContains(command.destination))
+  {
+    CCECBusDevice *device = GetDevice(command.destination);
+    if (device && device->GetType() == CEC_DEVICE_TYPE_AUDIO_SYSTEM)
+    {
+      if (command.parameters.size >= 2)
+      {
+        device->SetPowerStatus(CEC_POWER_STATUS_ON);
+        ((CCECAudioSystem *) device)->SetSystemAudioModeStatus(CEC_SYSTEM_AUDIO_STATUS_ON);
+        uint16_t iNewAddress = ((uint16_t)command.parameters[0] << 8) | ((uint16_t)command.parameters[1]);
+        CCECBusDevice *newActiveDevice = GetDeviceByPhysicalAddress(iNewAddress);
+        if (newActiveDevice)
+          newActiveDevice->SetActiveSource();
+        return ((CCECAudioSystem *) device)->TransmitSetSystemAudioMode(command.initiator);
+      }
+      else
+      {
+        ((CCECAudioSystem *) device)->SetSystemAudioModeStatus(CEC_SYSTEM_AUDIO_STATUS_OFF);
+        return ((CCECAudioSystem *) device)->TransmitSetSystemAudioMode(command.initiator);
+      }
+    }
+  }
+  return false;
+}
+
+bool CCECCommandHandler::HandleStandby(const cec_command &command)
+{
+  CCECBusDevice *device = GetDevice(command.initiator);
+  if (device)
+    device->SetPowerStatus(CEC_POWER_STATUS_STANDBY);
+
   return true;
 }
 
-bool CCECCommandHandler::HandleGiveSystemAudioModeStatus(const cec_command &command)
+bool CCECCommandHandler::HandleSystemAudioModeStatus(const cec_command &command)
 {
-  CCECBusDevice *device = GetDevice(command.destination);
-  if (device && device->GetType() == CEC_DEVICE_TYPE_AUDIO_SYSTEM)
-    return ((CCECAudioSystem *) device)->TransmitSystemAudioModeStatus(command.initiator);
+  if (command.parameters.size == 1)
+  {
+    CCECBusDevice *device = GetDevice(command.initiator);
+    if (device && device->GetType() == CEC_DEVICE_TYPE_AUDIO_SYSTEM)
+    {
+      ((CCECAudioSystem *)device)->SetSystemAudioModeStatus((cec_system_audio_status)command.parameters[0]);
+      return true;
+    }
+  }
+
+  return false;
+}
+
+bool CCECCommandHandler::HandleSetSystemAudioMode(const cec_command &command)
+{
+  if (command.parameters.size == 1)
+  {
+    CCECBusDevice *device = GetDevice(command.initiator);
+    if (device && device->GetType() == CEC_DEVICE_TYPE_AUDIO_SYSTEM)
+    {
+      ((CCECAudioSystem *)device)->SetSystemAudioModeStatus((cec_system_audio_status)command.parameters[0]);
+      return true;
+    }
+  }
 
   return false;
 }
 
+bool CCECCommandHandler::HandleTextViewOn(const cec_command &command)
+{
+  m_processor->m_busDevices[command.initiator]->SetActiveSource();
+  return true;
+}
+
 bool CCECCommandHandler::HandleUserControlPressed(const cec_command &command)
 {
-  if (command.parameters.size > 0)
+  if (m_processor->IsStarted() && m_busDevice->MyLogicalAddressContains(command.destination) && command.parameters.size > 0)
   {
-    m_busDevice->GetProcessor()->AddKey();
+    m_processor->AddKey();
 
     if (command.parameters[0] <= CEC_USER_CONTROL_CODE_MAX)
     {
       CStdString strLog;
-      strLog.Format("key pressed: %1x", command.parameters[0]);
+      strLog.Format("key pressed: %x", command.parameters[0]);
       m_busDevice->AddLog(CEC_LOG_DEBUG, strLog.c_str());
 
-      m_busDevice->GetProcessor()->SetCurrentButton((cec_user_control_code) command.parameters[0]);
+      if (command.parameters[0] == CEC_USER_CONTROL_CODE_POWER ||
+          command.parameters[0] == CEC_USER_CONTROL_CODE_POWER_ON_FUNCTION)
+      {
+        CCECBusDevice *device = GetDevice(command.destination);
+        if (device)
+        {
+          device->SetPowerStatus(CEC_POWER_STATUS_ON);
+          if (device->MyLogicalAddressContains(device->GetLogicalAddress()))
+          {
+            device->SetActiveSource();
+            device->TransmitActiveSource();
+
+            if (device->GetType() == CEC_DEVICE_TYPE_PLAYBACK_DEVICE ||
+                device->GetType() == CEC_DEVICE_TYPE_RECORDING_DEVICE)
+              ((CCECPlaybackDevice *)device)->TransmitDeckStatus(command.initiator);
+          }
+        }
+      }
+      else
+      {
+        m_processor->SetCurrentButton((cec_user_control_code) command.parameters[0]);
+      }
+      return true;
     }
   }
-  return true;
+  return false;
 }
 
 bool CCECCommandHandler::HandleUserControlRelease(const cec_command &command)
 {
-  m_busDevice->GetProcessor()->AddKey();
+  if (m_processor->IsStarted() && m_busDevice->MyLogicalAddressContains(command.destination))
+    m_processor->AddKey();
+
   return true;
 }
 
@@ -363,28 +646,372 @@ void CCECCommandHandler::UnhandledCommand(const cec_command &command)
   m_busDevice->AddLog(CEC_LOG_DEBUG, strLog);
 }
 
+unsigned int CCECCommandHandler::GetMyDevices(vector<CCECBusDevice *> &devices) const
+{
+  unsigned int iReturn(0);
+
+  cec_logical_addresses addresses = m_processor->GetLogicalAddresses();
+  for (uint8_t iPtr = 0; iPtr < 16; iPtr++)
+  {
+    if (addresses[iPtr])
+    {
+      devices.push_back(GetDevice((cec_logical_address) iPtr));
+      ++iReturn;
+    }
+  }
+
+  return iReturn;
+}
+
 CCECBusDevice *CCECCommandHandler::GetDevice(cec_logical_address iLogicalAddress) const
 {
   CCECBusDevice *device = NULL;
 
   if (iLogicalAddress >= CECDEVICE_TV && iLogicalAddress <= CECDEVICE_BROADCAST)
-    device = m_busDevice->GetProcessor()->m_busDevices[iLogicalAddress];
+    device = m_processor->m_busDevices[iLogicalAddress];
 
   return device;
 }
 
 CCECBusDevice *CCECCommandHandler::GetDeviceByPhysicalAddress(uint16_t iPhysicalAddress) const
 {
-  CCECBusDevice *device = NULL;
+  return m_processor->GetDeviceByPhysicalAddress(iPhysicalAddress);
+}
+
+CCECBusDevice *CCECCommandHandler::GetDeviceByType(cec_device_type type) const
+{
+  return m_processor->GetDeviceByType(type);
+}
+
+bool CCECCommandHandler::SetVendorId(const cec_command &command)
+{
+  bool bChanged(false);
+  if (command.parameters.size < 3)
+  {
+    m_busDevice->AddLog(CEC_LOG_WARNING, "invalid vendor ID received");
+    return bChanged;
+  }
 
-  for (unsigned int iPtr = 0; iPtr < 16; iPtr++)
+  uint64_t iVendorId = ((uint64_t)command.parameters[0] << 16) +
+                       ((uint64_t)command.parameters[1] << 8) +
+                        (uint64_t)command.parameters[2];
+
+  CCECBusDevice *device = GetDevice((cec_logical_address) command.initiator);
+  if (device)
+    bChanged = device->SetVendorId(iVendorId);
+  return bChanged;
+}
+
+void CCECCommandHandler::SetPhysicalAddress(cec_logical_address iAddress, uint16_t iNewAddress)
+{
+  if (!m_busDevice->MyLogicalAddressContains(iAddress))
   {
-    if (m_busDevice->GetProcessor()->m_busDevices[iPtr]->GetPhysicalAddress() == iPhysicalAddress)
+    bool bOurAddress(m_processor->GetPhysicalAddress() == iNewAddress);
+    GetDevice(iAddress)->SetPhysicalAddress(iNewAddress);
+    if (bOurAddress)
     {
-      device = m_busDevice->GetProcessor()->m_busDevices[iPtr];
-      break;
+      /* another device reported the same physical address as ours
+       * since we don't have physical address detection yet, we'll just use the
+       * given address, increased by 0x100 for now */
+      m_processor->SetPhysicalAddress(iNewAddress + 0x100);
     }
   }
+}
 
-  return device;
+void CCECCommandHandler::HandlePoll(const cec_logical_address iInitiator, const cec_logical_address iDestination)
+{
+  CStdString strLog;
+  strLog.Format("<< POLL: %s (%x) -> %s (%x)", m_processor->ToString(iInitiator), iInitiator, m_processor->ToString(iDestination), iDestination);
+  m_processor->AddLog(CEC_LOG_DEBUG, strLog);
+}
+
+bool CCECCommandHandler::HandleReceiveFailed(void)
+{
+  /* default = error */
+  return true;
+}
+
+bool CCECCommandHandler::TransmitImageViewOn(const cec_logical_address iInitiator, const cec_logical_address iDestination)
+{
+  cec_command command;
+  cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_IMAGE_VIEW_ON);
+
+  return Transmit(command, false);
+}
+
+bool CCECCommandHandler::TransmitStandby(const cec_logical_address iInitiator, const cec_logical_address iDestination)
+{
+  cec_command command;
+  cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_STANDBY);
+
+  return Transmit(command, false);
+}
+
+bool CCECCommandHandler::TransmitRequestCecVersion(const cec_logical_address iInitiator, const cec_logical_address iDestination)
+{
+  cec_command command;
+  cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_GET_CEC_VERSION);
+
+  return Transmit(command, true, CEC_OPCODE_CEC_VERSION);
+}
+
+bool CCECCommandHandler::TransmitRequestMenuLanguage(const cec_logical_address iInitiator, const cec_logical_address iDestination)
+{
+  cec_command command;
+  cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_GET_MENU_LANGUAGE);
+
+  return Transmit(command, true, CEC_OPCODE_SET_MENU_LANGUAGE);
+}
+
+bool CCECCommandHandler::TransmitRequestOSDName(const cec_logical_address iInitiator, const cec_logical_address iDestination)
+{
+  cec_command command;
+  cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_GIVE_OSD_NAME);
+
+  return Transmit(command, true, CEC_OPCODE_SET_OSD_NAME);
+}
+
+bool CCECCommandHandler::TransmitRequestPhysicalAddress(const cec_logical_address iInitiator, const cec_logical_address iDestination)
+{
+  cec_command command;
+  cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_GIVE_PHYSICAL_ADDRESS);
+
+  return Transmit(command, true, CEC_OPCODE_REPORT_PHYSICAL_ADDRESS);
+}
+
+bool CCECCommandHandler::TransmitRequestPowerStatus(const cec_logical_address iInitiator, const cec_logical_address iDestination)
+{
+  cec_command command;
+  cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_GIVE_DEVICE_POWER_STATUS);
+
+  return Transmit(command, true, CEC_OPCODE_REPORT_POWER_STATUS);
+}
+
+bool CCECCommandHandler::TransmitRequestVendorId(const cec_logical_address iInitiator, const cec_logical_address iDestination)
+{
+  cec_command command;
+  cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
+
+  return Transmit(command, true, CEC_OPCODE_DEVICE_VENDOR_ID);
+}
+
+bool CCECCommandHandler::TransmitActiveSource(const cec_logical_address iInitiator, uint16_t iPhysicalAddress)
+{
+  cec_command command;
+  cec_command::Format(command, iInitiator, CECDEVICE_BROADCAST, CEC_OPCODE_ACTIVE_SOURCE);
+  command.parameters.PushBack((uint8_t) ((iPhysicalAddress >> 8) & 0xFF));
+  command.parameters.PushBack((uint8_t) (iPhysicalAddress & 0xFF));
+
+  return Transmit(command, false);
+}
+
+bool CCECCommandHandler::TransmitCECVersion(const cec_logical_address iInitiator, const cec_logical_address iDestination, cec_version cecVersion)
+{
+  cec_command command;
+  cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_CEC_VERSION);
+  command.parameters.PushBack((uint8_t)cecVersion);
+
+  return Transmit(command, false);
+}
+
+bool CCECCommandHandler::TransmitInactiveSource(const cec_logical_address iInitiator, uint16_t iPhysicalAddress)
+{
+  cec_command command;
+  cec_command::Format(command, iInitiator, CECDEVICE_TV, CEC_OPCODE_INACTIVE_SOURCE);
+  command.parameters.PushBack((iPhysicalAddress >> 8) & 0xFF);
+  command.parameters.PushBack(iPhysicalAddress & 0xFF);
+
+  return Transmit(command, false);
+}
+
+bool CCECCommandHandler::TransmitMenuState(const cec_logical_address iInitiator, const cec_logical_address iDestination, cec_menu_state menuState)
+{
+  cec_command command;
+  cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_MENU_STATUS);
+  command.parameters.PushBack((uint8_t)menuState);
+
+  return Transmit(command, false);
+}
+
+bool CCECCommandHandler::TransmitOSDName(const cec_logical_address iInitiator, const cec_logical_address iDestination, CStdString strDeviceName)
+{
+  cec_command command;
+  cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_SET_OSD_NAME);
+  for (unsigned int iPtr = 0; iPtr < strDeviceName.length(); iPtr++)
+    command.parameters.PushBack(strDeviceName.at(iPtr));
+
+  return Transmit(command, false);
+}
+
+bool CCECCommandHandler::TransmitOSDString(const cec_logical_address iInitiator, const cec_logical_address iDestination, cec_display_control duration, const char *strMessage)
+{
+  cec_command command;
+  cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_SET_OSD_STRING);
+  command.parameters.PushBack((uint8_t)duration);
+
+  unsigned int iLen = strlen(strMessage);
+  if (iLen > 13) iLen = 13;
+
+  for (unsigned int iPtr = 0; iPtr < iLen; iPtr++)
+    command.parameters.PushBack(strMessage[iPtr]);
+
+  return Transmit(command, false);
+}
+
+bool CCECCommandHandler::TransmitPhysicalAddress(const cec_logical_address iInitiator, uint16_t iPhysicalAddress, cec_device_type type)
+{
+  cec_command command;
+  cec_command::Format(command, iInitiator, CECDEVICE_BROADCAST, CEC_OPCODE_REPORT_PHYSICAL_ADDRESS);
+  command.parameters.PushBack((uint8_t) ((iPhysicalAddress >> 8) & 0xFF));
+  command.parameters.PushBack((uint8_t) (iPhysicalAddress & 0xFF));
+  command.parameters.PushBack((uint8_t) (type));
+
+  return Transmit(command, false);
+}
+
+bool CCECCommandHandler::TransmitPoll(const cec_logical_address iInitiator, const cec_logical_address iDestination)
+{
+  cec_command command;
+  cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_NONE);
+
+  return Transmit(command, false);
+}
+
+bool CCECCommandHandler::TransmitPowerState(const cec_logical_address iInitiator, const cec_logical_address iDestination, cec_power_status state)
+{
+  cec_command command;
+  cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_REPORT_POWER_STATUS);
+  command.parameters.PushBack((uint8_t) state);
+
+  return Transmit(command, false);
+}
+
+bool CCECCommandHandler::TransmitVendorID(const cec_logical_address iInitiator, uint64_t iVendorId)
+{
+  cec_command command;
+  cec_command::Format(command, iInitiator, CECDEVICE_BROADCAST, CEC_OPCODE_DEVICE_VENDOR_ID);
+
+  command.parameters.PushBack((uint8_t) (((uint64_t)iVendorId >> 16) & 0xFF));
+  command.parameters.PushBack((uint8_t) (((uint64_t)iVendorId >> 8) & 0xFF));
+  command.parameters.PushBack((uint8_t) ((uint64_t)iVendorId & 0xFF));
+
+  return Transmit(command, false);
+}
+
+bool CCECCommandHandler::TransmitAudioStatus(const cec_logical_address iInitiator, const cec_logical_address iDestination, uint8_t state)
+{
+  cec_command command;
+  cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_REPORT_AUDIO_STATUS);
+  command.parameters.PushBack(state);
+
+  return Transmit(command, false);
+}
+
+bool CCECCommandHandler::TransmitSetSystemAudioMode(const cec_logical_address iInitiator, const cec_logical_address iDestination, cec_system_audio_status state)
+{
+  cec_command command;
+  cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_SET_SYSTEM_AUDIO_MODE);
+  command.parameters.PushBack((uint8_t)state);
+
+  return Transmit(command, false);
+}
+
+bool CCECCommandHandler::TransmitSystemAudioModeStatus(const cec_logical_address iInitiator, const cec_logical_address iDestination, cec_system_audio_status state)
+{
+  cec_command command;
+  cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_SYSTEM_AUDIO_MODE_STATUS);
+  command.parameters.PushBack((uint8_t)state);
+
+  return Transmit(command, false);
+}
+
+bool CCECCommandHandler::TransmitDeckStatus(const cec_logical_address iInitiator, const cec_logical_address iDestination, cec_deck_info state)
+{
+  cec_command command;
+  cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_DECK_STATUS);
+  command.PushBack((uint8_t)state);
+
+  return Transmit(command, false);
+}
+
+bool CCECCommandHandler::TransmitKeypress(const cec_logical_address iInitiator, const cec_logical_address iDestination, cec_user_control_code key, bool bWait /* = true */)
+{
+  cec_command command;
+  cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_USER_CONTROL_PRESSED);
+  command.parameters.PushBack((uint8_t)key);
+
+  return Transmit(command, bWait);
+}
+
+bool CCECCommandHandler::TransmitKeyRelease(const cec_logical_address iInitiator, const cec_logical_address iDestination, bool bWait /* = true */)
+{
+  cec_command command;
+  cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_USER_CONTROL_RELEASE);
+
+  return Transmit(command, bWait);
+}
+
+bool CCECCommandHandler::Transmit(cec_command &command, bool bExpectResponse /* = true */, cec_opcode expectedResponse /* = CEC_OPCODE_NONE */)
+{
+  bool bReturn(false);
+  MarkBusy();
+  command.transmit_timeout = m_iTransmitTimeout;
+
+  {
+    uint8_t iTries(0), iMaxTries(command.opcode == CEC_OPCODE_NONE ? 1 : m_iTransmitRetries + 1);
+    CLockObject writeLock(&m_processor->m_transmitMutex);
+    CLockObject receiveLock(&m_receiveMutex);
+    ++m_iUseCounter;
+    while (!bReturn && ++iTries <= iMaxTries)
+    {
+      m_expectedResponse = expectedResponse;
+      if (m_processor->Transmit(command))
+      {
+        m_processor->AddLog(CEC_LOG_DEBUG, "command transmitted");
+        bReturn = bExpectResponse ?
+            m_condition.Wait(&m_receiveMutex, m_iTransmitWait) :
+            true;
+      }
+    }
+    --m_iUseCounter;
+  }
+
+  MarkReady();
+  return bReturn;
+}
+
+bool CCECCommandHandler::ActivateSource(void)
+{
+  if (m_busDevice->GetLogicalAddress() == CECDEVICE_TV)
+  {
+    CCECBusDevice *primary = m_processor->GetPrimaryDevice();
+    primary->SetPowerStatus(CEC_POWER_STATUS_ON);
+    primary->SetMenuState(CEC_MENU_STATE_ACTIVATED);
+
+    if (m_processor->GetPrimaryDevice()->GetPhysicalAddress(false) != 0xffff)
+    {
+      m_processor->SetActiveSource();
+      primary->TransmitMenuState(m_busDevice->GetLogicalAddress());
+      m_bHandlerInited = true;
+    }
+  }
+  return true;
+}
+
+void CCECCommandHandler::MarkBusy(void)
+{
+  CLockObject receiveLock(&m_receiveMutex);
+  ++m_iUseCounter;
+}
+
+bool CCECCommandHandler::MarkReady(void)
+{
+  CLockObject receiveLock(&m_receiveMutex);
+  return m_iUseCounter > 0 ? (--m_iUseCounter == 0) : true;
+}
+
+bool CCECCommandHandler::InUse(void)
+{
+  CLockObject receiveLock(&m_receiveMutex);
+  return m_iUseCounter > 0;
 }