summaryrefslogtreecommitdiff
path: root/client/dv1394.cc
diff options
context:
space:
mode:
authordeva <deva>2006-03-07 10:37:59 +0000
committerdeva <deva>2006-03-07 10:37:59 +0000
commit1390ddfe6afe41dba141f8170f9b277573ebe8cd (patch)
treefd6861f3eab3a4721f2445540279a8223d7cd1a3 /client/dv1394.cc
parent19ade36987f86c9b4cd4c5ec3fc6c499205c61ec (diff)
*** empty log message ***
Diffstat (limited to 'client/dv1394.cc')
-rw-r--r--client/dv1394.cc11
1 files changed, 5 insertions, 6 deletions
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;