From dc1ee96e73016e570fa948e8d9efa946917eb452 Mon Sep 17 00:00:00 2001 From: deva Date: Sat, 4 Mar 2006 15:24:54 +0000 Subject: *** empty log message *** --- client/dv.h | 33 ---------------------------- client/dvfile.cc | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++ client/dvfile.h | 51 +++++++++++++++++++++++++++++++++++++++++++ lib/dv.h | 33 ++++++++++++++++++++++++++++ lib/frame.cc | 2 -- server/dvfile.cc | 60 --------------------------------------------------- server/dvfile.h | 51 ------------------------------------------- server/img_encoder.cc | 2 -- server/miav_server.cc | 4 ++-- server/mov_encoder.cc | 1 - server/server.cc | 2 +- 11 files changed, 147 insertions(+), 152 deletions(-) delete mode 100644 client/dv.h create mode 100644 client/dvfile.cc create mode 100644 client/dvfile.h create mode 100644 lib/dv.h delete mode 100644 server/dvfile.cc delete mode 100644 server/dvfile.h diff --git a/client/dv.h b/client/dv.h deleted file mode 100644 index e346d03..0000000 --- a/client/dv.h +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/*************************************************************************** - * dv.h - * - * Thu Apr 14 19:29:55 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_DV_H__ -#define __MIAV_DV_H__ - -#define DVPACKAGE_SIZE 144000 - -#endif/*__MIAV_DV_H__*/ diff --git a/client/dvfile.cc b/client/dvfile.cc new file mode 100644 index 0000000..7d83255 --- /dev/null +++ b/client/dvfile.cc @@ -0,0 +1,60 @@ +/* -*- 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/client/dvfile.h b/client/dvfile.h new file mode 100644 index 0000000..dc91a14 --- /dev/null +++ b/client/dvfile.h @@ -0,0 +1,51 @@ +/* -*- 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 + +#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/lib/dv.h b/lib/dv.h new file mode 100644 index 0000000..e346d03 --- /dev/null +++ b/lib/dv.h @@ -0,0 +1,33 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/*************************************************************************** + * dv.h + * + * Thu Apr 14 19:29:55 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_DV_H__ +#define __MIAV_DV_H__ + +#define DVPACKAGE_SIZE 144000 + +#endif/*__MIAV_DV_H__*/ diff --git a/lib/frame.cc b/lib/frame.cc index a274d89..568c46b 100644 --- a/lib/frame.cc +++ b/lib/frame.cc @@ -27,8 +27,6 @@ #include #include "frame.h" -#include "debug.h" - #include #include 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 - -#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 -#include "debug.h" - extern "C" { #include } 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 #include -- cgit v1.2.3