repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added vendor id for Denon
[deb_libcec.git]
/
src
/
lib
/
devices
/
CECDeviceMap.cpp
diff --git
a/src/lib/devices/CECDeviceMap.cpp
b/src/lib/devices/CECDeviceMap.cpp
index 1280de6e2f43eb4db87376e7529000b0c9a42bcd..b7f3ab2026b4143b88b1096358b04d513b5caa3c 100644
(file)
--- 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) :
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++)
{
{
for (uint8_t iPtr = CECDEVICE_TV; iPtr <= CECDEVICE_BROADCAST; iPtr++)
{
@@
-207,9
+206,6
@@
CCECBusDevice *CCECDeviceMap::GetActiveSource(void) const
{
for (CECDEVICEMAP::const_iterator it = m_busDevices.begin(); it != m_busDevices.end(); it++)
{
{
for (CECDEVICEMAP::const_iterator it = m_busDevices.begin(); it != m_busDevices.end(); it++)
{
- if (m_iActiveSource != CEC_INVALID_PHYSICAL_ADDRESS && !it->second->IsActiveSource() &&
- m_iActiveSource == it->second->GetCurrentPhysicalAddress())
- it->second->MarkAsActiveSource();
if (it->second->IsActiveSource())
return it->second;
}
if (it->second->IsActiveSource())
return it->second;
}
@@
-288,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++)
void CCECDeviceMap::SignalAll(cec_opcode opcode)
{
for (CECDEVICEMAP::iterator it = m_busDevices.begin(); it != m_busDevices.end(); it++)