From ab27363d2e09c62c70bfc23c253745f7e12725be Mon Sep 17 00:00:00 2001 From: Lars Op den Kamp Date: Mon, 28 Nov 2011 21:32:26 +0100 Subject: [PATCH] cec: inactive source should be directly addressed at the TV --- src/lib/CECProcessor.cpp | 4 ++-- src/lib/CECProcessor.h | 2 +- src/lib/devices/CECBusDevice.cpp | 6 +++--- src/lib/devices/CECBusDevice.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp index 132d01e..2b8874b 100644 --- a/src/lib/CECProcessor.cpp +++ b/src/lib/CECProcessor.cpp @@ -422,13 +422,13 @@ bool CCECProcessor::SetStreamPath(uint16_t iStreamPath) return bReturn; } -bool CCECProcessor::SetInactiveView(void) +bool CCECProcessor::TransmitInactiveSource(void) { if (!IsRunning()) return false; if (!m_logicalAddresses.IsEmpty() && m_busDevices[m_logicalAddresses.primary]) - return m_busDevices[m_logicalAddresses.primary]->TransmitInactiveView(); + return m_busDevices[m_logicalAddresses.primary]->TransmitInactiveSource(); return false; } diff --git a/src/lib/CECProcessor.h b/src/lib/CECProcessor.h index b20c664..c6e7b75 100644 --- a/src/lib/CECProcessor.h +++ b/src/lib/CECProcessor.h @@ -79,7 +79,7 @@ namespace CEC virtual bool SetDeckControlMode(cec_deck_control_mode mode, bool bSendUpdate = true); virtual bool SetDeckInfo(cec_deck_info info, bool bSendUpdate = true); virtual bool SetHDMIPort(uint8_t iPort, bool bForce = false); - virtual bool SetInactiveView(void); + virtual bool TransmitInactiveSource(void); virtual bool SetLogicalAddress(cec_logical_address iLogicalAddress); virtual bool SetMenuState(cec_menu_state state, bool bSendUpdate = true); virtual bool SetPhysicalAddress(uint16_t iPhysicalAddress); diff --git a/src/lib/devices/CECBusDevice.cpp b/src/lib/devices/CECBusDevice.cpp index 702b561..aecba32 100644 --- a/src/lib/devices/CECBusDevice.cpp +++ b/src/lib/devices/CECBusDevice.cpp @@ -678,14 +678,14 @@ bool CCECBusDevice::TransmitCECVersion(cec_logical_address dest) return m_processor->Transmit(command); } -bool CCECBusDevice::TransmitInactiveView(void) +bool CCECBusDevice::TransmitInactiveSource(void) { CStdString strLog; - strLog.Format("<< %s (%X) -> broadcast (F): inactive view", GetLogicalAddressName(), m_iLogicalAddress); + strLog.Format("<< %s (%X) -> broadcast (F): inactive source", GetLogicalAddressName(), m_iLogicalAddress); AddLog(CEC_LOG_NOTICE, strLog); cec_command command; - cec_command::Format(command, m_iLogicalAddress, CECDEVICE_BROADCAST, CEC_OPCODE_INACTIVE_SOURCE); + cec_command::Format(command, m_iLogicalAddress, CECDEVICE_TV, CEC_OPCODE_INACTIVE_SOURCE); command.parameters.PushBack((m_iPhysicalAddress >> 8) & 0xFF); command.parameters.PushBack(m_iPhysicalAddress & 0xFF); diff --git a/src/lib/devices/CECBusDevice.h b/src/lib/devices/CECBusDevice.h index 2ee1204..a99763a 100644 --- a/src/lib/devices/CECBusDevice.h +++ b/src/lib/devices/CECBusDevice.h @@ -96,7 +96,7 @@ namespace CEC virtual bool TransmitActiveSource(void); virtual bool TransmitCECVersion(cec_logical_address dest); - virtual bool TransmitInactiveView(void); + virtual bool TransmitInactiveSource(void); virtual bool TransmitMenuState(cec_logical_address dest); virtual bool TransmitOSDName(cec_logical_address dest); virtual bool TransmitOSDString(cec_logical_address dest, cec_display_control duration, const char *strMessage); -- 2.34.1