summaryrefslogtreecommitdiff
path: root/src/dv1394.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/dv1394.cc')
-rw-r--r--src/dv1394.cc41
1 files changed, 24 insertions, 17 deletions
diff --git a/src/dv1394.cc b/src/dv1394.cc
index 7a0a0ed..d6d86cb 100644
--- a/src/dv1394.cc
+++ b/src/dv1394.cc
@@ -8,29 +8,36 @@
****************************************************************************/
/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This file is part of MIaV.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
+ * MIaV is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * MIaV is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with MIaV; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
+
/*
* $Id$
*/
+
/*
* $Log$
+ * Revision 1.7 2005/05/03 08:31:59 deva
+ * Removed the error object, and replaced it with a more generic info object.
+ *
* Revision 1.6 2005/05/01 09:56:26 deva
* Added Id and Log tags to all files
- *
*/
+
#include <config.h>
#include "dv1394.h"
@@ -112,22 +119,22 @@ static int raw_reader( raw1394handle_t handle, int channel, size_t length, quadl
return 0;
}
-dv1394::dv1394(Error *e, int port, int channel)
+dv1394::dv1394(Info *ginfo, int port, int channel)
{
- errobj = e;
+ info = ginfo;
int n_ports;
struct raw1394_portinfo pinf[ 16 ];
// Get handle to firewire channels
handle = raw1394_new_handle();
if(!handle) {
- errobj->pushError("raw1394 - failed to get handle: %s.", strerror( errno ) );
+ info->error("raw1394 - failed to get handle: %s.", strerror( errno ) );
return;
}
// how many adapters are hooked in?
if((n_ports = raw1394_get_port_info(handle, pinf, 16)) < 0 ) {
- errobj->pushError("raw1394 - failed to get port info: %s.", strerror( errno ) );
+ info->error("raw1394 - failed to get port info: %s.", strerror( errno ) );
raw1394_destroy_handle(handle);
handle = NULL;
return;
@@ -135,7 +142,7 @@ dv1394::dv1394(Error *e, int port, int channel)
// Tell raw1394 which host adapter to use
if(raw1394_set_port(handle, port) < 0 ) {
- errobj->pushError("raw1394 - failed to set port: %s.", strerror( errno ) );
+ info->error("raw1394 - failed to set port: %s.", strerror( errno ) );
raw1394_destroy_handle(handle);
handle = NULL;
return;