cec: removed the old SetVendorId() from the header and fix device class after faa9cb5...

diff --git a/src/lib/devices/CECBusDevice.h b/src/lib/devices/CECBusDevice.h
index 0a04bd70fd20f34f3ffb21d255a36581c4cf69d8..44b0a2ffcac0699f89fbc8baf5f1ed300d7c3366 100644 (file)
--- 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 122c4be1c51e2eaedbc681b9c5b2a163992e67c2..65ec3e5ce2073f161c07f67b6711cfd086cdfeea 100644 (file)
--- 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);
 }