From 29912296089b5266f2c7e49e621c135b9f023313 Mon Sep 17 00:00:00 2001 From: Lars Op den Kamp Date: Sun, 6 Nov 2011 13:33:26 +0100 Subject: [PATCH] cec: renamed all Broadcast...() and Report...() methods to Transmit...() --- src/lib/CECProcessor.cpp | 6 +++--- src/lib/devices/CECBusDevice.cpp | 20 +++++++++---------- src/lib/devices/CECBusDevice.h | 20 +++++++++---------- src/lib/implementations/CECCommandHandler.cpp | 18 ++++++++--------- src/lib/implementations/VLCommandHandler.cpp | 6 +++--- 5 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp index 07698ad..8238de7 100644 --- a/src/lib/CECProcessor.cpp +++ b/src/lib/CECProcessor.cpp @@ -287,7 +287,7 @@ bool CCECProcessor::SetActiveView(void) return false; if (!m_logicalAddresses.empty() && m_busDevices[m_logicalAddresses.primary]) - return m_busDevices[m_logicalAddresses.primary]->BroadcastActiveView(); + return m_busDevices[m_logicalAddresses.primary]->TransmitActiveView(); return false; } @@ -297,7 +297,7 @@ bool CCECProcessor::SetInactiveView(void) return false; if (!m_logicalAddresses.empty() && m_busDevices[m_logicalAddresses.primary]) - return m_busDevices[m_logicalAddresses.primary]->BroadcastInactiveView(); + return m_busDevices[m_logicalAddresses.primary]->TransmitInactiveView(); return false; } @@ -333,7 +333,7 @@ bool CCECProcessor::SetPhysicalAddress(uint16_t iPhysicalAddress) if (!m_logicalAddresses.empty() && m_busDevices[m_logicalAddresses.primary]) { m_busDevices[m_logicalAddresses.primary]->SetPhysicalAddress(iPhysicalAddress); - return m_busDevices[m_logicalAddresses.primary]->BroadcastActiveView(); + return m_busDevices[m_logicalAddresses.primary]->TransmitActiveView(); } return false; } diff --git a/src/lib/devices/CECBusDevice.cpp b/src/lib/devices/CECBusDevice.cpp index 8b6c54d..bfdda91 100644 --- a/src/lib/devices/CECBusDevice.cpp +++ b/src/lib/devices/CECBusDevice.cpp @@ -282,7 +282,7 @@ bool CCECBusDevice::SetOSDString(cec_display_control duration, const char *strMe return m_processor->Transmit(command); } -bool CCECBusDevice::ReportCECVersion(cec_logical_address dest) +bool CCECBusDevice::TransmitCECVersion(cec_logical_address dest) { AddLog(CEC_LOG_NOTICE, "<< reporting CEC version as 1.3a"); @@ -293,7 +293,7 @@ bool CCECBusDevice::ReportCECVersion(cec_logical_address dest) return m_processor->Transmit(command); } -bool CCECBusDevice::ReportDeckStatus(cec_logical_address dest) +bool CCECBusDevice::TransmitDeckStatus(cec_logical_address dest) { // need to support opcodes play and deck control before doing anything with this AddLog(CEC_LOG_NOTICE, "<< deck status requested, feature abort"); @@ -301,7 +301,7 @@ bool CCECBusDevice::ReportDeckStatus(cec_logical_address dest) return false; } -bool CCECBusDevice::ReportMenuState(cec_logical_address dest) +bool CCECBusDevice::TransmitMenuState(cec_logical_address dest) { if (m_bMenuActive) AddLog(CEC_LOG_NOTICE, "<< reporting menu state as active"); @@ -315,7 +315,7 @@ bool CCECBusDevice::ReportMenuState(cec_logical_address dest) return m_processor->Transmit(command); } -bool CCECBusDevice::ReportOSDName(cec_logical_address dest) +bool CCECBusDevice::TransmitOSDName(cec_logical_address dest) { CStdString strLog; strLog.Format("<< reporting OSD name as %s", m_strDeviceName.c_str()); @@ -329,7 +329,7 @@ bool CCECBusDevice::ReportOSDName(cec_logical_address dest) return m_processor->Transmit(command); } -bool CCECBusDevice::ReportPowerState(cec_logical_address dest) +bool CCECBusDevice::TransmitPowerState(cec_logical_address dest) { CStdString strLog; strLog.Format("<< reporting power status '%d'", m_powerStatus); @@ -342,14 +342,14 @@ bool CCECBusDevice::ReportPowerState(cec_logical_address dest) return m_processor->Transmit(command); } -bool CCECBusDevice::ReportVendorID(cec_logical_address dest) +bool CCECBusDevice::TransmitVendorID(cec_logical_address dest) { AddLog(CEC_LOG_NOTICE, "<< vendor ID requested, feature abort"); m_processor->TransmitAbort(dest, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID); return false; } -bool CCECBusDevice::BroadcastActiveView(void) +bool CCECBusDevice::TransmitActiveView(void) { AddLog(CEC_LOG_DEBUG, "<< setting active view"); @@ -361,7 +361,7 @@ bool CCECBusDevice::BroadcastActiveView(void) return m_processor->Transmit(command); } -bool CCECBusDevice::BroadcastInactiveView(void) +bool CCECBusDevice::TransmitInactiveView(void) { AddLog(CEC_LOG_DEBUG, "<< setting inactive view"); @@ -373,7 +373,7 @@ bool CCECBusDevice::BroadcastInactiveView(void) return m_processor->Transmit(command); } -bool CCECBusDevice::BroadcastPhysicalAddress(void) +bool CCECBusDevice::TransmitPhysicalAddress(void) { CStdString strLog; strLog.Format("<< reporting physical address as %04x", m_iPhysicalAddress); @@ -388,7 +388,7 @@ bool CCECBusDevice::BroadcastPhysicalAddress(void) return m_processor->Transmit(command); } -bool CCECBusDevice::BroadcastActiveSource(void) +bool CCECBusDevice::TransmitActiveSource(void) { AddLog(CEC_LOG_NOTICE, "<< broadcasting active source"); diff --git a/src/lib/devices/CECBusDevice.h b/src/lib/devices/CECBusDevice.h index 5a5229d..4c7e540 100644 --- a/src/lib/devices/CECBusDevice.h +++ b/src/lib/devices/CECBusDevice.h @@ -81,17 +81,17 @@ namespace CEC virtual CCECProcessor *GetProcessor() const { return m_processor; } virtual CCECCommandHandler *GetHandler(void) const { return m_handler; }; - virtual bool ReportCECVersion(cec_logical_address dest); - virtual bool ReportDeckStatus(cec_logical_address dest); - virtual bool ReportMenuState(cec_logical_address dest); - virtual bool ReportOSDName(cec_logical_address dest); - virtual bool ReportPowerState(cec_logical_address dest); - virtual bool ReportVendorID(cec_logical_address dest); + virtual bool TransmitCECVersion(cec_logical_address dest); + virtual bool TransmitDeckStatus(cec_logical_address dest); + virtual bool TransmitMenuState(cec_logical_address dest); + virtual bool TransmitOSDName(cec_logical_address dest); + virtual bool TransmitPowerState(cec_logical_address dest); + virtual bool TransmitVendorID(cec_logical_address dest); - virtual bool BroadcastActiveView(void); - virtual bool BroadcastInactiveView(void); - virtual bool BroadcastPhysicalAddress(void); - virtual bool BroadcastActiveSource(void); + virtual bool TransmitActiveView(void); + virtual bool TransmitInactiveView(void); + virtual bool TransmitPhysicalAddress(void); + virtual bool TransmitActiveSource(void); protected: cec_device_type m_type; diff --git a/src/lib/implementations/CECCommandHandler.cpp b/src/lib/implementations/CECCommandHandler.cpp index 625ed01..2324c20 100644 --- a/src/lib/implementations/CECCommandHandler.cpp +++ b/src/lib/implementations/CECCommandHandler.cpp @@ -177,7 +177,7 @@ bool CCECCommandHandler::HandleGetCecVersion(const cec_command &command) { CCECBusDevice *device = GetDevice(command.destination); if (device) - return device->ReportCECVersion(command.initiator); + return device->TransmitCECVersion(command.initiator); return false; } @@ -186,7 +186,7 @@ bool CCECCommandHandler::HandleGiveDeckStatus(const cec_command &command) { CCECBusDevice *device = GetDevice(command.destination); if (device) - return device->ReportDeckStatus(command.initiator); + return device->TransmitDeckStatus(command.initiator); return false; } @@ -195,7 +195,7 @@ bool CCECCommandHandler::HandleGiveDevicePowerStatus(const cec_command &command) { CCECBusDevice *device = GetDevice(command.destination); if (device) - return device->ReportPowerState(command.initiator); + return device->TransmitPowerState(command.initiator); return false; } @@ -204,7 +204,7 @@ bool CCECCommandHandler::HandleGiveDeviceVendorId(const cec_command &command) { CCECBusDevice *device = GetDevice(command.destination); if (device) - return device->ReportVendorID(command.initiator); + return device->TransmitVendorID(command.initiator); return false; } @@ -213,7 +213,7 @@ bool CCECCommandHandler::HandleGiveOSDName(const cec_command &command) { CCECBusDevice *device = GetDevice(command.destination); if (device) - return device->ReportOSDName(command.initiator); + return device->TransmitOSDName(command.initiator); return false; } @@ -222,7 +222,7 @@ bool CCECCommandHandler::HandleGivePhysicalAddress(const cec_command &command) { CCECBusDevice *device = GetDevice(command.destination); if (device) - return device->BroadcastPhysicalAddress(); + return device->TransmitPhysicalAddress(); return false; } @@ -233,7 +233,7 @@ bool CCECCommandHandler::HandleMenuRequest(const cec_command &command) { CCECBusDevice *device = GetDevice(command.destination); if (device) - return device->ReportMenuState(command.initiator); + return device->TransmitMenuState(command.initiator); } return false; } @@ -256,7 +256,7 @@ bool CCECCommandHandler::HandleRequestActiveSource(const cec_command &command) m_busDevice->AddLog(CEC_LOG_DEBUG, strLog.c_str()); CCECBusDevice *device = m_busDevice->GetProcessor()->m_busDevices[m_busDevice->GetMyLogicalAddress()]; if (device) - return device->BroadcastActiveSource(); + return device->TransmitActiveSource(); return false; } @@ -304,7 +304,7 @@ bool CCECCommandHandler::HandleSetStreamPath(const cec_command &command) { CCECBusDevice *device = GetDevice(command.destination); if (device) - return device->BroadcastActiveSource(); + return device->TransmitActiveSource(); return false; } } diff --git a/src/lib/implementations/VLCommandHandler.cpp b/src/lib/implementations/VLCommandHandler.cpp index 0104e9a..d1c7605 100644 --- a/src/lib/implementations/VLCommandHandler.cpp +++ b/src/lib/implementations/VLCommandHandler.cpp @@ -54,9 +54,9 @@ bool CVLCommandHandler::HandleSetStreamPath(const cec_command &command) CCECBusDevice *device = GetDevice(command.destination); if (device) { - return device->BroadcastActiveSource() && - device->BroadcastActiveView() && - device->ReportMenuState(command.initiator); + return device->TransmitActiveSource() && + device->TransmitActiveView() && + device->TransmitMenuState(command.initiator); } return false; } -- 2.34.1