From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Tue, 29 Nov 2011 00:09:37 +0000 (+0100)
Subject: cec: added vendor id for Yamaha
X-Git-Tag: upstream/2.2.0~1^2~44^2~79
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=f46dc8465450028c44c7cb0c253ab8b06dc1bcf4;p=deb_libcec.git

cec: added vendor id for Yamaha
---

diff --git a/include/cectypes.h b/include/cectypes.h
index ede11f4..6f29921 100644
--- a/include/cectypes.h
+++ b/include/cectypes.h
@@ -598,6 +598,7 @@ typedef enum cec_vendor_id
   CEC_VENDOR_PANASONIC = 0x8045,
   CEC_VENDOR_PIONEER   = 0xE036,
   CEC_VENDOR_ONKYO     = 0x09B0,
+  CEC_VENDOR_YAMAHA    = 0xA0DE,
   CEC_VENDOR_UNKNOWN   = 0
 } cec_vendor_id;
 
diff --git a/src/lib/implementations/CECCommandHandler.cpp b/src/lib/implementations/CECCommandHandler.cpp
index 9debd5d..f1c13b6 100644
--- a/src/lib/implementations/CECCommandHandler.cpp
+++ b/src/lib/implementations/CECCommandHandler.cpp
@@ -917,6 +917,8 @@ const char *CCECCommandHandler::ToString(const cec_vendor_id vendor)
     return "Pioneer";
   case CEC_VENDOR_ONKYO:
     return "Onkyo";
+  case CEC_VENDOR_YAMAHA:
+    return "Yamaha";
   default:
     return "Unknown";
   }
diff --git a/src/testclient/main.cpp b/src/testclient/main.cpp
index 0a7a9be..1fbff3d 100644
--- a/src/testclient/main.cpp
+++ b/src/testclient/main.cpp
@@ -740,7 +740,7 @@ int main (int argc, char *argv[])
           cec_logical_addresses addresses = parser->GetActiveDevices();
           for (uint8_t iPtr = 0; iPtr < 16; iPtr++)
             if (addresses[iPtr])
-              cout << "logical address " << iPtr << endl;
+              cout << "logical address " << (int)iPtr << endl;
         }
         else if (command == "ad")
         {