From 7ed2883604e3e7e910e043a69a2ab91e890dc638 Mon Sep 17 00:00:00 2001
From: Lars Hanisch <dvb@flensrocker.de>
Date: Sat, 12 Feb 2011 22:11:13 +0100
Subject: remove videodev.h and other unneeded headers

---
 common.h       | 17 +----------------
 device.c       |  1 -
 device.h       |  2 --
 filter.h       |  3 ---
 menu.c         |  4 ----
 menu.h         |  2 --
 pvrinput.h     |  2 --
 reader.h       |  2 --
 setup.h        |  2 --
 sourceparams.h |  2 --
 submenu.c      |  2 +-
 submenu.h      |  3 ---
 12 files changed, 2 insertions(+), 40 deletions(-)

diff --git a/common.h b/common.h
index 56194b9..1751a68 100644
--- a/common.h
+++ b/common.h
@@ -3,32 +3,16 @@
 
 enum eLogLevel { pvrUNUSED, pvrERROR, pvrINFO, pvrDEBUG1, pvrDEBUG2, pvrDEBUG3 };
 
-#include <string>
-#include <strings.h>
-#include <linux/types.h>
-#include <linux/videodev.h>
 #include <linux/videodev2.h>
-
 #include <sys/ioctl.h>
-#include <sys/time.h>
-
 #include <stdarg.h>
-#include <time.h>
-#include <stdio.h>
 
-#include <vdr/osd.h>
-#include <vdr/plugin.h>
-#include <vdr/channels.h>
-#include <vdr/sources.h>
-#include <vdr/device.h>
 #include <vdr/plugin.h>
 #if VDRVERSNUM > 10712
 #include <vdr/sourceparams.h>
 #define PVR_SOURCEPARAMS
 #endif
 
-
-
 #include "setup.h"
 #include "filter.h"
 #include "device.h"
@@ -36,6 +20,7 @@ enum eLogLevel { pvrUNUSED, pvrERROR, pvrINFO, pvrDEBUG1, pvrDEBUG2, pvrDEBUG3 }
 #include "reader.h"
 #include "pvrinput.h"
 #include "menu.h"
+#include "submenu.h"
 #include "sourceparams.h"
 
 #if VDRVERSNUM < 10507
diff --git a/device.c b/device.c
index a80740e..6adbcd3 100755
--- a/device.c
+++ b/device.c
@@ -1,6 +1,5 @@
 #include "common.h"
 #include <linux/dvb/video.h>
-#include <stdlib.h>
 
 char DRIVERNAME[][15] = {
   "undef", "ivtv", "cx18", "pvrusb2", "cx88_blackbird", "hdpvr"
diff --git a/device.h b/device.h
index 9210f79..ebaf8c9 100755
--- a/device.h
+++ b/device.h
@@ -1,8 +1,6 @@
 #ifndef _PVRINPUT_DEVICE_H_
 #define _PVRINPUT_DEVICE_H_
 
-#include "common.h"
-
 typedef enum { /* enumeration with encoder states */
   eStop,
   eStart,
diff --git a/filter.h b/filter.h
index 35eee1f..7c14805 100644
--- a/filter.h
+++ b/filter.h
@@ -1,9 +1,6 @@
 #ifndef _PVRINPUT_FILTER_H_
 #define _PVRINPUT_FILTER_H_
 
-#include <vdr/filter.h>
-
-
 class cPvrSectionFilter : public cListObject {
   friend class cPvrSectionHandler;
 private:
diff --git a/menu.c b/menu.c
index 510c980..7db50c2 100644
--- a/menu.c
+++ b/menu.c
@@ -25,11 +25,7 @@
  *                                                                         *
  ***************************************************************************/
 
-/*uncomment the following line to allow setting of PvrSetup.UseOnlyCard
-and StreamType.value via OSD menu (see README) */
-
 #include "common.h"
-#include "submenu.h"
 
 cPvrMenuSetup::cPvrMenuSetup()
 {
diff --git a/menu.h b/menu.h
index 1805dd1..b16cd0e 100644
--- a/menu.h
+++ b/menu.h
@@ -28,8 +28,6 @@
 #ifndef _PVRINPUT_MENU_H_
 #define _PVRINPUT_MENU_H_
 
-#include "common.h"
-
 typedef enum {
   ePicPropBrightness = 0,
   ePicPropContrast,
diff --git a/pvrinput.h b/pvrinput.h
index 289d6ad..50e0fbe 100644
--- a/pvrinput.h
+++ b/pvrinput.h
@@ -1,8 +1,6 @@
 #ifndef _PVRINPUT_PLUGIN_H_
 #define _PVRINPUT_PLUGIN_H_
 
-#include "common.h"
-
 class cPluginPvrInput : public cPlugin {
 private:
 public:
diff --git a/reader.h b/reader.h
index 36b8b2e..8afd0aa 100644
--- a/reader.h
+++ b/reader.h
@@ -1,8 +1,6 @@
 #ifndef _PVRINPUT_READER_H_
 #define _PVRINPUT_READER_H_
 
-#include "common.h"
-
 class cPvrReadThread : public cThread {
 private:
   cPvrDevice *parent;
diff --git a/setup.h b/setup.h
index 1efecf3..0942fa3 100644
--- a/setup.h
+++ b/setup.h
@@ -1,8 +1,6 @@
 #ifndef _PVRINPUT_SETUP_H_
 #define _PVRINPUT_SETUP_H_
 
-#include "common.h"
-
 struct valSet {
   v4l2_queryctrl queryctrl;
   int value;
diff --git a/sourceparams.h b/sourceparams.h
index 9af66cb..f1b3dce 100644
--- a/sourceparams.h
+++ b/sourceparams.h
@@ -1,8 +1,6 @@
 #ifndef _PVRINPUT_SOURCEPARAMS_H
 #define _PVRINPUT_SOURCEPARAMS_H
 
-#include "common.h"
-
 class cPvrSourceParam
 #ifdef __SOURCEPARAMS_H
  : public cSourceParam
diff --git a/submenu.c b/submenu.c
index 84551d7..d08bf15 100644
--- a/submenu.c
+++ b/submenu.c
@@ -25,7 +25,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "submenu.h"
+#include "common.h"
 
 static const char *aspectRatios[] = {
   "1:1",
diff --git a/submenu.h b/submenu.h
index b4eb5c3..da6ada8 100644
--- a/submenu.h
+++ b/submenu.h
@@ -25,9 +25,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "common.h"
-#include <vdr/osdbase.h>
-
 class cPvrSubMenu : public cOsdMenu {
 public:
   cPvrSubMenu(const char* text) : cOsdMenu(text, 33) { }
-- 
cgit v1.2.3