From 1390ddfe6afe41dba141f8170f9b277573ebe8cd Mon Sep 17 00:00:00 2001
From: deva <deva>
Date: Tue, 7 Mar 2006 10:37:59 +0000
Subject: *** empty log message ***

---
 client/dv1394.cc | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'client/dv1394.cc')

diff --git a/client/dv1394.cc b/client/dv1394.cc
index 270da2e..611d815 100644
--- a/client/dv1394.cc
+++ b/client/dv1394.cc
@@ -40,7 +40,7 @@
 #include <fcntl.h>
 #include <errno.h>
 
-
+#include "info.h"
 
 /**
  * Callback function for the firewire interface.
@@ -107,9 +107,8 @@ static int raw_reader( raw1394handle_t handle, int channel, size_t length, quadl
 	return 0;
 }
 
-dv1394::dv1394(Info *i, int p, int c)
+dv1394::dv1394(int p, int c)
 {
-  info = i;
   port = p;
   channel = c;
 }
@@ -128,13 +127,13 @@ bool dv1394::connect()
   // Get handle to firewire channels
 	handle = raw1394_new_handle();
 	if(!handle) {
-    info->error("raw1394 - failed to get handle: %s.", strerror( errno ) );
+    gInfo::info->error("raw1394 - failed to get handle: %s.", strerror( errno ) );
     return false;
 	}
 
   // how many adapters are hooked in?
 	if((n_ports = raw1394_get_port_info(handle, pinf, 16)) < 0 ) {
-    info->error("raw1394 - failed to get port info: %s.", strerror( errno ) );
+    gInfo::info->error("raw1394 - failed to get port info: %s.", strerror( errno ) );
     raw1394_destroy_handle(handle);
     handle = NULL;
     return false;
@@ -142,7 +141,7 @@ bool dv1394::connect()
 
 	// Tell raw1394 which host adapter to use
 	if(raw1394_set_port(handle, port) < 0 ) {
-    info->error("raw1394 - failed to set port: %s.", strerror( errno ) );
+    gInfo::info->error("raw1394 - failed to set port: %s.", strerror( errno ) );
     raw1394_destroy_handle(handle);
     handle = NULL;
     return false;
-- 
cgit v1.2.3