X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fdevices%2FCECBusDevice.cpp;h=2998a622021786c7e3e9ba162870f1b92aa45373;hb=5c57af4817a04e92fbfd60d5d99d8782194a45a7;hp=f01d47ce8eff19e003fe06d369f3952a441d366a;hpb=29d5198c74435c4bb10bcfa635187f005a0c681d;p=deb_libcec.git diff --git a/src/lib/devices/CECBusDevice.cpp b/src/lib/devices/CECBusDevice.cpp index f01d47c..2998a62 100644 --- a/src/lib/devices/CECBusDevice.cpp +++ b/src/lib/devices/CECBusDevice.cpp @@ -30,17 +30,19 @@ * http://www.pulse-eight.net/ */ +#include "env.h" #include "CECBusDevice.h" -#include "../CECProcessor.h" -#include "../CECClient.h" -#include "../implementations/ANCommandHandler.h" -#include "../implementations/CECCommandHandler.h" -#include "../implementations/SLCommandHandler.h" -#include "../implementations/VLCommandHandler.h" -#include "../LibCEC.h" -#include "../CECTypeUtils.h" -#include "../platform/util/timeutils.h" -#include "../platform/util/util.h" + +#include "lib/CECProcessor.h" +#include "lib/CECClient.h" +#include "lib/implementations/ANCommandHandler.h" +#include "lib/implementations/CECCommandHandler.h" +#include "lib/implementations/SLCommandHandler.h" +#include "lib/implementations/VLCommandHandler.h" +#include "lib/LibCEC.h" +#include "lib/CECTypeUtils.h" +#include "lib/platform/util/timeutils.h" +#include "lib/platform/util/util.h" #include "CECAudioSystem.h" #include "CECPlaybackDevice.h" @@ -72,7 +74,8 @@ CCECBusDevice::CCECBusDevice(CCECProcessor *processor, cec_logical_address iLogi m_deviceStatus (CEC_DEVICE_STATUS_UNKNOWN), m_iHandlerUseCount (0), m_bAwaitingReceiveFailed(false), - m_bVendorIdRequested (false) + m_bVendorIdRequested (false), + m_waitForResponse (new CWaitForResponse) { m_handler = new CCECCommandHandler(this); @@ -87,16 +90,17 @@ CCECBusDevice::CCECBusDevice(CCECProcessor *processor, cec_logical_address iLogi CCECBusDevice::~CCECBusDevice(void) { DELETE_AND_NULL(m_handler); + DELETE_AND_NULL(m_waitForResponse); } bool CCECBusDevice::ReplaceHandler(bool bActivateSource /* = true */) { + if (m_iLogicalAddress == CECDEVICE_BROADCAST) + return false; + bool bInitHandler(false); { - CTryLockObject lock(m_mutex); - if (!lock.IsLocked()) - return false; - + CLockObject lock(m_mutex); CLockObject handlerLock(m_handlerMutex); if (m_iHandlerUseCount > 0) return false; @@ -108,21 +112,27 @@ bool CCECBusDevice::ReplaceHandler(bool bActivateSource /* = true */) if (CCECCommandHandler::HasSpecificHandler(m_vendor)) { LIB_CEC->AddLog(CEC_LOG_DEBUG, "replacing the command handler for device '%s' (%x)", GetLogicalAddressName(), GetLogicalAddress()); + + int32_t iTransmitTimeout = m_handler->m_iTransmitTimeout; + int32_t iTransmitWait = m_handler->m_iTransmitWait; + int8_t iTransmitRetries = m_handler->m_iTransmitRetries; + int64_t iActiveSourcePending = m_handler->m_iActiveSourcePending; + DELETE_AND_NULL(m_handler); switch (m_vendor) { case CEC_VENDOR_SAMSUNG: - m_handler = new CANCommandHandler(this); + m_handler = new CANCommandHandler(this, iTransmitTimeout, iTransmitWait, iTransmitRetries, iActiveSourcePending); break; case CEC_VENDOR_LG: - m_handler = new CSLCommandHandler(this); + m_handler = new CSLCommandHandler(this, iTransmitTimeout, iTransmitWait, iTransmitRetries, iActiveSourcePending); break; case CEC_VENDOR_PANASONIC: - m_handler = new CVLCommandHandler(this); + m_handler = new CVLCommandHandler(this, iTransmitTimeout, iTransmitWait, iTransmitRetries, iActiveSourcePending); break; default: - m_handler = new CCECCommandHandler(this); + m_handler = new CCECCommandHandler(this, iTransmitTimeout, iTransmitWait, iTransmitRetries, iActiveSourcePending); break; } @@ -231,7 +241,7 @@ void CCECBusDevice::SetUnsupportedFeature(cec_opcode opcode) // signal threads that are waiting for a reponse MarkBusy(); - m_handler->SignalOpcode(cec_command::GetResponseOpcode(opcode)); + SignalOpcode(cec_command::GetResponseOpcode(opcode)); MarkReady(); } @@ -303,7 +313,7 @@ bool CCECBusDevice::RequestCecVersion(const cec_logical_address initiator, bool return bReturn; } -bool CCECBusDevice::TransmitCECVersion(const cec_logical_address destination) +bool CCECBusDevice::TransmitCECVersion(const cec_logical_address destination, bool bIsReply) { cec_version version; { @@ -313,7 +323,7 @@ bool CCECBusDevice::TransmitCECVersion(const cec_logical_address destination) } MarkBusy(); - bool bReturn = m_handler->TransmitCECVersion(m_iLogicalAddress, destination, version); + bool bReturn = m_handler->TransmitCECVersion(m_iLogicalAddress, destination, version, bIsReply); MarkReady(); return bReturn; } @@ -372,7 +382,7 @@ bool CCECBusDevice::RequestMenuLanguage(const cec_logical_address initiator, boo return bReturn; } -bool CCECBusDevice::TransmitSetMenuLanguage(const cec_logical_address destination) +bool CCECBusDevice::TransmitSetMenuLanguage(const cec_logical_address destination, bool bIsReply) { bool bReturn(false); cec_menu_language language; @@ -399,20 +409,20 @@ bool CCECBusDevice::TransmitSetMenuLanguage(const cec_logical_address destinatio else { LIB_CEC->AddLog(CEC_LOG_NOTICE, "<< %s (%X) -> broadcast (F): Menu language '%s'", GetLogicalAddressName(), m_iLogicalAddress, lang); - bReturn = m_handler->TransmitSetMenuLanguage(m_iLogicalAddress, lang); + bReturn = m_handler->TransmitSetMenuLanguage(m_iLogicalAddress, lang, bIsReply); } MarkReady(); return bReturn; } -bool CCECBusDevice::TransmitOSDString(const cec_logical_address destination, cec_display_control duration, const char *strMessage) +bool CCECBusDevice::TransmitOSDString(const cec_logical_address destination, cec_display_control duration, const char *strMessage, bool bIsReply) { bool bReturn(false); if (!m_processor->GetDevice(destination)->IsUnsupportedFeature(CEC_OPCODE_SET_OSD_STRING)) { LIB_CEC->AddLog(CEC_LOG_NOTICE, "<< %s (%X) -> %s (%X): display OSD message '%s'", GetLogicalAddressName(), m_iLogicalAddress, ToString(destination), destination, strMessage); MarkBusy(); - bReturn = m_handler->TransmitOSDString(m_iLogicalAddress, destination, duration, strMessage); + bReturn = m_handler->TransmitOSDString(m_iLogicalAddress, destination, duration, strMessage, bIsReply); MarkReady(); } return bReturn; @@ -470,7 +480,7 @@ bool CCECBusDevice::RequestOSDName(const cec_logical_address initiator, bool bWa return bReturn; } -bool CCECBusDevice::TransmitOSDName(const cec_logical_address destination) +bool CCECBusDevice::TransmitOSDName(const cec_logical_address destination, bool bIsReply) { CStdString strDeviceName; { @@ -480,7 +490,7 @@ bool CCECBusDevice::TransmitOSDName(const cec_logical_address destination) } MarkBusy(); - bool bReturn = m_handler->TransmitOSDName(m_iLogicalAddress, destination, strDeviceName); + bool bReturn = m_handler->TransmitOSDName(m_iLogicalAddress, destination, strDeviceName, bIsReply); MarkReady(); return bReturn; } @@ -545,7 +555,7 @@ bool CCECBusDevice::RequestPhysicalAddress(const cec_logical_address initiator, return bReturn; } -bool CCECBusDevice::TransmitPhysicalAddress(void) +bool CCECBusDevice::TransmitPhysicalAddress(bool bIsReply) { uint16_t iPhysicalAddress; cec_device_type type; @@ -560,7 +570,7 @@ bool CCECBusDevice::TransmitPhysicalAddress(void) } MarkBusy(); - bool bReturn = m_handler->TransmitPhysicalAddress(m_iLogicalAddress, iPhysicalAddress, type); + bool bReturn = m_handler->TransmitPhysicalAddress(m_iLogicalAddress, iPhysicalAddress, type, bIsReply); MarkReady(); return bReturn; } @@ -620,7 +630,7 @@ bool CCECBusDevice::RequestPowerStatus(const cec_logical_address initiator, bool return bReturn; } -bool CCECBusDevice::TransmitPowerState(const cec_logical_address destination) +bool CCECBusDevice::TransmitPowerState(const cec_logical_address destination, bool bIsReply) { cec_power_status state; { @@ -630,7 +640,7 @@ bool CCECBusDevice::TransmitPowerState(const cec_logical_address destination) } MarkBusy(); - bool bReturn = m_handler->TransmitPowerState(m_iLogicalAddress, destination, state); + bool bReturn = m_handler->TransmitPowerState(m_iLogicalAddress, destination, state, bIsReply); MarkReady(); return bReturn; } @@ -696,7 +706,7 @@ bool CCECBusDevice::RequestVendorId(const cec_logical_address initiator, bool bW return bReturn; } -bool CCECBusDevice::TransmitVendorID(const cec_logical_address destination, bool bSendAbort /* = true */) +bool CCECBusDevice::TransmitVendorID(const cec_logical_address destination, bool bSendAbort, bool bIsReply) { bool bReturn(false); uint64_t iVendorId; @@ -718,7 +728,7 @@ bool CCECBusDevice::TransmitVendorID(const cec_logical_address destination, bool else { LIB_CEC->AddLog(CEC_LOG_NOTICE, "<< %s (%X) -> %s (%X): vendor id %s (%x)", GetLogicalAddressName(), m_iLogicalAddress, ToString(destination), destination, ToString((cec_vendor_id)iVendorId), iVendorId); - bReturn = m_handler->TransmitVendorID(m_iLogicalAddress, iVendorId); + bReturn = m_handler->TransmitVendorID(m_iLogicalAddress, iVendorId, bIsReply); } MarkReady(); return bReturn; @@ -749,7 +759,7 @@ cec_bus_device_status CCECBusDevice::GetStatus(bool bForcePoll /* = false */, bo return status; } -void CCECBusDevice::SetDeviceStatus(const cec_bus_device_status newStatus) +void CCECBusDevice::SetDeviceStatus(const cec_bus_device_status newStatus, cec_version libCECSpecVersion /* = CEC_VERSION_1_4 */) { { CLockObject lock(m_mutex); @@ -761,7 +771,7 @@ void CCECBusDevice::SetDeviceStatus(const cec_bus_device_status newStatus) SetPowerStatus (CEC_POWER_STATUS_ON); SetVendorId (CEC_VENDOR_UNKNOWN); SetMenuState (CEC_MENU_STATE_ACTIVATED); - SetCecVersion (CEC_VERSION_1_3A); + SetCecVersion (libCECSpecVersion); SetStreamPath (CEC_INVALID_PHYSICAL_ADDRESS); MarkAsInactiveSource(); m_iLastActive = 0; @@ -801,13 +811,14 @@ void CCECBusDevice::ResetDeviceStatus(void) m_iLastActive = 0; m_bVendorIdRequested = false; m_unsupportedFeatures.clear(); + m_waitForResponse->Clear(); if (m_deviceStatus != CEC_DEVICE_STATUS_UNKNOWN) LIB_CEC->AddLog(CEC_LOG_DEBUG, "%s (%X): device status changed into 'unknown'", GetLogicalAddressName(), m_iLogicalAddress); m_deviceStatus = CEC_DEVICE_STATUS_UNKNOWN; } -bool CCECBusDevice::TransmitPoll(const cec_logical_address dest) +bool CCECBusDevice::TransmitPoll(const cec_logical_address dest, bool bIsReply) { bool bReturn(false); cec_logical_address destination(dest); @@ -820,7 +831,7 @@ bool CCECBusDevice::TransmitPoll(const cec_logical_address dest) MarkBusy(); LIB_CEC->AddLog(CEC_LOG_NOTICE, "<< %s (%X) -> %s (%X): POLL", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest); - bReturn = m_handler->TransmitPoll(m_iLogicalAddress, destination); + bReturn = m_handler->TransmitPoll(m_iLogicalAddress, destination, bIsReply); LIB_CEC->AddLog(CEC_LOG_DEBUG, bReturn ? ">> POLL sent" : ">> POLL not sent"); CLockObject lock(m_mutex); @@ -875,7 +886,7 @@ void CCECBusDevice::SetMenuState(const cec_menu_state state) } } -bool CCECBusDevice::TransmitMenuState(const cec_logical_address dest) +bool CCECBusDevice::TransmitMenuState(const cec_logical_address dest, bool bIsReply) { cec_menu_state menuState; { @@ -885,17 +896,26 @@ bool CCECBusDevice::TransmitMenuState(const cec_logical_address dest) } MarkBusy(); - bool bReturn = m_handler->TransmitMenuState(m_iLogicalAddress, dest, menuState); + bool bReturn = m_handler->TransmitMenuState(m_iLogicalAddress, dest, menuState, bIsReply); MarkReady(); return bReturn; } -bool CCECBusDevice::ActivateSource(void) +bool CCECBusDevice::ActivateSource(uint64_t iDelay /* = 0 */) { MarkAsActiveSource(); - LIB_CEC->AddLog(CEC_LOG_DEBUG, "activating source '%s'", ToString(m_iLogicalAddress)); MarkBusy(); - bool bReturn = m_handler->ActivateSource(); + bool bReturn(true); + if (iDelay == 0) + { + LIB_CEC->AddLog(CEC_LOG_DEBUG, "sending active source message for '%s'", ToString(m_iLogicalAddress)); + bReturn = m_handler->ActivateSource(); + } + else + { + LIB_CEC->AddLog(CEC_LOG_DEBUG, "scheduling active source message for '%s'", ToString(m_iLogicalAddress)); + m_handler->ScheduleActivateSource(iDelay); + } MarkReady(); return bReturn; } @@ -972,7 +992,7 @@ void CCECBusDevice::MarkAsInactiveSource(void) } } -bool CCECBusDevice::TransmitActiveSource(void) +bool CCECBusDevice::TransmitActiveSource(bool bIsReply) { bool bSendActiveSource(false); uint16_t iPhysicalAddress(CEC_INVALID_PHYSICAL_ADDRESS); @@ -1002,7 +1022,7 @@ bool CCECBusDevice::TransmitActiveSource(void) if (bSendActiveSource) { MarkBusy(); - bActiveSourceSent = m_handler->TransmitActiveSource(m_iLogicalAddress, iPhysicalAddress); + bActiveSourceSent = m_handler->TransmitActiveSource(m_iLogicalAddress, iPhysicalAddress, bIsReply); MarkReady(); } @@ -1067,6 +1087,10 @@ void CCECBusDevice::SetStreamPath(uint16_t iNewAddress, uint16_t iOldAddress /* { // if a device is found with the new physical address, mark it as active, which will automatically mark all other devices as inactive device->MarkAsActiveSource(); + + // respond with an active source message if this device is handled by libCEC + if (device->IsHandledByLibCEC()) + device->TransmitActiveSource(true); } else { @@ -1261,14 +1285,14 @@ void CCECBusDevice::MarkReady(void) --m_iHandlerUseCount; } -bool CCECBusDevice::TryLogicalAddress(void) +bool CCECBusDevice::TryLogicalAddress(cec_version libCECSpecVersion /* = CEC_VERSION_1_4 */) { LIB_CEC->AddLog(CEC_LOG_DEBUG, "trying logical address '%s'", GetLogicalAddressName()); - if (!TransmitPoll(m_iLogicalAddress)) + if (!TransmitPoll(m_iLogicalAddress, false)) { LIB_CEC->AddLog(CEC_LOG_NOTICE, "using logical address '%s'", GetLogicalAddressName()); - SetDeviceStatus(CEC_DEVICE_STATUS_HANDLED_BY_LIBCEC); + SetDeviceStatus(CEC_DEVICE_STATUS_HANDLED_BY_LIBCEC, libCECSpecVersion); return true; } @@ -1282,3 +1306,13 @@ CCECClient *CCECBusDevice::GetClient(void) { return m_processor->GetClient(m_iLogicalAddress); } + +void CCECBusDevice::SignalOpcode(cec_opcode opcode) +{ + m_waitForResponse->Received(opcode); +} + +bool CCECBusDevice::WaitForOpcode(cec_opcode opcode) +{ + return m_waitForResponse->Wait(opcode); +}