remove unnecessary USING_HDPVR, use equivalent USING_V4L2 instead

MythTV · Nov 7, 2021 · 2a6d90f · 2a6d90f
1 parent 65ad4a2
commit 2a6d90f
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 19 deletions.
diff --git a/mythtv/configure b/mythtv/configure
@@ -127,7 +127,6 @@ Advanced options (experts only):
   --disable-satip          disable support for Sat>IP
   --disable-v4l2           disable Video4Linux support
   --disable-ivtv           disable ivtv support (PVR-x50) req. v4l2 support
-  --disable-hdpvr          disable HD-PVR support
   --disable-dvb            disable DVB support
   --dvb-path=HDRLOC        location of directory containing
                            'linux/dvb/frontend.h', not the
@@ -1974,7 +1973,6 @@ MYTHTV_CONFIG_LIST='
     satip
     vbox
     ceton
-    hdpvr
     ivtv
     asi
     joystick_menu
@@ -2616,7 +2614,6 @@ audio_oss_deps_any="soundcard_h sys_soundcard_h"
 dvb_deps="backend"
 firewire_deps="backend"
 ivtv_deps="backend v4l2"
-hdpvr_deps="backend v4l2"
 hdhomerun_deps="backend"
 satip_deps="backend"
 vbox_deps="backend"
@@ -2769,7 +2766,6 @@ enable hdhomerun
 enable satip
 enable vbox
 enable ceton
-enable hdpvr
 enable ivtv
 enable asi
 enable lamemp3
@@ -7502,7 +7498,6 @@ config_files="$TMPH $TMPMAK doc/config.texi"
 if enabled backend; then
   echo "Video4Linux support       ${v4l2-no}"
   echo "ivtv support              ${ivtv-no}"
-  echo "HD-PVR support            ${hdpvr-no}"
   echo "FireWire support          ${firewire-no}"
   echo "DVB support               ${dvb-no} [$dvb_path]"
   echo "DVB-S2 support            ${fe_can_2g_modulation-no}"

diff --git a/mythtv/docs/doxygen-create-developer-docs.cfg b/mythtv/docs/doxygen-create-developer-docs.cfg
@@ -2076,7 +2076,6 @@ PREDEFINED             = USING_XV \
                          USING_DXVA2 \
                          USING_FFMPEG_THREADS \
                          USING_HDHOMERUN \
-                         USING_HDPVR \
                          USING_IPTV \
                          USING_JACK \
                          USING_LIBASS \

diff --git a/mythtv/libs/libmythtv/libmythtv.pro b/mythtv/libs/libmythtv/libmythtv.pro
@@ -877,6 +877,10 @@ using_backend {
         SOURCES += recorders/v4l2encstreamhandler.cpp
         HEADERS += recorders/v4l2encsignalmonitor.h
         SOURCES += recorders/v4l2encsignalmonitor.cpp
+
+        HEADERS += recorders/mpegrecorder.h
+        SOURCES += recorders/mpegrecorder.cpp
+
     }
 
     # Support for cable boxes that provide Firewire out
@@ -1039,11 +1043,6 @@ using_backend {
     using_ivtv:SOURCES *= recorders/mpegrecorder.cpp
     using_ivtv:DEFINES += USING_IVTV
 
-    # Support for HD-PVR on Linux
-    using_hdpvr:HEADERS *= recorders/mpegrecorder.h
-    using_hdpvr:SOURCES *= recorders/mpegrecorder.cpp
-    using_hdpvr:DEFINES += USING_HDPVR
-
     # External recorder
     HEADERS += recorders/ExternalChannel.h
     SOURCES += recorders/ExternalChannel.cpp

diff --git a/mythtv/libs/libmythtv/recorders/recorderbase.cpp b/mythtv/libs/libmythtv/recorders/recorderbase.cpp
@@ -864,19 +864,17 @@ RecorderBase *RecorderBase::CreateRecorder(
         recorder = new MpegRecorder(tvrec);
 #endif // USING_IVTV
     }
-#ifdef USING_HDPVR
+#ifdef USING_V4L2
     else if (genOpt.m_inputType == "HDPVR")
     {
         recorder = new MpegRecorder(tvrec);
     }
-#endif // USING_HDPVR
-#ifdef USING_V4L2
     else if (genOpt.m_inputType == "V4L2ENC")
     {
         if (dynamic_cast<V4LChannel*>(channel))
             recorder = new V4L2encRecorder(tvrec, dynamic_cast<V4LChannel*>(channel));
     }
-#endif
+#endif // USING_V4L2
 #ifdef USING_FIREWIRE
     else if (genOpt.m_inputType == "FIREWIRE")
     {

diff --git a/mythtv/libs/libmythtv/videosource.cpp b/mythtv/libs/libmythtv/videosource.cpp
@@ -2532,10 +2532,8 @@ CaptureCardGroup::CaptureCardGroup(CaptureCard &parent)
 #endif // USING_DVB
 
 #ifdef USING_V4L2
-# ifdef USING_HDPVR
     cardtype->addTargetedChild("HDPVR",
                                new HDPVRConfigurationGroup(parent, *cardtype));
-# endif // USING_HDPVR
 #endif // USING_V4L2
 
 #ifdef USING_HDHOMERUN
@@ -2733,10 +2731,8 @@ void CardType::fillSelections(MythUIComboBoxSetting* setting)
 #ifdef USING_V4L2
     setting->addSelection(
         QObject::tr("V4L2 encoder"), "V4L2ENC");
-#ifdef USING_HDPVR
     setting->addSelection(
         QObject::tr("HD-PVR H.264 encoder"), "HDPVR");
-#endif // USING_HDPVR
 #endif // USING_V4L2
 
 #ifdef USING_HDHOMERUN