diff options
Diffstat (limited to 'src/dv1394.h')
| -rw-r--r-- | src/dv1394.h | 38 |
1 files changed, 23 insertions, 15 deletions
diff --git a/src/dv1394.h b/src/dv1394.h index ba8900d..7c24699 100644 --- a/src/dv1394.h +++ b/src/dv1394.h @@ -6,48 +6,56 @@ * Copyright 2005 Bent Bisballe * deva@aasimon.org ****************************************************************************/ + /* - * 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. + * + * 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. * - * 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 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 this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 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.4 2005/05/03 08:31:59 deva + * Removed the error object, and replaced it with a more generic info object. + * * Revision 1.3 2005/05/01 09:56:26 deva * Added Id and Log tags to all files - * */ + #include <config.h> #ifndef __MIAV_DV1394_H__ #define __MIAV_DV1394_H__ #include <libraw1394/raw1394.h> -#include "error.h" +#include "info.h" class dv1394 { public: - dv1394(Error *e = NULL, int port = 0, int channel = 63); // 63 is default channel... sucks. + dv1394(Info* ginfo, int port = 0, int channel = 63); // 63 is default channel... sucks. ~dv1394(); unsigned char *readFrame(); private: raw1394handle_t handle; - Error *errobj; + Info *info; }; #endif/*__MIAV_DV1394_H__*/ |