From a7bed6602683b281251acfa62308dfa7ec6e8adb Mon Sep 17 00:00:00 2001 From: Lars Op den Kamp Date: Thu, 10 Nov 2011 18:30:00 +0100 Subject: [PATCH] cec: removed the old SetVendorId() from the header and fix device class after faa9cb584b3e49c115e0837d10495f46fea631e0 --- src/lib/devices/CECBusDevice.h | 1 - src/lib/implementations/CECCommandHandler.cpp | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/lib/devices/CECBusDevice.h b/src/lib/devices/CECBusDevice.h index 0a04bd7..44b0a2f 100644 --- a/src/lib/devices/CECBusDevice.h +++ b/src/lib/devices/CECBusDevice.h @@ -75,7 +75,6 @@ namespace CEC virtual void SetStreamPath(uint16_t iNewAddress, uint16_t iOldAddress = 0); virtual void SetCecVersion(const cec_version newVersion); virtual void SetMenuLanguage(const cec_menu_language &menuLanguage); - virtual void SetVendorId(const cec_datapacket &data); virtual void SetVendorId(uint64_t iVendorId, uint8_t iVendorClass = 0); virtual void SetPowerStatus(const cec_power_status powerStatus); diff --git a/src/lib/implementations/CECCommandHandler.cpp b/src/lib/implementations/CECCommandHandler.cpp index 122c4be..65ec3e5 100644 --- a/src/lib/implementations/CECCommandHandler.cpp +++ b/src/lib/implementations/CECCommandHandler.cpp @@ -397,7 +397,6 @@ CCECBusDevice *CCECCommandHandler::GetDeviceByPhysicalAddress(uint16_t iPhysical return device; } - void CCECCommandHandler::SetVendorId(const cec_command &command) { if (command.parameters.size < 3) @@ -412,5 +411,5 @@ void CCECCommandHandler::SetVendorId(const cec_command &command) CCECBusDevice *device = GetDevice((cec_logical_address) command.initiator); if (device) - device->SetVendorId(iVendorId, iVendorId); + device->SetVendorId(iVendorId, command.parameters.size > 3 ? command.parameters[3] : 0); } -- 2.34.1