#include "AdapterCommunication.h"
#include "devices/CECBusDevice.h"
+#include "devices/CECAudioSystem.h"
+#include "devices/CECPlaybackDevice.h"
+#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"
m_controller(controller),
m_bMonitor(false)
{
- m_logicalAddresses.clear();
- m_logicalAddresses.set(iLogicalAddress);
- m_types.clear();
- for (int iPtr = 0; iPtr < 16; iPtr++)
+ m_logicalAddresses.Clear();
+ m_logicalAddresses.Set(iLogicalAddress);
+ m_types.Clear();
+ for (int iPtr = 0; iPtr <= 16; iPtr++)
m_busDevices[iPtr] = new CCECBusDevice(this, (cec_logical_address) iPtr, iPtr == iLogicalAddress ? iPhysicalAddress : 0);
}
m_controller(controller),
m_bMonitor(false)
{
- m_logicalAddresses.clear();
+ m_logicalAddresses.Clear();
for (int iPtr = 0; iPtr < 16; iPtr++)
- m_busDevices[iPtr] = new CCECBusDevice(this, (cec_logical_address) iPtr, 0);
+ {
+ switch(iPtr)
+ {
+ case CECDEVICE_AUDIOSYSTEM:
+ m_busDevices[iPtr] = new CCECAudioSystem(this, (cec_logical_address) iPtr, 0xFFFF);
+ break;
+ case CECDEVICE_PLAYBACKDEVICE1:
+ case CECDEVICE_PLAYBACKDEVICE2:
+ case CECDEVICE_PLAYBACKDEVICE3:
+ m_busDevices[iPtr] = new CCECPlaybackDevice(this, (cec_logical_address) iPtr, 0xFFFF);
+ break;
+ case CECDEVICE_RECORDINGDEVICE1:
+ case CECDEVICE_RECORDINGDEVICE2:
+ case CECDEVICE_RECORDINGDEVICE3:
+ m_busDevices[iPtr] = new CCECRecordingDevice(this, (cec_logical_address) iPtr, 0xFFFF);
+ break;
+ case CECDEVICE_TUNER1:
+ case CECDEVICE_TUNER2:
+ case CECDEVICE_TUNER3:
+ case CECDEVICE_TUNER4:
+ m_busDevices[iPtr] = new CCECTuner(this, (cec_logical_address) iPtr, 0xFFFF);
+ break;
+ case CECDEVICE_TV:
+ m_busDevices[iPtr] = new CCECTV(this, (cec_logical_address) iPtr, 0);
+ break;
+ default:
+ m_busDevices[iPtr] = new CCECBusDevice(this, (cec_logical_address) iPtr, 0xFFFF);
+ break;
+ }
+ }
}
CCECProcessor::~CCECProcessor(void)
return false;
}
-bool CCECProcessor::TryLogicalAddress(cec_logical_address address, const char *strLabel)
+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);
SetAckMask(0x1 << address);
- if (!m_busDevices[address]->PollDevice(address))
+ if (!m_busDevices[address]->TransmitPoll(address))
{
strLog.Format("using logical address '%s'", strLabel);
AddLog(CEC_LOG_NOTICE, strLog);
- /* only set our OSD name for the primary device */
- if (m_logicalAddresses.empty())
+ /* only set our OSD name and active source for the primary device */
+ if (m_logicalAddresses.IsEmpty())
+ {
m_busDevices[address]->m_strDeviceName = m_strDeviceName;
- m_logicalAddresses.set(address);
+ m_busDevices[address]->m_bActiveSource = true;
+ }
+ 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);
+ m_busDevices[address]->SetPhysicalAddress((uint16_t)CEC_DEFAULT_PHYSICAL_ADDRESS + ((uint16_t)iIndex * 0x100));
return true;
}
return false;
}
-bool CCECProcessor::FindLogicalAddressRecordingDevice(void)
+bool CCECProcessor::FindLogicalAddressRecordingDevice(unsigned int iIndex)
{
AddLog(CEC_LOG_DEBUG, "detecting logical address for type 'recording device'");
- return TryLogicalAddress(CECDEVICE_RECORDINGDEVICE1, "recording 1") ||
- TryLogicalAddress(CECDEVICE_RECORDINGDEVICE2, "recording 2") ||
- TryLogicalAddress(CECDEVICE_RECORDINGDEVICE3, "recording 3");
+ return TryLogicalAddress(CECDEVICE_RECORDINGDEVICE1, iIndex) ||
+ TryLogicalAddress(CECDEVICE_RECORDINGDEVICE2, iIndex) ||
+ TryLogicalAddress(CECDEVICE_RECORDINGDEVICE3, iIndex);
}
-bool CCECProcessor::FindLogicalAddressTuner(void)
+bool CCECProcessor::FindLogicalAddressTuner(unsigned int iIndex)
{
AddLog(CEC_LOG_DEBUG, "detecting logical address for type 'tuner'");
- return TryLogicalAddress(CECDEVICE_TUNER1, "tuner 1") ||
- TryLogicalAddress(CECDEVICE_TUNER2, "tuner 2") ||
- TryLogicalAddress(CECDEVICE_TUNER3, "tuner 3") ||
- TryLogicalAddress(CECDEVICE_TUNER4, "tuner 4");
+ return TryLogicalAddress(CECDEVICE_TUNER1, iIndex) ||
+ TryLogicalAddress(CECDEVICE_TUNER2, iIndex) ||
+ TryLogicalAddress(CECDEVICE_TUNER3, iIndex) ||
+ TryLogicalAddress(CECDEVICE_TUNER4, iIndex);
}
-bool CCECProcessor::FindLogicalAddressPlaybackDevice(void)
+bool CCECProcessor::FindLogicalAddressPlaybackDevice(unsigned int iIndex)
{
AddLog(CEC_LOG_DEBUG, "detecting logical address for type 'playback device'");
- return TryLogicalAddress(CECDEVICE_PLAYBACKDEVICE1, "playback 1") ||
- TryLogicalAddress(CECDEVICE_PLAYBACKDEVICE2, "playback 2") ||
- TryLogicalAddress(CECDEVICE_PLAYBACKDEVICE3, "playback 3");
+ return TryLogicalAddress(CECDEVICE_PLAYBACKDEVICE1, iIndex) ||
+ TryLogicalAddress(CECDEVICE_PLAYBACKDEVICE2, iIndex) ||
+ TryLogicalAddress(CECDEVICE_PLAYBACKDEVICE3, iIndex);
}
-bool CCECProcessor::FindLogicalAddressAudioSystem(void)
+bool CCECProcessor::FindLogicalAddressAudioSystem(unsigned int iIndex)
{
AddLog(CEC_LOG_DEBUG, "detecting logical address for type 'audio'");
- return TryLogicalAddress(CECDEVICE_AUDIOSYSTEM, "audio");
+ return TryLogicalAddress(CECDEVICE_AUDIOSYSTEM, iIndex);
}
bool CCECProcessor::FindLogicalAddresses(void)
{
bool bReturn(true);
- m_logicalAddresses.clear();
+ m_logicalAddresses.Clear();
CStdString strLog;
for (unsigned int iPtr = 0; iPtr < 5; iPtr++)
AddLog(CEC_LOG_DEBUG, strLog);
if (m_types.types[iPtr] == CEC_DEVICE_TYPE_RECORDING_DEVICE)
- bReturn &= FindLogicalAddressRecordingDevice();
+ bReturn &= FindLogicalAddressRecordingDevice(iPtr);
if (m_types.types[iPtr] == CEC_DEVICE_TYPE_TUNER)
- bReturn &= FindLogicalAddressTuner();
+ bReturn &= FindLogicalAddressTuner(iPtr);
if (m_types.types[iPtr] == CEC_DEVICE_TYPE_PLAYBACK_DEVICE)
- bReturn &= FindLogicalAddressPlaybackDevice();
+ bReturn &= FindLogicalAddressPlaybackDevice(iPtr);
if (m_types.types[iPtr] == CEC_DEVICE_TYPE_AUDIO_SYSTEM)
- bReturn &= FindLogicalAddressAudioSystem();
+ bReturn &= FindLogicalAddressAudioSystem(iPtr);
}
return bReturn;
void *CCECProcessor::Process(void)
{
+ bool bParseFrame(false);
cec_command command;
CCECAdapterMessage msg;
{
- if (m_logicalAddresses.empty() && !FindLogicalAddresses())
+ if (m_logicalAddresses.IsEmpty() && !FindLogicalAddresses())
{
CLockObject lock(&m_mutex);
m_controller->AddLog(CEC_LOG_ERROR, "could not detect our logical addressed");
return NULL;
}
- SetAckMask(m_logicalAddresses.ackmask());
+ SetAckMask(m_logicalAddresses.AckMask());
{
CLockObject lock(&m_mutex);
while (!IsStopped())
{
- bool bParseFrame(false);
- command.clear();
+ command.Clear();
msg.clear();
{
CLockObject lock(&m_mutex);
- if (m_communication->IsOpen() && m_communication->Read(msg, 50))
+ if (m_commandBuffer.Pop(command))
+ {
+ bParseFrame = true;
+ }
+ else if (m_communication->IsOpen() && m_communication->Read(msg, 50))
{
m_controller->AddLog(msg.is_error() ? CEC_LOG_WARNING : CEC_LOG_DEBUG, msg.ToString());
- bParseFrame = ParseMessage(msg) && !IsStopped();
+ if ((bParseFrame = (ParseMessage(msg) && !IsStopped())) == true)
+ command = m_currentframe;
}
-
- if (bParseFrame)
- command = m_currentframe;
}
if (bParseFrame)
ParseCommand(command);
+ bParseFrame = false;
Sleep(5);
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]->BroadcastActiveView();
- 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)
if (!IsRunning())
return false;
- if (!m_logicalAddresses.empty() && m_busDevices[m_logicalAddresses.primary])
- return m_busDevices[m_logicalAddresses.primary]->BroadcastInactiveView();
+ if (!m_logicalAddresses.IsEmpty() && m_busDevices[m_logicalAddresses.primary])
+ return m_busDevices[m_logicalAddresses.primary]->TransmitInactiveView();
return false;
}
strLog.Format("<< setting primary logical address to %1x", iLogicalAddress);
m_controller->AddLog(CEC_LOG_NOTICE, strLog.c_str());
m_logicalAddresses.primary = iLogicalAddress;
- m_logicalAddresses.set(iLogicalAddress);
- return SetAckMask(m_logicalAddresses.ackmask());
+ m_logicalAddresses.Set(iLogicalAddress);
+ return SetAckMask(m_logicalAddresses.AckMask());
}
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])
+ if (!m_logicalAddresses.IsEmpty() && m_busDevices[m_logicalAddresses.primary])
{
m_busDevices[m_logicalAddresses.primary]->SetPhysicalAddress(iPhysicalAddress);
- return m_busDevices[m_logicalAddresses.primary]->BroadcastActiveView();
+ return SetActiveView();
}
return false;
}
if (bEnable)
return SetAckMask(0);
else
- return SetAckMask(m_logicalAddresses.ackmask());
+ return SetAckMask(m_logicalAddresses.AckMask());
}
bool CCECProcessor::PollDevice(cec_logical_address iAddress)
{
if (iAddress != CECDEVICE_UNKNOWN && m_busDevices[iAddress])
- return m_busDevices[iAddress]->PollDevice();
+ return m_busDevices[m_logicalAddresses.primary]->TransmitPoll(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();
if (output->transmit_timeout > 0)
{
if ((bReturn = WaitForTransmitSucceeded(output->size(), output->transmit_timeout)) == false)
- m_controller->AddLog(CEC_LOG_ERROR, "did not receive ack");
+ m_controller->AddLog(CEC_LOG_DEBUG, "did not receive ack");
}
else
bReturn = true;
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");
cec_command command;
// TODO
- cec_command::format(command, m_logicalAddresses.primary, address, CEC_OPCODE_FEATURE_ABORT);
- command.parameters.push_back((uint8_t)opcode);
- command.parameters.push_back((uint8_t)reason);
+ cec_command::Format(command, m_logicalAddresses.primary, address, CEC_OPCODE_FEATURE_ABORT);
+ command.parameters.PushBack((uint8_t)opcode);
+ command.parameters.PushBack((uint8_t)reason);
Transmit(command);
}
bError = !bTransmitSucceeded;
break;
default:
- ParseMessage(msg);
+ if (ParseMessage(msg))
+ m_commandBuffer.Push(m_currentframe);
}
iNow = GetTimeMs();
{
case MSGCODE_FRAME_START:
{
- m_currentframe.clear();
+ m_currentframe.Clear();
if (msg.size() >= 2)
{
m_currentframe.initiator = msg.initiator();
{
if (msg.size() >= 2)
{
- m_currentframe.push_back(msg[1]);
+ m_currentframe.PushBack(msg[1]);
m_currentframe.eom = msg.eom();
}
bEom = msg.eom();
dataStr.AppendFormat(":%02x", (unsigned int)command.parameters[iPtr]);
m_controller->AddLog(CEC_LOG_TRAFFIC, dataStr.c_str());
- if (!m_bMonitor)
+ if (!m_bMonitor && command.initiator >= CECDEVICE_TV && command.initiator <= CECDEVICE_BROADCAST)
m_busDevices[(uint8_t)command.initiator]->HandleCommand(command);
}
uint16_t CCECProcessor::GetPhysicalAddress(void) const
{
- if (!m_logicalAddresses.empty() && m_busDevices[m_logicalAddresses.primary])
+ if (!m_logicalAddresses.IsEmpty() && m_busDevices[m_logicalAddresses.primary])
return m_busDevices[m_logicalAddresses.primary]->GetPhysicalAddress();
return false;
}
repositories / deb_libcec.git / blobdiff