Skip to content

Commit

Permalink
remove USING_IVTV, use equivalent* USING_V4L2 instead
Browse files Browse the repository at this point in the history
*these lines were not compiled on FreeBSD.  They should compile.
However, the cards in question may not work under FreeBSD.

They were disabled 2008-10-14 in 51c9f74
referencing https://code.mythtv.org/trac/ticket/4751
  • Loading branch information
ulmus-scott authored and linuxdude42 committed Nov 7, 2021
1 parent 2a6d90f commit ebbed97
Show file tree
Hide file tree
Showing 7 changed files with 4 additions and 23 deletions.
7 changes: 1 addition & 6 deletions mythtv/configure
Expand Up @@ -126,7 +126,6 @@ Advanced options (experts only):
--disable-ceton disable support for Ceton cards
--disable-satip disable support for Sat>IP
--disable-v4l2 disable Video4Linux support
--disable-ivtv disable ivtv support (PVR-x50) req. v4l2 support
--disable-dvb disable DVB support
--dvb-path=HDRLOC location of directory containing
'linux/dvb/frontend.h', not the
Expand Down Expand Up @@ -1973,7 +1972,6 @@ MYTHTV_CONFIG_LIST='
satip
vbox
ceton
ivtv
asi
joystick_menu
libcec
Expand Down Expand Up @@ -2613,7 +2611,6 @@ ffserver_select="ffm_muxer rtp_protocol rtsp_demuxer"
audio_oss_deps_any="soundcard_h sys_soundcard_h"
dvb_deps="backend"
firewire_deps="backend"
ivtv_deps="backend v4l2"
hdhomerun_deps="backend"
satip_deps="backend"
vbox_deps="backend"
Expand Down Expand Up @@ -2766,7 +2763,6 @@ enable hdhomerun
enable satip
enable vbox
enable ceton
enable ivtv
enable asi
enable lamemp3
enable libaom
Expand Down Expand Up @@ -4739,7 +4735,7 @@ case $target_os in
append CCONFIG "freebsd"
# Workaround compile errors from missing u_int/uint def
CPPFLAGS=`echo $CPPFLAGS | sed 's/-D_POSIX_C_SOURCE=200112//'`
disable ivtv
# disable ivtv
enable backend
enable pic
enable drm
Expand Down Expand Up @@ -7497,7 +7493,6 @@ config_files="$TMPH $TMPMAK doc/config.texi"

if enabled backend; then
echo "Video4Linux support ${v4l2-no}"
echo "ivtv support ${ivtv-no}"
echo "FireWire support ${firewire-no}"
echo "DVB support ${dvb-no} [$dvb_path]"
echo "DVB-S2 support ${fe_can_2g_modulation-no}"
Expand Down
1 change: 0 additions & 1 deletion mythtv/docs/doxygen-create-developer-docs.cfg
Expand Up @@ -2047,7 +2047,6 @@ INCLUDE_FILE_PATTERNS =
# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.

PREDEFINED = USING_XV \
USING_IVTV \
MMX \
USING_FIREWIRE \
USING_DVB \
Expand Down
2 changes: 0 additions & 2 deletions mythtv/libs/libmythtv/cardutil.cpp
Expand Up @@ -65,9 +65,7 @@ QString CardUtil::GetScanableInputTypes(void)

#ifdef USING_V4L2
inputTypes += "'V4L'";
# ifdef USING_IVTV
inputTypes += "'MPEG'";
# endif // USING_IVTV
#endif // USING_V4L2

#ifdef USING_IPTV
Expand Down
6 changes: 0 additions & 6 deletions mythtv/libs/libmythtv/libmythtv.pro
Expand Up @@ -880,7 +880,6 @@ using_backend {

HEADERS += recorders/mpegrecorder.h
SOURCES += recorders/mpegrecorder.cpp

}

# Support for cable boxes that provide Firewire out
Expand Down Expand Up @@ -1038,11 +1037,6 @@ using_backend {
DEFINES += USING_CETON
}

# Support for PVR-150/250/350/500, etc. on Linux
using_ivtv:HEADERS *= recorders/mpegrecorder.h
using_ivtv:SOURCES *= recorders/mpegrecorder.cpp
using_ivtv:DEFINES += USING_IVTV

# External recorder
HEADERS += recorders/ExternalChannel.h
SOURCES += recorders/ExternalChannel.cpp
Expand Down
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/recorderbase.cpp
Expand Up @@ -860,9 +860,9 @@ RecorderBase *RecorderBase::CreateRecorder(
RecorderBase *recorder = nullptr;
if (genOpt.m_inputType == "MPEG")
{ // NOLINTNEXTLINE(bugprone-branch-clone)
#ifdef USING_IVTV
#ifdef USING_V4L2
recorder = new MpegRecorder(tvrec);
#endif // USING_IVTV
#endif // USING_V4L2
}
#ifdef USING_V4L2
else if (genOpt.m_inputType == "HDPVR")
Expand Down Expand Up @@ -952,7 +952,7 @@ RecorderBase *RecorderBase::CreateRecorder(
}
else if (genOpt.m_inputType == "DEMO")
{
#ifdef USING_IVTV
#ifdef USING_V4L2
recorder = new MpegRecorder(tvrec);
#else
recorder = new ImportRecorder(tvrec);
Expand Down
4 changes: 0 additions & 4 deletions mythtv/libs/libmythtv/videosource.cpp
Expand Up @@ -2571,10 +2571,8 @@ CaptureCardGroup::CaptureCardGroup(CaptureCard &parent)
new V4LConfigurationGroup(parent, *cardtype, "MJPEG"));
cardtype->addTargetedChild("GO7007",
new V4LConfigurationGroup(parent, *cardtype, "GO7007"));
# ifdef USING_IVTV
cardtype->addTargetedChild("MPEG",
new MPEGConfigurationGroup(parent, *cardtype));
# endif // USING_IVTV
#endif // USING_V4L2

#ifdef USING_ASI
Expand Down Expand Up @@ -2765,10 +2763,8 @@ void CardType::fillSelections(MythUIComboBoxSetting* setting)
#endif // USING_IPTV

#ifdef USING_V4L2
#ifdef USING_IVTV
setting->addSelection(
QObject::tr("Analog to MPEG-2 encoder card (PVR-150/250/350, etc)"), "MPEG");
#endif // USING_IVTV
setting->addSelection(
QObject::tr("Analog to MJPEG encoder card (Matrox G200, DC10, etc)"), "MJPEG");
setting->addSelection(
Expand Down
1 change: 0 additions & 1 deletion mythtv/programs/mythavtest/mythavtest.pro
Expand Up @@ -24,7 +24,6 @@ macx {
}

using_x11:DEFINES += USING_X11
using_ivtv:DEFINES += USING_IVTV
using_xrandr:DEFINES += USING_XRANDR
using_opengl:DEFINES += USING_OPENGL
using_vdpau:DEFINES += USING_VDPAU
Expand Down

0 comments on commit ebbed97

Please sign in to comment.