cec: set initiator and destination first in cec_command::push_back(). fixes 'tx'...

[deb_libcec.git] / include / cectypes.h

diff --git a/include/cectypes.h b/include/cectypes.h
index eee055264b8fbc7a2854bab53465dc3fd721a4de..e5b7791306b887e03d623decbbd3cd80013482f8 100644 (file)
--- a/include/cectypes.h
+++ b/include/cectypes.h
@@ -37,10 +37,6 @@
 #include <stdint.h>
 #include <string.h>
 
-#if !defined(_WIN32) && !defined(_WIN64)
-#include <stdbool.h>
-#endif
-
 #if !defined(DECLSPEC)
 #if defined(_WIN32) || defined(_WIN64)
 #include <windows.h>
@@ -646,11 +642,11 @@ typedef struct cec_command
 {
   cec_logical_address initiator;
   cec_logical_address destination;
-  bool                ack;
-  bool                eom;
+  int8_t              ack;
+  int8_t              eom;
   cec_opcode          opcode;
   cec_datapacket      parameters;
-  bool                opcode_set;
+  int8_t              opcode_set;
 
 #ifdef __cplusplus
   static void format(cec_command &command, cec_logical_address initiator, cec_logical_address destination, cec_opcode opcode)
@@ -659,14 +655,19 @@ typedef struct cec_command
     command.initiator   = initiator;
     command.destination = destination;
     command.opcode      = opcode;
-    command.opcode_set  = true;
+    command.opcode_set  = 1;
   }
 
   void push_back(uint8_t data)
   {
-    if (!opcode_set)
+    if (initiator == CECDEVICE_UNKNOWN && destination == CECDEVICE_UNKNOWN)
+    {
+      initiator   = (cec_logical_address) (data >> 4);
+      destination = (cec_logical_address) (data & 0xF);
+    }
+    else if (!opcode_set)
     {
-      opcode_set = true;
+      opcode_set = 1;
       opcode = (cec_opcode) data;
     }
     else
@@ -677,9 +678,9 @@ typedef struct cec_command
   {
     initiator   = CECDEVICE_UNKNOWN;
     destination = CECDEVICE_UNKNOWN;
-    ack         = false;
-    eom         = false;
-    opcode_set  = false;
+    ack         = 0;
+    eom         = 0;
+    opcode_set  = 0;
     opcode      = CEC_OPCODE_FEATURE_ABORT;
     parameters.clear();
   };
@@ -700,7 +701,6 @@ typedef enum cec_vendor_id
 #define ESCOFFSET                    3
 #define CEC_MIN_VERSION              6
 #define CEC_LIB_VERSION              7
-#define CEC_SETTLE_DOWN_TIME         1500
 #define CEC_BUTTON_TIMEOUT           500
 
 #ifdef __cplusplus