Remove V4L version 1 support.

MythTV · Jul 23, 2012 · caac2d5 · caac2d5
1 parent 1fdddac
commit caac2d5
Show file tree

Hide file tree

Showing 6 changed files with 238 additions and 508 deletions.
diff --git a/mythtv/configure b/mythtv/configure
@@ -5002,7 +5002,7 @@ enabled stripping || strip="echo skipping strip"
 config_files="$TMPH $TMPMAK"
 
 if enabled backend; then
-  echo "Video4Linux sup.          ${v4l2-no} (v1 ${v4l1-no})"
+  echo "Video4Linux support       ${v4l2-no}"
   echo "ivtv support              ${ivtv-no}"
   echo "HD-PVR support            ${hdpvr-no}"
   echo "FireWire support          ${firewire-no}"

diff --git a/mythtv/libs/libmythtv/inputinfo.cpp b/mythtv/libs/libmythtv/inputinfo.cpp
@@ -130,7 +130,6 @@ ChannelInputInfo::ChannelInputInfo(const ChannelInputInfo &other) :
     channels(other.channels),
     groups(other.groups),
     inputNumV4L(other.inputNumV4L),
-    videoModeV4L1(other.videoModeV4L1),
     videoModeV4L2(other.videoModeV4L2)
 {
     startChanNum.detach();
@@ -148,7 +147,6 @@ ChannelInputInfo &ChannelInputInfo::operator=(const ChannelInputInfo &other)
     channels        = other.channels;
     groups          = other.groups;
     inputNumV4L     = other.inputNumV4L;
-    videoModeV4L1   = other.videoModeV4L1;
     videoModeV4L2   = other.videoModeV4L2;
 
     startChanNum.detach();

diff --git a/mythtv/libs/libmythtv/inputinfo.h b/mythtv/libs/libmythtv/inputinfo.h
@@ -72,8 +72,7 @@ class MTV_PUBLIC ChannelInputInfo : public InputInfo
     ChannelInputInfo() :
         startChanNum(QString::null),    tuneToChannel(QString::null),
         externalChanger(QString::null),
-        inputNumV4L(-1),
-        videoModeV4L1(0),               videoModeV4L2(0) {}
+        inputNumV4L(-1), videoModeV4L2(0) {}
     ChannelInputInfo(QString _name,            QString _startChanNum,
                      QString _tuneToChannel,   QString _externalChanger,
                      uint    _sourceid,        uint    _cardid,
@@ -85,7 +84,7 @@ class MTV_PUBLIC ChannelInputInfo : public InputInfo
         tuneToChannel(_tuneToChannel),  externalChanger(_externalChanger),
         channels(_channels),
         inputNumV4L(-1),
-        videoModeV4L1(0),               videoModeV4L2(0) {}
+        videoModeV4L2(0) {}
     ChannelInputInfo(const ChannelInputInfo &other);
     ChannelInputInfo &operator=(const ChannelInputInfo &other);
     virtual ~ChannelInputInfo() {}
@@ -99,7 +98,6 @@ class MTV_PUBLIC ChannelInputInfo : public InputInfo
     DBChanList   channels;
     vector<uint> groups;
     int          inputNumV4L;
-    int          videoModeV4L1;
     int          videoModeV4L2;
 };
 typedef QMap<uint, ChannelInputInfo*> InputMap;

diff --git a/mythtv/libs/libmythtv/libmythtv.pro b/mythtv/libs/libmythtv/libmythtv.pro
@@ -565,7 +565,6 @@ using_backend {
         SOURCES += recorders/analogsignalmonitor.cpp
 
         DEFINES += USING_V4L2
-        using_v4l1:DEFINES += USING_V4L1
     }
 
     # Support for cable boxes that provide Firewire out