X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fdevices%2FCECDeviceMap.cpp;h=b7f3ab2026b4143b88b1096358b04d513b5caa3c;hb=0c271bd0fc05728d0dd90065a064737a979f50d3;hp=b614e1a9175a1c322e28578fcee55ca2390ebb65;hpb=4ba7bfae1e415640550a7515b5b8a910c893a208;p=deb_libcec.git diff --git a/src/lib/devices/CECDeviceMap.cpp b/src/lib/devices/CECDeviceMap.cpp index b614e1a..b7f3ab2 100644 --- a/src/lib/devices/CECDeviceMap.cpp +++ b/src/lib/devices/CECDeviceMap.cpp @@ -45,8 +45,7 @@ using namespace std; using namespace CEC; CCECDeviceMap::CCECDeviceMap(CCECProcessor *processor) : - m_processor(processor), - m_iActiveSource(CEC_INVALID_PHYSICAL_ADDRESS) + m_processor(processor) { for (uint8_t iPtr = CECDEVICE_TV; iPtr <= CECDEVICE_BROADCAST; iPtr++) { @@ -207,10 +206,6 @@ CCECBusDevice *CCECDeviceMap::GetActiveSource(void) const { for (CECDEVICEMAP::const_iterator it = m_busDevices.begin(); it != m_busDevices.end(); it++) { - if (m_iActiveSource != CEC_INVALID_PHYSICAL_ADDRESS && !it->second->IsActiveSource() && - it->second->GetCurrentPowerStatus() == CEC_POWER_STATUS_ON && - m_iActiveSource == it->second->GetCurrentPhysicalAddress()) - it->second->MarkAsActiveSource(); if (it->second->IsActiveSource()) return it->second; } @@ -289,16 +284,6 @@ void CCECDeviceMap::GetChildrenOf(CECDEVICEVEC& devices, CCECBusDevice* device) } } -void CCECDeviceMap::SetActiveSource(uint16_t iPhysicalAddress) -{ - m_iActiveSource = iPhysicalAddress; -} - -uint16_t CCECDeviceMap::GetActiveSourceAddress(void) const -{ - return m_iActiveSource; -} - void CCECDeviceMap::SignalAll(cec_opcode opcode) { for (CECDEVICEMAP::iterator it = m_busDevices.begin(); it != m_busDevices.end(); it++)