Fixed compiler warnings, updated INSTALL, deleted unused files

6 files changed, 6 insertions, 290 deletions

diff --git a/INSTALL b/INSTALL
index 02a4a07..1884de9 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,167 +1,13 @@
 Basic Installation
 ==================
 
-   These are generic installation instructions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, a file
-`config.cache' that saves the results of its tests to speed up
-reconfiguring, and a file `config.log' containing compiler output
-(useful mainly for debugging `configure').
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If at some point `config.cache'
-contains results you don't want to keep, you may remove or edit it.
-
-   The file `configure.in' is used to create `configure' by a program
-called `autoconf'.  You only need `configure.in' if you want to change
-it or regenerate `configure' using a newer version of `autoconf'.
-
 The simplest way to compile this package is:
 
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
-
-     Running `configure' takes a while.  While running, it prints some
-     messages telling which features it is checking for.
+  1. Type `make' to compile the package.
 
-  2. Type `make' to compile the package.
-
-  3. Type `make install' to install the programs and any data files and
+  2. Type `make install' to install the programs and any data files and
      documentation.
 
-  4. You can remove the program binaries and object files from the
+  3. You can remove the program binaries and object files from the
      source code directory by typing `make clean'.  
 
-Compilers and Options
-=====================
-
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  You can give `configure'
-initial values for variables by setting them in the environment.  Using
-a Bourne-compatible shell, you can do that on the command line like
-this:
-     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
-
-Or on systems that have the `env' program, you can do it like this:
-     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
-
-Compiling For Multiple Architectures
-====================================
-
-   You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   If you have to use a `make' that does not supports the `VPATH'
-variable, you have to compile the package for one architecture at a time
-in the source code directory.  After you have installed the package for
-one architecture, use `make distclean' before reconfiguring for another
-architecture.
-
-Installation Names
-==================
-
-   By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc.  You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-   There may be some features `configure' can not figure out
-automatically, but needs to determine by the type of host the package
-will run on.  Usually `configure' can figure that out, but if it prints
-a message saying it can not guess the host type, give it the
-`--host=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name with three fields:
-     CPU-COMPANY-SYSTEM
-
-See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the host type.
-
-   If you are building compiler tools for cross-compiling, you can also
-use the `--target=TYPE' option to select the type of system they will
-produce code for and the `--build=TYPE' option to select the type of
-system on which you are compiling the package.
-
-Sharing Defaults
-================
-
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Operation Controls
-==================
-
-   `configure' recognizes the following options to control how it
-operates.
-
-`--cache-file=FILE'
-     Use and save the results of the tests in FILE instead of
-     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
-     debugging `configure'.
-
-`--help'
-     Print a summary of the options to `configure', and exit.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`--version'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`configure' also accepts some other, not widely useful, options.
-
diff --git a/common.cpp b/common.cpp
deleted file mode 100644
index d8549e5..0000000
--- a/common.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * common.cpp: A plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- * $Id$
- */
-
-#include "common.h"
-
-cMarkAdCommon::cMarkAdCommon(int RecvNumber,MarkAdContext *maContext)
-{
-    macontext=maContext;
-    recvnumber=RecvNumber;
-    mark.Comment=NULL;
-    mark.Position=0;
-}
-
-cMarkAdCommon::~cMarkAdCommon()
-{
-    ResetMark();
-}
-
-void cMarkAdCommon::ResetMark()
-{
-    if (mark.Comment) free(mark.Comment);
-    mark.Comment=NULL;
-    mark.Position=0;
-}
-
-bool cMarkAdCommon::AddMark(int Position, const char *Comment)
-{
-    if (!Comment) return false;
-    if (mark.Comment)
-    {
-        int oldlen=strlen(mark.Comment);
-        mark.Comment=(char *) realloc(mark.Comment,oldlen+10+strlen(Comment));
-        if (!mark.Comment)
-        {
-            mark.Position=0;
-            return false;
-        }
-        strcat(mark.Comment," [");
-        strcat(mark.Comment,Comment);
-        strcat(mark.Comment,"]");
-    }
-    else
-    {
-        mark.Comment=strdup(Comment);
-    }
-    mark.Position=Position;
-    return true;
-}
-
-void cMarkAdCommon::SetTimerMarks(int LastIFrame)
-{
-    if (!macontext) return;
-    if (!LastIFrame) return;
-
-    if ((time(NULL)>macontext->General.StartTime) && (!macontext->State.ContentStarted))
-    {
-        char *buf=NULL;
-        if (asprintf(&buf,"start of %s content (%i)",
-                 macontext->General.ManualRecording ? "user" : "event",LastIFrame)!=-1)
-        {
-            isyslog("markad [%i]: %s",recvnumber,buf);
-            AddMark(LastIFrame,buf);
-            free(buf);
-        }
-        macontext->State.ContentStarted=LastIFrame;
-    }
-
-    if ((time(NULL)>macontext->General.EndTime) &&
-            (macontext->State.ContentStarted) && (!macontext->State.ContentStopped))
-    {
-        char *buf=NULL;
-        if (asprintf(&buf,"stop of %s content (%i)",
-                 macontext->General.ManualRecording ? "user" : "event",LastIFrame)!=-1)
-        {
-            isyslog("markad [%i]: %s",recvnumber,buf);
-            AddMark(LastIFrame,buf);
-            free(buf);
-        }
-        macontext->State.ContentStopped=LastIFrame;
-    }
-}
-
-MarkAdMark *cMarkAdCommon::Process(int LastIFrame)
-{
-    ResetMark();
-    if (!LastIFrame) return NULL;
-    SetTimerMarks(LastIFrame);
-    return &mark;
-}
diff --git a/common.h b/common.h
deleted file mode 100644
index 8a61879..0000000
--- a/common.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * common.h: A plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- * $Id$
- */
-
-#ifndef __common_h_
-#define __common_h_
-
-#include <vdr/tools.h> // needed for (d/e/i)syslog
-
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#include "global.h"
-
-class cMarkAdCommon
-{
-private:
-    int recvnumber;
-    MarkAdContext *macontext;
-    MarkAdMark mark;
-
-    void ResetMark();
-    bool AddMark(int Position, const char *Comment);
-    void SetTimerMarks(int LastIFrame);
-public:
-    MarkAdMark *Process(int LastIFrame);
-    cMarkAdCommon(int RecvNumber,MarkAdContext *maContext);
-    ~cMarkAdCommon();
-};
-
-#endif
\ No newline at end of file
diff --git a/demux.cpp b/demux.cpp
index 672e046..0b847ea 100644
--- a/demux.cpp
+++ b/demux.cpp
@@ -129,7 +129,7 @@ int cMarkAdDemux::Process(MarkAdPid Pid, uchar *Data, int Count, uchar **Pkt, in
 
     uchar *in=NULL;
     int inlen=0;
-    int retval;
+    int retval=0;
 
     if (!pause)
     {
diff --git a/queue.cpp b/queue.cpp
index 5465168..64196dd 100644
--- a/queue.cpp
+++ b/queue.cpp
@@ -74,7 +74,7 @@ bool cMarkAdPaketQueue::Put(uchar *Data, int Size)
     memcpy(&buffer[inptr],Data,Size);
     inptr+=Size;
 
-    int npercent=((double) inptr/(double) maxqueue)*100;
+    int npercent=(int) ((double) inptr/(double) maxqueue)*100;
 
     if ((npercent>90) && (name) && (npercent!=percent))
     {
diff --git a/ts2pkt.cpp b/ts2pkt.cpp
index de03992..64c2bbe 100644
--- a/ts2pkt.cpp
+++ b/ts2pkt.cpp
@@ -122,7 +122,7 @@ void cMarkAdTS2Pkt::Process(MarkAdPid Pid, uchar *TSData, int TSSize, uchar **Pk
 
         if ((counter!=-1) && (((counter+1) & 0xF)!=tshdr->Counter))
         {
-            if (counter==tshdr->Counter)
+            if (counter==(int) tshdr->Counter)
             {
                 // duplicate paket -> just ignore
                 return;