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

1 files changed, 33 insertions, 16 deletions

diff --git a/src/encoder.h b/src/encoder.h
index 80552ef..2054f92 100644
--- a/src/encoder.h
+++ b/src/encoder.h
@@ -1,29 +1,46 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/***************************************************************************
+ *            encoder.h
+ *
+ *  Thu Apr 14 19:29:55 CEST 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 10:35:23  deva
  * Fixed wrongly showed snapshot thumbnails.
  *
@@ -38,15 +55,15 @@
  *
  * Revision 1.7  2005/05/01 09:56:26  deva
  * Added Id and Log tags to all files
- *
  */
+
 #include <config.h>
 #ifdef USE_GUI
 
 #ifndef __RTVIDEOREC_ENCODER_H
 #define __RTVIDEOREC_ENCODER_H
 
-#include "error.h"
+#include "info.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -70,7 +87,7 @@
  */
 class Encoder : public Thread {
 public:
-  Encoder(Error* err,
+  Encoder(Info* ginfo,
           const char *gip,
           const int gport,
           sem_t	*gsem,
@@ -96,7 +113,7 @@ public:
   volatile int *running;
 
 private:
-  Error *errobj;
+  Info *info;
   
   int port;
   char ip[32];