6 files changed, 3 insertions, 117 deletions
diff --git a/server/dvfile.cc b/server/dvfile.cc
deleted file mode 100644
index 7d83255..0000000
--- a/server/dvfile.cc
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/***************************************************************************
- *            dvfile.cc
- *
- *  Thu Jul 28 17:30:48 CEST 2005
- *  Copyright  2005 Bent Bisballe
- *  deva@aasimon.org
- ****************************************************************************/
-
-/*
- *  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.
- *
- *  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.
- */
-#include "config.h"
-#include "dvfile.h"
-
-#include "dv.h"
-#include "util.h"
-
-dvfile::dvfile(Info* i)
-{
-  info = i;
-  fp = fopen(TEST_MOVIE, "r");
-  if(!fp) info->error("Couldn't open %s for reading.", TEST_MOVIE);
-}
-
-dvfile::~dvfile()
-{
-  fclose(fp);
-}
-
-unsigned char *dvfile::readFrame()
-{
-  unsigned char *frame = new unsigned char[DVPACKAGE_SIZE];
-
-  sleep_1_frame();
-
-  if(fp) {
-    while(fread(frame, DVPACKAGE_SIZE, 1, fp) == 0) {
-      fseek(fp, 0L, SEEK_SET);
-    }
-  } else {
-    memset(frame, 0, sizeof(frame));
-  }
-  
-  return frame;
-}
diff --git a/server/dvfile.h b/server/dvfile.h
deleted file mode 100644
index dc91a14..0000000
--- a/server/dvfile.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/***************************************************************************
- *            dvfile.h
- *
- *  Thu Jul 28 17:30:48 CEST 2005
- *  Copyright  2005 Bent Bisballe
- *  deva@aasimon.org
- ****************************************************************************/
-
-/*
- *  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.
- *
- *  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.
- */
-#include "config.h"
-#ifndef __MIAV_DVFILE_H__
-#define __MIAV_DVFILE_H__
-
-#include "frame_stream.h"
-
-#include <stdio.h>
-
-#include "info.h"
-
-#define TEST_MOVIE     PIXMAPS"/dummy.dv"
-
-class dvfile : public frame_stream {
-public:
-  dvfile(Info* info);
-  ~dvfile();
-
-  unsigned char *readFrame();
-
-private:
-  Info* info;
-  FILE* fp;
-};
-
-#endif/*__MIAV_DVFILE_H__*/
diff --git a/server/img_encoder.cc b/server/img_encoder.cc
index 9282dc0..bb36009 100644
--- a/server/img_encoder.cc
+++ b/server/img_encoder.cc
@@ -35,8 +35,6 @@
 #include "img_encoder.h"
 #include <stdio.h>
 
-#include "debug.h"
-
 extern "C" {
 #include <jpeglib.h>
 }
diff --git a/server/miav_server.cc b/server/miav_server.cc
index 88a0d2a..5b5a29d 100644
--- a/server/miav_server.cc
+++ b/server/miav_server.cc
@@ -1,9 +1,9 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /***************************************************************************
- *            miav.cc
+ *            miav_server.cc
  *
  *  Sat Aug 21 17:32:24 2004
- *  Copyright  2004  deva
+ *  Copyright  2004  Bent Bisballe Nyeng
  *  deva@aasimon.org
  ****************************************************************************/
 
diff --git a/server/mov_encoder.cc b/server/mov_encoder.cc
index 6ac5876..0c97e18 100644
--- a/server/mov_encoder.cc
+++ b/server/mov_encoder.cc
@@ -41,7 +41,6 @@
 
 #include "miav_config.h"
 
-#include "debug.h"
 #include "libfame_wrapper.h"
 
 MovEncoder::MovEncoder(volatile bool *r, sem_t *r_sem,
diff --git a/server/server.cc b/server/server.cc
index 34aac7b..e306cf1 100644
--- a/server/server.cc
+++ b/server/server.cc
@@ -25,7 +25,7 @@
  *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
  */
 #include "server.h"
-#include "miav.h"
+#include "miav_server.h"
 
 #include <stdio.h>
 #include <stdlib.h>