Removed the error object, and replaced it with a more generic info object.

1 files changed, 34 insertions, 16 deletions

diff --git a/src/decoder.cc b/src/decoder.cc
index 34c0185..2c68935 100644
--- a/src/decoder.cc
+++ b/src/decoder.cc
@@ -1,30 +1,47 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/***************************************************************************
+ *            decoder.cc
+ *
+ *  Sat Feb 19 17:05:43 CET 2005
+ *  Copyright  2005 Bent Bisballe
+ *  deva@aasimon.org
+ ****************************************************************************/
+
 /*
+ * Originally from:
  * RTVideoRec Realtime video recoder and encoder for Linux
  *
- * Copyright (C) 2004  Bent Bisballe
  * Copyright (C) 2004  B. Stultiens
  * Copyright (C) 2004  Koen Otter and Glenn van der Meyden
+ */
+
+/*
+ *    This file is part of MIaV.
  *
- * 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.
+ *    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 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.27  2005/05/03 08:31:59  deva
+ * Removed the error object, and replaced it with a more generic info object.
+ *
  * Revision 1.26  2005/05/02 14:06:55  deva
  * Added unfreeze to decoder (called from camera).
  *
@@ -44,8 +61,8 @@
  *
  * Revision 1.21  2005/05/01 09:56:26  deva
  * Added Id and Log tags to all files
- *
  */
+
 #include <config.h>
 #ifdef USE_GUI
 /*
@@ -69,7 +86,7 @@
 #include "decoder.h"
 #include "debug.h"
 
-Decoder::Decoder(Error* err,
+Decoder::Decoder(Info *ginfo,
                  sem_t *gencode_sem,
                  sem_t *gplayer_sem,
                  Queue<Frame> *gencode_queue,
@@ -77,7 +94,8 @@ Decoder::Decoder(Error* err,
                  pthread_mutex_t *gmutex,
                  volatile int *grunning)
 {
-  errobj = err;
+  info = ginfo;
+
   encode_sem = gencode_sem;
   player_sem = gplayer_sem;
   encode_queue = gencode_queue;
@@ -104,7 +122,7 @@ void Decoder::decode()
   bool local_freeze;
   bool local_record;
 
-  dv1394 dv_stream = dv1394(errobj); // Use default port and channel.
+  dv1394 dv_stream = dv1394(info); // Use default port and channel.
 
   while(*running) {
     uint8_t *ptr;