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

1 files changed, 33 insertions, 16 deletions

diff --git a/src/decoder.h b/src/decoder.h
index a2c4ad8..68247f8 100644
--- a/src/decoder.h
+++ b/src/decoder.h
@@ -1,29 +1,46 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/***************************************************************************
+ *            decoder.h
+ *
+ *  Sat Feb 19 17:05:42 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
+ */
+
+/*
+ *    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.12  2005/05/03 08:31:59  deva
+ * Removed the error object, and replaced it with a more generic info object.
+ *
  * Revision 1.11  2005/05/02 14:06:55  deva
  * Added unfreeze to decoder (called from camera).
  *
@@ -35,15 +52,15 @@
  *
  * Revision 1.8  2005/05/01 09:56:26  deva
  * Added Id and Log tags to all files
- *
  */
+
 #include <config.h>
 #ifdef USE_GUI
 
 #ifndef __RTVIDEOREC_DECODER_H
 #define __RTVIDEOREC_DECODER_H
 
-#include "error.h"
+#include "info.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -58,7 +75,7 @@
 
 class Decoder : public Thread {
 public:
-  Decoder(Error* err,
+  Decoder(Info *ginfo,
           sem_t *gencode_sem,
           sem_t *gplayer_sem,
           Queue<Frame> *gencode_queue,
@@ -84,7 +101,7 @@ private:
   volatile bool b_shoot;
   volatile bool b_record;
 
-  Error *errobj;
+  Info *info;
   AVCodecContext dvcodec;
 
   sem_t *encode_sem;