From: Lars Op den Kamp Date: Wed, 25 Apr 2012 12:15:11 +0000 (+0200) Subject: cec: optimisation - strip unneeded virtual keywords from top level implementations X-Git-Tag: upstream/2.2.0~1^2~29^2^2~42 X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=e186a8436089dfa0f8a7cb65b00cbeb056923467;p=deb_libcec.git cec: optimisation - strip unneeded virtual keywords from top level implementations --- diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp index 3467d10..68823d1 100644 --- a/src/lib/CECProcessor.cpp +++ b/src/lib/CECProcessor.cpp @@ -876,6 +876,13 @@ bool CCECProcessor::GetDeviceMenuLanguage(cec_logical_address iAddress, cec_menu return false; } +CStdString CCECProcessor::GetDeviceName(void) const +{ + CStdString strName; + strName = m_configuration.strDeviceName; + return strName; +} + uint64_t CCECProcessor::GetDeviceVendorId(cec_logical_address iAddress) { if (m_busDevices[iAddress]) diff --git a/src/lib/CECProcessor.h b/src/lib/CECProcessor.h index ce59098..d557104 100644 --- a/src/lib/CECProcessor.h +++ b/src/lib/CECProcessor.h @@ -102,69 +102,64 @@ namespace CEC CCECProcessor(CLibCEC *controller, libcec_configuration *configuration); virtual ~CCECProcessor(void); - virtual bool Start(const char *strPort, uint16_t iBaudRate = 38400, uint32_t iTimeoutMs = 10000); - virtual void *Process(void); - virtual void Close(void); - - virtual bool OnCommandReceived(const cec_command &command); - - virtual bool IsMonitoring(void) const { return m_bMonitor; } - virtual CCECBusDevice * GetDeviceByPhysicalAddress(uint16_t iPhysicalAddress, bool bRefresh = false, bool bSuppressPoll = false) const; - virtual CCECBusDevice * GetDeviceByType(cec_device_type type) const; - virtual CCECBusDevice * GetPrimaryDevice(void) const; - virtual cec_version GetDeviceCecVersion(cec_logical_address iAddress); - virtual bool GetDeviceMenuLanguage(cec_logical_address iAddress, cec_menu_language *language); - virtual CStdString GetDeviceName(void) const - { - CStdString strName; - strName = m_configuration.strDeviceName; - return strName; - } - virtual cec_osd_name GetDeviceOSDName(cec_logical_address iAddress); - virtual uint64_t GetDeviceVendorId(cec_logical_address iAddress); - virtual cec_power_status GetDevicePowerStatus(cec_logical_address iAddress); - virtual cec_logical_address GetLogicalAddress(void) const { return m_configuration.logicalAddresses.primary; } - virtual cec_logical_addresses GetLogicalAddresses(void) const { return m_configuration.logicalAddresses; } - virtual cec_logical_addresses GetActiveDevices(void); - virtual uint16_t GetDevicePhysicalAddress(cec_logical_address iAddress); - virtual bool HasLogicalAddress(cec_logical_address address) const { return m_configuration.logicalAddresses.IsSet(address); } - virtual bool IsPresentDevice(cec_logical_address address); - virtual bool IsPresentDeviceType(cec_device_type type); - virtual uint16_t GetPhysicalAddress(void) const; - virtual uint64_t GetLastTransmission(void) const { return m_iLastTransmission; } - virtual cec_logical_address GetActiveSource(void); - virtual bool IsActiveSource(cec_logical_address iAddress); - virtual bool IsInitialised(void); - virtual bool SetStreamPath(uint16_t iPhysicalAddress); - virtual cec_client_version GetClientVersion(void) const { return (cec_client_version)m_configuration.clientVersion; }; - virtual bool StandbyDevices(cec_logical_address address = CECDEVICE_BROADCAST); - virtual bool PowerOnDevices(cec_logical_address address = CECDEVICE_BROADCAST); - - virtual bool SetActiveView(void); - virtual bool SetActiveSource(cec_device_type type = CEC_DEVICE_TYPE_RESERVED); - virtual bool SetDeckControlMode(cec_deck_control_mode mode, bool bSendUpdate = true); - virtual bool SetDeckInfo(cec_deck_info info, bool bSendUpdate = true); - virtual bool SetHDMIPort(cec_logical_address iBaseDevice, uint8_t iPort, bool bForce = false); - 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, bool bSendUpdate = true); - virtual bool SetActiveSource(uint16_t iStreamPath); - virtual bool SwitchMonitoring(bool bEnable); - virtual bool PollDevice(cec_logical_address iAddress); - virtual uint8_t VolumeUp(bool bSendRelease = true); - virtual uint8_t VolumeDown(bool bSendRelease = true); - virtual uint8_t MuteAudio(bool bSendRelease = true); - virtual bool TransmitKeypress(cec_logical_address iDestination, cec_user_control_code key, bool bWait = true); - virtual bool TransmitKeyRelease(cec_logical_address iDestination, bool bWait = true); - virtual bool EnablePhysicalAddressDetection(void); + bool Start(const char *strPort, uint16_t iBaudRate = 38400, uint32_t iTimeoutMs = 10000); + void *Process(void); + void Close(void); + + bool OnCommandReceived(const cec_command &command); + + bool IsMonitoring(void) const { return m_bMonitor; } + CCECBusDevice * GetDeviceByPhysicalAddress(uint16_t iPhysicalAddress, bool bRefresh = false, bool bSuppressPoll = false) const; + CCECBusDevice * GetDeviceByType(cec_device_type type) const; + CCECBusDevice * GetPrimaryDevice(void) const; + cec_version GetDeviceCecVersion(cec_logical_address iAddress); + bool GetDeviceMenuLanguage(cec_logical_address iAddress, cec_menu_language *language); + CStdString GetDeviceName(void) const; + cec_osd_name GetDeviceOSDName(cec_logical_address iAddress); + uint64_t GetDeviceVendorId(cec_logical_address iAddress); + cec_power_status GetDevicePowerStatus(cec_logical_address iAddress); + cec_logical_address GetLogicalAddress(void) const { return m_configuration.logicalAddresses.primary; } + cec_logical_addresses GetLogicalAddresses(void) const { return m_configuration.logicalAddresses; } + cec_logical_addresses GetActiveDevices(void); + uint16_t GetDevicePhysicalAddress(cec_logical_address iAddress); + bool HasLogicalAddress(cec_logical_address address) const { return m_configuration.logicalAddresses.IsSet(address); } + bool IsPresentDevice(cec_logical_address address); + bool IsPresentDeviceType(cec_device_type type); + uint16_t GetPhysicalAddress(void) const; + uint64_t GetLastTransmission(void) const { return m_iLastTransmission; } + cec_logical_address GetActiveSource(void); + bool IsActiveSource(cec_logical_address iAddress); + bool IsInitialised(void); + bool SetStreamPath(uint16_t iPhysicalAddress); + cec_client_version GetClientVersion(void) const { return (cec_client_version)m_configuration.clientVersion; }; + bool StandbyDevices(cec_logical_address address = CECDEVICE_BROADCAST); + bool PowerOnDevices(cec_logical_address address = CECDEVICE_BROADCAST); + + bool SetActiveView(void); + bool SetActiveSource(cec_device_type type = CEC_DEVICE_TYPE_RESERVED); + bool SetDeckControlMode(cec_deck_control_mode mode, bool bSendUpdate = true); + bool SetDeckInfo(cec_deck_info info, bool bSendUpdate = true); + bool SetHDMIPort(cec_logical_address iBaseDevice, uint8_t iPort, bool bForce = false); + bool TransmitInactiveSource(void); + bool SetLogicalAddress(cec_logical_address iLogicalAddress); + bool SetMenuState(cec_menu_state state, bool bSendUpdate = true); + bool SetPhysicalAddress(uint16_t iPhysicalAddress, bool bSendUpdate = true); + bool SetActiveSource(uint16_t iStreamPath); + bool SwitchMonitoring(bool bEnable); + bool PollDevice(cec_logical_address iAddress); + uint8_t VolumeUp(bool bSendRelease = true); + uint8_t VolumeDown(bool bSendRelease = true); + uint8_t MuteAudio(bool bSendRelease = true); + bool TransmitKeypress(cec_logical_address iDestination, cec_user_control_code key, bool bWait = true); + bool TransmitKeyRelease(cec_logical_address iDestination, bool bWait = true); + bool EnablePhysicalAddressDetection(void); void SetStandardLineTimeout(uint8_t iTimeout); void SetRetryLineTimeout(uint8_t iTimeout); - virtual bool GetCurrentConfiguration(libcec_configuration *configuration); - virtual bool SetConfiguration(const libcec_configuration *configuration); - virtual bool CanPersistConfiguration(void); - virtual bool PersistConfiguration(libcec_configuration *configuration); - virtual void RescanActiveDevices(void); + bool GetCurrentConfiguration(libcec_configuration *configuration); + bool SetConfiguration(const libcec_configuration *configuration); + bool CanPersistConfiguration(void); + bool PersistConfiguration(libcec_configuration *configuration); + void RescanActiveDevices(void); bool SetLineTimeout(uint8_t iTimeout); @@ -182,19 +177,19 @@ namespace CEC const char *ToString(const cec_client_version version); const char *ToString(const cec_server_version version); - virtual bool Transmit(const cec_command &data); - virtual void TransmitAbort(cec_logical_address address, cec_opcode opcode, cec_abort_reason reason = CEC_ABORT_REASON_UNRECOGNIZED_OPCODE); + bool Transmit(const cec_command &data); + void TransmitAbort(cec_logical_address address, cec_opcode opcode, cec_abort_reason reason = CEC_ABORT_REASON_UNRECOGNIZED_OPCODE); - virtual bool ChangeDeviceType(cec_device_type from, cec_device_type to); - virtual bool FindLogicalAddresses(void); - virtual bool SetAckMask(uint16_t iMask); + bool ChangeDeviceType(cec_device_type from, cec_device_type to); + bool FindLogicalAddresses(void); + bool SetAckMask(uint16_t iMask); - virtual bool StartBootloader(const char *strPort = NULL); - virtual bool PingAdapter(void); - virtual void HandlePoll(cec_logical_address initiator, cec_logical_address destination); - virtual bool HandleReceiveFailed(cec_logical_address initiator); + bool StartBootloader(const char *strPort = NULL); + bool PingAdapter(void); + void HandlePoll(cec_logical_address initiator, cec_logical_address destination); + bool HandleReceiveFailed(cec_logical_address initiator); - virtual bool GetDeviceInformation(const char *strPort, libcec_configuration *config, uint32_t iTimeoutMs = 10000); + bool GetDeviceInformation(const char *strPort, libcec_configuration *config, uint32_t iTimeoutMs = 10000); bool TransmitPendingActiveSourceCommands(void); diff --git a/src/lib/LibCEC.h b/src/lib/LibCEC.h index e459800..b0853de 100644 --- a/src/lib/LibCEC.h +++ b/src/lib/LibCEC.h @@ -51,63 +51,63 @@ namespace CEC CLibCEC(libcec_configuration *configuration); virtual ~CLibCEC(void); - virtual bool Open(const char *strPort, uint32_t iTimeout = 10000); - virtual void Close(void); - virtual bool EnableCallbacks(void *cbParam, ICECCallbacks *callbacks); - virtual int8_t FindAdapters(cec_adapter *deviceList, uint8_t iBufSize, const char *strDevicePath = NULL); - virtual bool PingAdapter(void); - virtual bool StartBootloader(void); + bool Open(const char *strPort, uint32_t iTimeout = 10000); + void Close(void); + bool EnableCallbacks(void *cbParam, ICECCallbacks *callbacks); + int8_t FindAdapters(cec_adapter *deviceList, uint8_t iBufSize, const char *strDevicePath = NULL); + bool PingAdapter(void); + bool StartBootloader(void); - virtual int8_t GetMinLibVersion(void) const { return CEC_MIN_LIB_VERSION; }; - virtual int8_t GetLibVersionMajor(void) const { return CEC_LIB_VERSION_MAJOR; }; - virtual int8_t GetLibVersionMinor(void) const { return CEC_LIB_VERSION_MINOR; }; + int8_t GetMinLibVersion(void) const { return CEC_MIN_LIB_VERSION; }; + int8_t GetLibVersionMajor(void) const { return CEC_LIB_VERSION_MAJOR; }; + int8_t GetLibVersionMinor(void) const { return CEC_LIB_VERSION_MINOR; }; - virtual bool GetNextLogMessage(cec_log_message *message); - virtual bool GetNextKeypress(cec_keypress *key); - virtual bool GetNextCommand(cec_command *command); + bool GetNextLogMessage(cec_log_message *message); + bool GetNextKeypress(cec_keypress *key); + bool GetNextCommand(cec_command *command); - virtual bool Transmit(const cec_command &data); - virtual bool SetLogicalAddress(cec_logical_address iLogicalAddress = CECDEVICE_PLAYBACKDEVICE1); - virtual bool SetPhysicalAddress(uint16_t iPhysicalAddress = CEC_DEFAULT_PHYSICAL_ADDRESS); + bool Transmit(const cec_command &data); + bool SetLogicalAddress(cec_logical_address iLogicalAddress = CECDEVICE_PLAYBACKDEVICE1); + bool SetPhysicalAddress(uint16_t iPhysicalAddress = CEC_DEFAULT_PHYSICAL_ADDRESS); - virtual bool PowerOnDevices(cec_logical_address address = CECDEVICE_TV); - virtual bool StandbyDevices(cec_logical_address address = CECDEVICE_BROADCAST); - virtual bool SetActiveView(void); - virtual bool SetActiveSource(cec_device_type type = CEC_DEVICE_TYPE_RESERVED); - virtual bool SetDeckControlMode(cec_deck_control_mode mode, bool bSendUpdate = true); - virtual bool SetDeckInfo(cec_deck_info info, bool bSendUpdate = true); - virtual bool SetInactiveView(void); - virtual bool SetMenuState(cec_menu_state state, bool bSendUpdate = true); - virtual bool SetOSDString(cec_logical_address iLogicalAddress, cec_display_control duration, const char *strMessage); - virtual bool SwitchMonitoring(bool bEnable); - virtual cec_version GetDeviceCecVersion(cec_logical_address iAddress); - virtual bool GetDeviceMenuLanguage(cec_logical_address iAddress, cec_menu_language *language); - virtual uint64_t GetDeviceVendorId(cec_logical_address iAddress); - virtual uint16_t GetDevicePhysicalAddress(cec_logical_address iAddress); - virtual cec_power_status GetDevicePowerStatus(cec_logical_address iAddress); - virtual bool PollDevice(cec_logical_address iAddress); - virtual cec_logical_addresses GetActiveDevices(void); - virtual bool IsActiveDevice(cec_logical_address iAddress); - virtual bool IsActiveDeviceType(cec_device_type type); - virtual bool SetHDMIPort(cec_logical_address iBaseDevice, uint8_t iPort = CEC_DEFAULT_HDMI_PORT); - virtual uint8_t VolumeUp(bool bSendRelease = true); - virtual uint8_t VolumeDown(bool bSendRelease = true); - virtual uint8_t MuteAudio(bool bSendRelease = true); - virtual bool SendKeypress(cec_logical_address iDestination, cec_user_control_code key, bool bWait = true); - virtual bool SendKeyRelease(cec_logical_address iDestination, bool bWait = true); - virtual cec_osd_name GetDeviceOSDName(cec_logical_address iAddress); - virtual bool EnablePhysicalAddressDetection(void); - virtual cec_logical_address GetActiveSource(void); - virtual bool IsActiveSource(cec_logical_address iAddress); - virtual bool SetStreamPath(cec_logical_address iAddress); - virtual bool SetStreamPath(uint16_t iPhysicalAddress); - virtual cec_logical_addresses GetLogicalAddresses(void); - virtual bool GetCurrentConfiguration(libcec_configuration *configuration); - virtual bool SetConfiguration(const libcec_configuration *configuration); - virtual bool CanPersistConfiguration(void); - virtual bool PersistConfiguration(libcec_configuration *configuration); - virtual void RescanActiveDevices(void); - virtual bool IsLibCECActiveSource(void); + bool PowerOnDevices(cec_logical_address address = CECDEVICE_TV); + bool StandbyDevices(cec_logical_address address = CECDEVICE_BROADCAST); + bool SetActiveView(void); + bool SetActiveSource(cec_device_type type = CEC_DEVICE_TYPE_RESERVED); + bool SetDeckControlMode(cec_deck_control_mode mode, bool bSendUpdate = true); + bool SetDeckInfo(cec_deck_info info, bool bSendUpdate = true); + bool SetInactiveView(void); + bool SetMenuState(cec_menu_state state, bool bSendUpdate = true); + bool SetOSDString(cec_logical_address iLogicalAddress, cec_display_control duration, const char *strMessage); + bool SwitchMonitoring(bool bEnable); + cec_version GetDeviceCecVersion(cec_logical_address iAddress); + bool GetDeviceMenuLanguage(cec_logical_address iAddress, cec_menu_language *language); + uint64_t GetDeviceVendorId(cec_logical_address iAddress); + uint16_t GetDevicePhysicalAddress(cec_logical_address iAddress); + cec_power_status GetDevicePowerStatus(cec_logical_address iAddress); + bool PollDevice(cec_logical_address iAddress); + cec_logical_addresses GetActiveDevices(void); + bool IsActiveDevice(cec_logical_address iAddress); + bool IsActiveDeviceType(cec_device_type type); + bool SetHDMIPort(cec_logical_address iBaseDevice, uint8_t iPort = CEC_DEFAULT_HDMI_PORT); + uint8_t VolumeUp(bool bSendRelease = true); + uint8_t VolumeDown(bool bSendRelease = true); + uint8_t MuteAudio(bool bSendRelease = true); + bool SendKeypress(cec_logical_address iDestination, cec_user_control_code key, bool bWait = true); + bool SendKeyRelease(cec_logical_address iDestination, bool bWait = true); + cec_osd_name GetDeviceOSDName(cec_logical_address iAddress); + bool EnablePhysicalAddressDetection(void); + cec_logical_address GetActiveSource(void); + bool IsActiveSource(cec_logical_address iAddress); + bool SetStreamPath(cec_logical_address iAddress); + bool SetStreamPath(uint16_t iPhysicalAddress); + cec_logical_addresses GetLogicalAddresses(void); + bool GetCurrentConfiguration(libcec_configuration *configuration); + bool SetConfiguration(const libcec_configuration *configuration); + bool CanPersistConfiguration(void); + bool PersistConfiguration(libcec_configuration *configuration); + void RescanActiveDevices(void); + bool IsLibCECActiveSource(void); const char *ToString(const cec_menu_state state); const char *ToString(const cec_version version); @@ -127,7 +127,7 @@ namespace CEC static uint16_t GetMaskForType(cec_logical_address address); static uint16_t GetMaskForType(cec_device_type type); - virtual bool GetDeviceInformation(const char *strPort, libcec_configuration *config, uint32_t iTimeoutMs = 10000); + bool GetDeviceInformation(const char *strPort, libcec_configuration *config, uint32_t iTimeoutMs = 10000); //@} static void AddLog(const cec_log_level level, const char *strFormat, ...); @@ -136,7 +136,7 @@ namespace CEC static void AddCommand(const cec_command &command); static void ConfigurationChanged(const libcec_configuration &config); static void SetCurrentButton(cec_user_control_code iButtonCode); - virtual void CheckKeypressTimeout(void); + void CheckKeypressTimeout(void); static int MenuStateChanged(const cec_menu_state newState); static void Alert(const libcec_alert type, const libcec_parameter ¶m); diff --git a/src/lib/devices/CECAudioSystem.h b/src/lib/devices/CECAudioSystem.h index de2a0cc..b171a09 100644 --- a/src/lib/devices/CECAudioSystem.h +++ b/src/lib/devices/CECAudioSystem.h @@ -41,17 +41,17 @@ namespace CEC CCECAudioSystem(CCECProcessor *processor, cec_logical_address address, uint16_t iPhysicalAddress = 0); virtual ~CCECAudioSystem(void) {}; - virtual bool SetAudioStatus(uint8_t status); - virtual bool SetSystemAudioModeStatus(const cec_system_audio_status mode); - virtual bool TransmitAudioStatus(cec_logical_address dest); - virtual bool TransmitSetSystemAudioMode(cec_logical_address dest); - virtual bool TransmitSystemAudioModeStatus(cec_logical_address dest); + bool SetAudioStatus(uint8_t status); + bool SetSystemAudioModeStatus(const cec_system_audio_status mode); + bool TransmitAudioStatus(cec_logical_address dest); + bool TransmitSetSystemAudioMode(cec_logical_address dest); + bool TransmitSystemAudioModeStatus(cec_logical_address dest); - virtual uint8_t VolumeUp(bool bSendRelease = true); - virtual uint8_t VolumeDown(bool bSendRelease = true); - virtual uint8_t MuteAudio(bool bSendRelease = true); + uint8_t VolumeUp(bool bSendRelease = true); + uint8_t VolumeDown(bool bSendRelease = true); + uint8_t MuteAudio(bool bSendRelease = true); - virtual bool TransmitActiveSource(void) { return false; } + bool TransmitActiveSource(void) { return false; } protected: cec_system_audio_status m_systemAudioStatus; diff --git a/src/lib/devices/CECPlaybackDevice.h b/src/lib/devices/CECPlaybackDevice.h index c6f26ec..f8a24a1 100644 --- a/src/lib/devices/CECPlaybackDevice.h +++ b/src/lib/devices/CECPlaybackDevice.h @@ -41,13 +41,13 @@ namespace CEC CCECPlaybackDevice(CCECProcessor *processor, cec_logical_address address, uint16_t iPhysicalAddress = 0); virtual ~CCECPlaybackDevice(void) {}; - virtual cec_deck_info GetDeckStatus(void); - virtual cec_deck_control_mode GetDeckControlMode(void); + cec_deck_info GetDeckStatus(void); + cec_deck_control_mode GetDeckControlMode(void); - virtual void SetDeckStatus(cec_deck_info deckStatus); - virtual void SetDeckControlMode(cec_deck_control_mode mode); + void SetDeckStatus(cec_deck_info deckStatus); + void SetDeckControlMode(cec_deck_control_mode mode); - virtual bool TransmitDeckStatus(cec_logical_address dest); + bool TransmitDeckStatus(cec_logical_address dest); protected: cec_deck_info m_deckStatus; diff --git a/src/lib/devices/CECRecordingDevice.h b/src/lib/devices/CECRecordingDevice.h index d453e9c..cb65715 100644 --- a/src/lib/devices/CECRecordingDevice.h +++ b/src/lib/devices/CECRecordingDevice.h @@ -44,13 +44,13 @@ namespace CEC virtual ~CCECRecordingDevice(void) {}; /* playback device methods */ - virtual cec_deck_info GetDeckStatus(void); - virtual cec_deck_control_mode GetDeckControlMode(void); + cec_deck_info GetDeckStatus(void); + cec_deck_control_mode GetDeckControlMode(void); - virtual void SetDeckStatus(cec_deck_info deckStatus); - virtual void SetDeckControlMode(cec_deck_control_mode mode); + void SetDeckStatus(cec_deck_info deckStatus); + void SetDeckControlMode(cec_deck_control_mode mode); - virtual bool TransmitDeckStatus(cec_logical_address dest); + bool TransmitDeckStatus(cec_logical_address dest); /* tuner methods */ //TODO diff --git a/src/lib/implementations/ANCommandHandler.h b/src/lib/implementations/ANCommandHandler.h index d9437d1..567684f 100644 --- a/src/lib/implementations/ANCommandHandler.h +++ b/src/lib/implementations/ANCommandHandler.h @@ -41,9 +41,10 @@ namespace CEC CANCommandHandler(CCECBusDevice *busDevice); virtual ~CANCommandHandler(void) {}; - virtual bool HandleCommand(const cec_command &command); + bool HandleCommand(const cec_command &command); + protected: - virtual bool HandleVendorRemoteButtonDown(const cec_command &command); - virtual bool PowerOn(const cec_logical_address iInitiator, const cec_logical_address iDestination); + bool HandleVendorRemoteButtonDown(const cec_command &command); + bool PowerOn(const cec_logical_address iInitiator, const cec_logical_address iDestination); }; }; diff --git a/src/lib/implementations/RLCommandHandler.h b/src/lib/implementations/RLCommandHandler.h index 944a649..9766827 100644 --- a/src/lib/implementations/RLCommandHandler.h +++ b/src/lib/implementations/RLCommandHandler.h @@ -42,6 +42,6 @@ namespace CEC CRLCommandHandler(CCECBusDevice *busDevice); virtual ~CRLCommandHandler(void) {}; - virtual bool InitHandler(void); + bool InitHandler(void); }; }; diff --git a/src/lib/implementations/SLCommandHandler.h b/src/lib/implementations/SLCommandHandler.h index 6d84ec7..fefb8b3 100644 --- a/src/lib/implementations/SLCommandHandler.h +++ b/src/lib/implementations/SLCommandHandler.h @@ -42,35 +42,35 @@ namespace CEC CSLCommandHandler(CCECBusDevice *busDevice); virtual ~CSLCommandHandler(void) {}; - virtual bool InitHandler(void); - virtual bool ActivateSource(void); + bool InitHandler(void); + bool ActivateSource(void); protected: - virtual bool HandleActiveSource(const cec_command &command); - virtual bool HandleDeviceVendorId(const cec_command &command); - virtual bool HandleVendorCommand(const cec_command &command); + bool HandleActiveSource(const cec_command &command); + bool HandleDeviceVendorId(const cec_command &command); + bool HandleVendorCommand(const cec_command &command); - virtual void HandleVendorCommand01(const cec_command &command); - virtual void TransmitVendorCommand0205(const cec_logical_address iSource, const cec_logical_address iDestination); + void HandleVendorCommand01(const cec_command &command); + void TransmitVendorCommand0205(const cec_logical_address iSource, const cec_logical_address iDestination); - virtual void HandleVendorCommandPowerOn(const cec_command &command); - virtual void HandleVendorCommandPowerOnStatus(const cec_command &command); + void HandleVendorCommandPowerOn(const cec_command &command); + void HandleVendorCommandPowerOnStatus(const cec_command &command); - virtual void HandleVendorCommandSLConnect(const cec_command &command); - virtual void TransmitVendorCommandSetDeviceMode(const cec_logical_address iSource, const cec_logical_address iDestination, const cec_device_type type); + void HandleVendorCommandSLConnect(const cec_command &command); + void TransmitVendorCommandSetDeviceMode(const cec_logical_address iSource, const cec_logical_address iDestination, const cec_device_type type); - virtual bool HandleGiveDevicePowerStatus(const cec_command &command); - virtual bool HandleGiveDeckStatus(const cec_command &command); - virtual bool HandleRequestActiveSource(const cec_command &command); - virtual bool HandleFeatureAbort(const cec_command &command); - virtual bool HandleStandby(const cec_command &command); - virtual bool TransmitMenuState(const cec_logical_address UNUSED(iInitiator), const cec_logical_address UNUSED(iDestination), cec_menu_state UNUSED(menuState)) { return true; } - virtual bool PowerOn(const cec_logical_address iInitiator, const cec_logical_address iDestination); + bool HandleGiveDevicePowerStatus(const cec_command &command); + bool HandleGiveDeckStatus(const cec_command &command); + bool HandleRequestActiveSource(const cec_command &command); + bool HandleFeatureAbort(const cec_command &command); + bool HandleStandby(const cec_command &command); + bool TransmitMenuState(const cec_logical_address UNUSED(iInitiator), const cec_logical_address UNUSED(iDestination), cec_menu_state UNUSED(menuState)) { return true; } + bool PowerOn(const cec_logical_address iInitiator, const cec_logical_address iDestination); - virtual void ResetSLState(void); - virtual bool SLInitialised(void); - virtual void SetSLInitialised(void); - virtual bool ActiveSourceSent(void); + void ResetSLState(void); + bool SLInitialised(void); + void SetSLInitialised(void); + bool ActiveSourceSent(void); bool m_bSLEnabled; bool m_bActiveSourceSent; diff --git a/src/lib/implementations/VLCommandHandler.h b/src/lib/implementations/VLCommandHandler.h index 6770947..d24ea3d 100644 --- a/src/lib/implementations/VLCommandHandler.h +++ b/src/lib/implementations/VLCommandHandler.h @@ -40,11 +40,12 @@ namespace CEC public: CVLCommandHandler(CCECBusDevice *busDevice); virtual ~CVLCommandHandler(void) {}; - virtual bool InitHandler(void); - virtual bool HandleDeviceVendorCommandWithId(const cec_command &command); - virtual bool TransmitActiveSource(const cec_logical_address iInitiator, uint16_t iPhysicalAddress); - virtual bool TransmitPendingActiveSourceCommands(void); + bool InitHandler(void); + + bool HandleDeviceVendorCommandWithId(const cec_command &command); + bool TransmitActiveSource(const cec_logical_address iInitiator, uint16_t iPhysicalAddress); + bool TransmitPendingActiveSourceCommands(void); bool PowerUpEventReceived(void);