Ticket #2722: libavc1394-0.5.3-int-changer.diff

libs/libmythtv/firewirechannel.cpp

@@ -16 +16 @@
 #define LOC QString("FireChan: ")
 #define LOC_ERR QString("FireChan, Error: ")
 
-#ifndef AVC1394_PANEL_COMMAND_PASS_THROUGH
-#define AVC1394_PANEL_COMMAND_PASS_THROUGH     0x000007C00
-#endif
-
-#ifndef AVC1394_PANEL_OPERATION_0
-#define AVC1394_PANEL_OPERATION_0              0x000000020
-#endif
-
 #define DCT6200_CMD0  (AVC1394_CTYPE_CONTROL | \
                        AVC1394_SUBUNIT_TYPE_PANEL | \
                        AVC1394_SUBUNIT_ID_0 | \
@@ -104 +96 @@
             quadlet_t cmd[2] =  { DCT6200_CMD0 | dig[i], 0x0, };
             if (!avc1394_transaction_block(fwhandle, fw_opts.node, cmd, 2, 1))
             {
+                 avc1394_transaction_block_close(fwhandle);
                  VERBOSE(VB_IMPORTANT, "AVC transaction failed.");
                  return false;
             }
+            avc1394_transaction_block_close(fwhandle);
             usleep(500000);
         }
     }
@@ -132 +126 @@
 
         if(!avc1394_transaction_block(fwhandle, fw_opts.node, cmd, 3, 1))
         {
+            avc1394_transaction_block_close(fwhandle);
             VERBOSE(VB_IMPORTANT, "AVC transaction failed.");
             return false;
         }
+        avc1394_transaction_block_close(fwhandle);
 
         cmd[0] = SA3250_CMD0 | AVC1394_SA3250_OPERAND_KEY_RELEASE;
         cmd[1] = SA3250_CMD1 | (dig[0] << 16) | (dig[1] << 8) | dig[2];
@@ -149 +145 @@
 
         if (!avc1394_transaction_block(fwhandle, fw_opts.node, cmd, 3, 1))
         {
+            avc1394_transaction_block_close(fwhandle);
             VERBOSE(VB_IMPORTANT, "AVC transaction failed.");
             return false;
         }
+        avc1394_transaction_block_close(fwhandle);
     }
     else if (fw_opts.model == "SA4200HD")
     {
@@ -170 +168 @@
 
         if (!avc1394_transaction_block(fwhandle, fw_opts.node, cmd, 3, 1))
         {
+            avc1394_transaction_block_close(fwhandle);
             VERBOSE(VB_IMPORTANT, "AVC transaction failed.");
             return false;
         }
+        avc1394_transaction_block_close(fwhandle);
     }
-
     return true;
 }
 
@@ -229 +228 @@
         if (rval)
         {
             response = rval[0];
+            avc1394_transaction_block_close(fwhandle);
 
             if (AVC1394_MASK_RESPONSE(response) == AVC1394_RESPONSE_ACCEPTED)
             {
@@ -254 +254 @@
         }
         else
         {
+            avc1394_transaction_block_close(fwhandle);
             VERBOSE(VB_IMPORTANT, LOC + "Power on cmd failed (no response)");
             return false;
         }
@@ -278 +279 @@
     if (rval)
     {
         response = rval[0];
+        avc1394_transaction_block_close(fwhandle);
 
         if (AVC1394_MASK_RESPONSE(response) == AVC1394_RESPONSE_IMPLEMENTED)
         {
@@ -309 +311 @@
             return Failed;
         }
     }
+    avc1394_transaction_block_close(fwhandle);
     VERBOSE(VB_CHANNEL, LOC + "Failed to get STB Power State");
     return Failed;
 }