Merge pull request #51 from warped-rudi/master-updates
authorLars Op den Kamp <opdenkamp@gmail.com>
Wed, 19 Sep 2012 09:39:27 +0000 (02:39 -0700)
committerLars Op den Kamp <opdenkamp@gmail.com>
Wed, 19 Sep 2012 09:39:27 +0000 (02:39 -0700)
Two minor extensions / fixes

include/cectypes.h
src/lib/CECTypeUtils.h
src/testclient/main.cpp

index 2f06aeb15c08375695951b8ee17e2fa04b70e19d..2c78ecae02bd4e64de54626388e1371d90f7a95e 100644 (file)
@@ -643,6 +643,7 @@ typedef enum cec_vendor_id
   CEC_VENDOR_SHARP     = 0x08001F,
   CEC_VENDOR_VIZIO     = 0x6B746D,
   CEC_VENDOR_BROADCOM  = 0x18C086,
+  CEC_VENDOR_LOEWE     = 0x000982,
    
   CEC_VENDOR_UNKNOWN   = 0
 } cec_vendor_id;
index a79163473c6fdac5ad312b66b29e582d91628569..da49f00ed034ab75e3fbf9b9593dd55c6e1d9e0c 100644 (file)
@@ -510,6 +510,8 @@ namespace CEC
         return "Vizio";
       case CEC_VENDOR_BROADCOM:
         return "Broadcom";
+      case CEC_VENDOR_LOEWE:
+        return "Loewe";
       default:
         return "Unknown";
       }
index 84133a931c5b7ceca64591ecdfe85ed646123bd0..707d7d686ac0f36ccb2a219fc0597fe532bc82c1 100644 (file)
@@ -654,7 +654,7 @@ bool ProcessCommandVEN(ICECAdapter *parser, const string &command, string &argum
       if (iDev >= 0 && iDev < 15)
       {
         uint64_t iVendor = parser->GetDeviceVendorId((cec_logical_address) iDev);
-        PrintToStdOut("vendor id: %06x", iVendor);
+        PrintToStdOut("vendor id: %06llx", iVendor);
         return true;
       }
     }