X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FCECProcessor.cpp;h=cc5cd40573215beb827bf3979b42a4206444de0b;hb=994dbaaa5c1f32810f3b4266caf5d6dd72e21718;hp=463e04448ab15aeb03f88e77c28a73bb23d77b05;hpb=1e7afacd7132da69e5ab985a726ad10aaf3e2ca4;p=deb_libcec.git diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp index 463e044..cc5cd40 100644 --- a/src/lib/CECProcessor.cpp +++ b/src/lib/CECProcessor.cpp @@ -55,7 +55,6 @@ CCECProcessor::CCECProcessor(CLibCEC *controller, const char *strDeviceName, cec m_strDeviceName(strDeviceName), m_controller(controller), m_bMonitor(false), - m_busScan(NULL), m_iStandardLineTimeout(3), m_iRetryLineTimeout(3), m_iLastTransmission(0) @@ -150,16 +149,32 @@ bool CCECProcessor::Start(const char *strPort, uint16_t iBaudRate /* = 38400 */, m_controller->AddLog(CEC_LOG_ERROR, "could not create a processor thread"); return false; } - lock.Leave(); + if (m_logicalAddresses.IsEmpty() && !FindLogicalAddresses()) + { + m_controller->AddLog(CEC_LOG_ERROR, "could not detect our logical addresses"); + StopThread(true); + return false; + } + else + { + /* only set our OSD name and active source for the primary device */ + m_busDevices[m_logicalAddresses.primary]->m_strDeviceName = m_strDeviceName; + m_busDevices[m_logicalAddresses.primary]->m_bActiveSource = true; + + SetAckMask(m_logicalAddresses.AckMask()); + } + m_busDevices[CECDEVICE_TV]->GetVendorId(); if (SetHDMIPort(m_iBaseDevice, m_iHDMIPort, true)) { + /* init the default handler */ + if (m_busDevices[CECDEVICE_TV]->GetHandler()->GetVendorId() == CEC_VENDOR_UNKNOWN) + m_busDevices[CECDEVICE_TV]->GetHandler()->InitHandler(); + m_controller->AddLog(CEC_LOG_DEBUG, "processor thread started"); - m_busScan = new CCECBusScan(this); - m_busScan->CreateThread(true); return true; } else @@ -176,12 +191,6 @@ bool CCECProcessor::TryLogicalAddress(cec_logical_address address) { if (m_busDevices[address]->TryLogicalAddress()) { - /* only set our OSD name and active source for the primary device */ - if (m_logicalAddresses.IsEmpty()) - { - m_busDevices[address]->m_strDeviceName = m_strDeviceName; - m_busDevices[address]->m_bActiveSource = true; - } m_logicalAddresses.Set(address); return true; } @@ -253,17 +262,7 @@ void *CCECProcessor::Process(void) cec_command command; CCECAdapterMessage msg; - if (m_logicalAddresses.IsEmpty() && !FindLogicalAddresses()) - { - CLockObject lock(&m_mutex); - m_controller->AddLog(CEC_LOG_ERROR, "could not detect our logical addresses"); - m_startCondition.Signal(); - return NULL; - } - else { - SetAckMask(m_logicalAddresses.AckMask()); - CLockObject lock(&m_mutex); m_bStarted = true; m_controller->AddLog(CEC_LOG_DEBUG, "processor thread started"); @@ -297,13 +296,6 @@ void *CCECProcessor::Process(void) m_controller->CheckKeypressTimeout(); } - if (m_busScan) - { - m_busScan->StopThread(); - delete m_busScan; - m_busScan = NULL; - } - if (m_communication) m_communication->Close(); @@ -331,13 +323,30 @@ bool CCECProcessor::SetActiveSource(cec_device_type type /* = CEC_DEVICE_TYPE_RE } } - bReturn = m_busDevices[addr]->TransmitActiveSource() && - SetStreamPath(m_busDevices[addr]->GetPhysicalAddress(false)); + m_busDevices[addr]->SetActiveSource(); + if (m_busDevices[addr]->GetPhysicalAddress(false) != 0xFFFF) + { + bReturn = m_busDevices[addr]->TransmitActiveSource(); + + if (bReturn && (m_busDevices[addr]->GetType() == CEC_DEVICE_TYPE_PLAYBACK_DEVICE || + m_busDevices[addr]->GetType() == CEC_DEVICE_TYPE_RECORDING_DEVICE)) + { + bReturn = ((CCECPlaybackDevice *)m_busDevices[addr])->TransmitDeckStatus(CECDEVICE_TV); + } + } + + return bReturn; +} + +bool CCECProcessor::SetActiveSource(uint16_t iStreamPath) +{ + bool bReturn(false); - if (bReturn && (m_busDevices[addr]->GetType() == CEC_DEVICE_TYPE_PLAYBACK_DEVICE || - m_busDevices[addr]->GetType() == CEC_DEVICE_TYPE_RECORDING_DEVICE)) + CCECBusDevice *device = GetDeviceByPhysicalAddress(iStreamPath); + if (device) { - bReturn = ((CCECPlaybackDevice *)m_busDevices[addr])->TransmitDeckStatus(CECDEVICE_TV); + device->SetActiveSource(); + bReturn = true; } return bReturn; @@ -460,20 +469,6 @@ bool CCECProcessor::PhysicalAddressInUse(uint16_t iPhysicalAddress) return false; } -bool CCECProcessor::SetStreamPath(uint16_t iStreamPath) -{ - bool bReturn(false); - - CCECBusDevice *device = GetDeviceByPhysicalAddress(iStreamPath); - if (device) - { - device->SetActiveDevice(); - bReturn = true; - } - - return bReturn; -} - bool CCECProcessor::TransmitInactiveSource(void) { if (!IsRunning()) @@ -532,7 +527,7 @@ bool CCECProcessor::SetPhysicalAddress(uint16_t iPhysicalAddress) for (uint8_t iPtr = 0; iPtr < 15; iPtr++) if (m_logicalAddresses[iPtr]) { - m_busDevices[iPtr]->SetInactiveDevice(); + m_busDevices[iPtr]->SetInactiveSource(); m_busDevices[iPtr]->SetPhysicalAddress(iPhysicalAddress); m_busDevices[iPtr]->TransmitPhysicalAddress(); } @@ -550,24 +545,6 @@ bool CCECProcessor::SwitchMonitoring(bool bEnable) { CLockObject lock(&m_mutex); m_bMonitor = bEnable; - - if (!bEnable) - { - if (!m_busScan) - { - m_busScan = new CCECBusScan(this); - m_busScan->CreateThread(true); - } - } - else - { - if (m_busScan) - { - m_busScan->StopThread(); - delete m_busScan; - m_busScan = NULL; - } - } } if (bEnable) @@ -587,29 +564,29 @@ bool CCECProcessor::PollDevice(cec_logical_address iAddress) return false; } -uint8_t CCECProcessor::VolumeUp(void) +uint8_t CCECProcessor::VolumeUp(bool bSendRelease /* = true */) { uint8_t status = 0; - if (IsActiveDevice(CECDEVICE_AUDIOSYSTEM)) - status = ((CCECAudioSystem *)m_busDevices[CECDEVICE_AUDIOSYSTEM])->VolumeUp(); + if (IsPresentDevice(CECDEVICE_AUDIOSYSTEM)) + status = ((CCECAudioSystem *)m_busDevices[CECDEVICE_AUDIOSYSTEM])->VolumeUp(bSendRelease); return status; } -uint8_t CCECProcessor::VolumeDown(void) +uint8_t CCECProcessor::VolumeDown(bool bSendRelease /* = true */) { uint8_t status = 0; - if (IsActiveDevice(CECDEVICE_AUDIOSYSTEM)) - status = ((CCECAudioSystem *)m_busDevices[CECDEVICE_AUDIOSYSTEM])->VolumeDown(); + if (IsPresentDevice(CECDEVICE_AUDIOSYSTEM)) + status = ((CCECAudioSystem *)m_busDevices[CECDEVICE_AUDIOSYSTEM])->VolumeDown(bSendRelease); return status; } -uint8_t CCECProcessor::MuteAudio(void) +uint8_t CCECProcessor::MuteAudio(bool bSendRelease /* = true */) { uint8_t status = 0; - if (IsActiveDevice(CECDEVICE_AUDIOSYSTEM)) - status = ((CCECAudioSystem *)m_busDevices[CECDEVICE_AUDIOSYSTEM])->MuteAudio(); + if (IsPresentDevice(CECDEVICE_AUDIOSYSTEM)) + status = ((CCECAudioSystem *)m_busDevices[CECDEVICE_AUDIOSYSTEM])->MuteAudio(bSendRelease); return status; } @@ -648,6 +625,15 @@ CCECBusDevice *CCECProcessor::GetDeviceByType(cec_device_type type) const return device; } +CCECBusDevice *CCECProcessor::GetPrimaryDevice(void) const +{ + CCECBusDevice *device(NULL); + cec_logical_address primary = m_logicalAddresses.primary; + if (primary != CECDEVICE_UNKNOWN) + device = m_busDevices[primary]; + return device; +} + cec_version CCECProcessor::GetDeviceCecVersion(cec_logical_address iAddress) { return m_busDevices[iAddress]->GetCecVersion(); @@ -717,6 +703,13 @@ bool CCECProcessor::Transmit(const cec_command &data) LogOutput(data); CCECAdapterMessage *output = new CCECAdapterMessage(data); + + /* set the number of retries */ + if (data.opcode == CEC_OPCODE_NONE) + output->maxTries = 1; + else if (data.initiator != CECDEVICE_BROADCAST) + output->maxTries = m_busDevices[data.initiator]->GetHandler()->GetTransmitRetries() + 1; + bReturn = Transmit(output); /* set to "not present" on failed ack */ @@ -926,12 +919,12 @@ cec_logical_addresses CCECProcessor::GetActiveDevices(void) return addresses; } -bool CCECProcessor::IsActiveDevice(cec_logical_address address) +bool CCECProcessor::IsPresentDevice(cec_logical_address address) { return m_busDevices[address]->GetStatus() == CEC_DEVICE_STATUS_PRESENT; } -bool CCECProcessor::IsActiveDeviceType(cec_device_type type) +bool CCECProcessor::IsPresentDeviceType(cec_device_type type) { for (unsigned int iPtr = 0; iPtr < 15; iPtr++) { @@ -997,14 +990,14 @@ bool CCECProcessor::SetAckMask(uint16_t iMask) return bReturn; } -bool CCECProcessor::TransmitKeypress(cec_logical_address iDestination, cec_user_control_code key) +bool CCECProcessor::TransmitKeypress(cec_logical_address iDestination, cec_user_control_code key, bool bWait /* = true */) { - return m_busDevices[iDestination]->TransmitKeypress(key); + return m_busDevices[iDestination]->TransmitKeypress(key, bWait); } -bool CCECProcessor::TransmitKeyRelease(cec_logical_address iDestination) +bool CCECProcessor::TransmitKeyRelease(cec_logical_address iDestination, bool bWait /* = true */) { - return m_busDevices[iDestination]->TransmitKeyRelease(); + return m_busDevices[iDestination]->TransmitKeyRelease(bWait); } const char *CCECProcessor::ToString(const cec_menu_state state) @@ -1335,7 +1328,7 @@ void *CCECBusScan::Process(void) while (!IsStopped()) { - if (++iCounter < 30) + if (++iCounter < 10) { Sleep(1000); continue; @@ -1365,11 +1358,11 @@ void CCECBusScan::WaitUntilIdle(void) if (IsStopped()) return; - int64_t iWaitTime = 3000 - (GetTimeMs() - m_processor->GetLastTransmission()); + int32_t iWaitTime = 3000 - (int32_t)(GetTimeMs() - m_processor->GetLastTransmission()); while (iWaitTime > 0) { Sleep(iWaitTime); - iWaitTime = 3000 - (GetTimeMs() - m_processor->GetLastTransmission()); + iWaitTime = 3000 - (int32_t)(GetTimeMs() - m_processor->GetLastTransmission()); } }