From 549a54a83c337135ae7f99ceae570b7d3660729c Mon Sep 17 00:00:00 2001 From: Daniel Kristjansson Date: Thu, 7 Jun 2012 13:33:00 -0400 Subject: [PATCH] Move recorders into recorders subdirectory. --- .../{ => channelscan}/iptvchannelfetcher.cpp | 0 .../{ => channelscan}/iptvchannelfetcher.h | 0 mythtv/libs/libmythtv/dtvconfparser.h | 2 +- mythtv/libs/libmythtv/frequencytables.h | 2 - mythtv/libs/libmythtv/libmythtv.pro | 249 +++++++++++------- .../{ => recorders}/DeviceReadBuffer.cpp | 0 .../{ => recorders}/DeviceReadBuffer.h | 0 .../{ => recorders}/NuppelVideoRecorder.cpp | 0 .../{ => recorders}/NuppelVideoRecorder.h | 0 .../libmythtv/{ => recorders}/RTjpegN.cpp | 0 .../libs/libmythtv/{ => recorders}/RTjpegN.h | 0 .../{ => recorders}/analogsignalmonitor.cpp | 0 .../{ => recorders}/analogsignalmonitor.h | 0 .../libmythtv/{ => recorders}/asichannel.cpp | 0 .../libmythtv/{ => recorders}/asichannel.h | 0 .../libmythtv/{ => recorders}/asirecorder.cpp | 0 .../libmythtv/{ => recorders}/asirecorder.h | 0 .../{ => recorders}/asisignalmonitor.cpp | 0 .../{ => recorders}/asisignalmonitor.h | 0 .../{ => recorders}/asistreamhandler.cpp | 0 .../{ => recorders}/asistreamhandler.h | 0 .../libmythtv/{ => recorders}/audioinput.cpp | 0 .../libmythtv/{ => recorders}/audioinput.h | 0 .../{ => recorders}/audioinputalsa.cpp | 0 .../{ => recorders}/audioinputalsa.h | 0 .../{ => recorders}/audioinputoss.cpp | 0 .../libmythtv/{ => recorders}/audioinputoss.h | 0 .../libmythtv/{ => recorders}/avcinfo.cpp | 0 .../libs/libmythtv/{ => recorders}/avcinfo.h | 0 .../{ => recorders}/cetonchannel.cpp | 0 .../libmythtv/{ => recorders}/cetonchannel.h | 0 .../{ => recorders}/cetonrecorder.cpp | 0 .../libmythtv/{ => recorders}/cetonrecorder.h | 0 .../libmythtv/{ => recorders}/cetonrtsp.cpp | 0 .../libmythtv/{ => recorders}/cetonrtsp.h | 0 .../{ => recorders}/cetonsignalmonitor.cpp | 0 .../{ => recorders}/cetonsignalmonitor.h | 0 .../{ => recorders}/cetonstreamhandler.cpp | 0 .../{ => recorders}/cetonstreamhandler.h | 0 .../libmythtv/{ => recorders}/channelbase.cpp | 0 .../libmythtv/{ => recorders}/channelbase.h | 0 .../{ => recorders}/darwinavcinfo.cpp | 0 .../libmythtv/{ => recorders}/darwinavcinfo.h | 0 .../{ => recorders}/darwinfirewiredevice.cpp | 0 .../{ => recorders}/darwinfirewiredevice.h | 0 .../libmythtv/{ => recorders}/dtvchannel.cpp | 0 .../libmythtv/{ => recorders}/dtvchannel.h | 0 .../libmythtv/{ => recorders}/dtvrecorder.cpp | 0 .../libmythtv/{ => recorders}/dtvrecorder.h | 0 .../{ => recorders}/dtvsignalmonitor.cpp | 0 .../{ => recorders}/dtvsignalmonitor.h | 0 .../libmythtv/{ => recorders}/dummychannel.h | 0 .../libs/libmythtv/{ => recorders}/dvbcam.cpp | 0 .../libs/libmythtv/{ => recorders}/dvbcam.h | 0 .../libmythtv/{ => recorders}/dvbchannel.cpp | 0 .../libmythtv/{ => recorders}/dvbchannel.h | 0 .../libmythtv/{ => recorders}/dvbdev/README | 0 .../{ => recorders}/dvbdev/dvbci.cpp | 0 .../libmythtv/{ => recorders}/dvbdev/dvbci.h | 0 .../libmythtv/{ => recorders}/dvbrecorder.cpp | 0 .../libmythtv/{ => recorders}/dvbrecorder.h | 0 .../{ => recorders}/dvbsignalmonitor.cpp | 0 .../{ => recorders}/dvbsignalmonitor.h | 0 .../{ => recorders}/dvbstreamhandler.cpp | 0 .../{ => recorders}/dvbstreamhandler.h | 0 .../libmythtv/{ => recorders}/dvbtypes.cpp | 0 .../libs/libmythtv/{ => recorders}/dvbtypes.h | 0 .../{ => recorders}/firewirechannel.cpp | 0 .../{ => recorders}/firewirechannel.h | 0 .../{ => recorders}/firewiredevice.cpp | 0 .../{ => recorders}/firewiredevice.h | 0 .../{ => recorders}/firewirerecorder.cpp | 0 .../{ => recorders}/firewirerecorder.h | 0 .../{ => recorders}/firewiresignalmonitor.cpp | 0 .../{ => recorders}/firewiresignalmonitor.h | 0 .../libmythtv/{ => recorders}/go7007_myth.h | 0 .../libmythtv/{ => recorders}/hdhrchannel.cpp | 0 .../libmythtv/{ => recorders}/hdhrchannel.h | 0 .../{ => recorders}/hdhrrecorder.cpp | 0 .../libmythtv/{ => recorders}/hdhrrecorder.h | 0 .../{ => recorders}/hdhrsignalmonitor.cpp | 0 .../{ => recorders}/hdhrsignalmonitor.h | 0 .../{ => recorders}/hdhrstreamhandler.cpp | 0 .../{ => recorders}/hdhrstreamhandler.h | 0 .../{ => recorders}/importrecorder.cpp | 0 .../{ => recorders}/importrecorder.h | 0 .../libmythtv/{ => recorders}/iptvchannel.cpp | 0 .../libmythtv/{ => recorders}/iptvchannel.h | 0 .../{ => recorders}/iptvrecorder.cpp | 0 .../libmythtv/{ => recorders}/iptvrecorder.h | 0 .../{ => recorders}/iptvsignalmonitor.cpp | 0 .../{ => recorders}/iptvsignalmonitor.h | 0 .../{ => recorders}/iptvstreamhandler.cpp | 0 .../{ => recorders}/iptvstreamhandler.h | 0 .../{ => recorders}/linuxavcinfo.cpp | 0 .../libmythtv/{ => recorders}/linuxavcinfo.h | 0 .../{ => recorders}/linuxfirewiredevice.cpp | 0 .../{ => recorders}/linuxfirewiredevice.h | 0 .../{ => recorders}/mpegrecorder.cpp | 0 .../libmythtv/{ => recorders}/mpegrecorder.h | 0 .../{ => recorders}/recorderbase.cpp | 0 .../libmythtv/{ => recorders}/recorderbase.h | 0 .../libmythtv/{ => recorders}/rtp/README.RTSP | 0 .../libmythtv/{ => recorders}/rtp/README.UDP | 0 .../{ => recorders}/rtp/packetbuffer.cpp | 0 .../{ => recorders}/rtp/packetbuffer.h | 0 .../{ => recorders}/rtp/rtpdatapacket.h | 0 .../{ => recorders}/rtp/rtpfecpacket.h | 0 .../{ => recorders}/rtp/rtppacketbuffer.cpp | 0 .../{ => recorders}/rtp/rtppacketbuffer.h | 0 .../{ => recorders}/rtp/rtptsdatapacket.h | 0 .../libmythtv/{ => recorders}/rtp/udppacket.h | 0 .../{ => recorders}/rtp/udppacketbuffer.h | 0 .../{ => recorders}/scriptsignalmonitor.h | 0 .../{ => recorders}/signalmonitor.cpp | 0 .../libmythtv/{ => recorders}/signalmonitor.h | 0 .../{ => recorders}/streamhandler.cpp | 0 .../libmythtv/{ => recorders}/streamhandler.h | 0 .../libmythtv/{ => recorders}/v4lchannel.cpp | 0 .../libmythtv/{ => recorders}/v4lchannel.h | 0 .../libmythtv/{ => recorders}/v4lrecorder.cpp | 0 .../libmythtv/{ => recorders}/v4lrecorder.h | 0 .../libmythtv/{ => recorders}/vbitext/cc.cpp | 0 .../libmythtv/{ => recorders}/vbitext/cc.h | 0 .../{ => recorders}/vbitext/dllist.h | 0 .../libmythtv/{ => recorders}/vbitext/hamm.c | 0 .../libmythtv/{ => recorders}/vbitext/hamm.h | 0 .../libmythtv/{ => recorders}/vbitext/lang.c | 0 .../libmythtv/{ => recorders}/vbitext/lang.h | 0 .../libmythtv/{ => recorders}/vbitext/vbi.c | 0 .../libmythtv/{ => recorders}/vbitext/vbi.h | 0 .../libmythtv/{ => recorders}/vbitext/vt.h | 0 .../programs/mythtranscode/mythtranscode.pro | 14 +- 133 files changed, 167 insertions(+), 100 deletions(-) rename mythtv/libs/libmythtv/{ => channelscan}/iptvchannelfetcher.cpp (100%) rename mythtv/libs/libmythtv/{ => channelscan}/iptvchannelfetcher.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/DeviceReadBuffer.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/DeviceReadBuffer.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/NuppelVideoRecorder.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/NuppelVideoRecorder.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/RTjpegN.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/RTjpegN.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/analogsignalmonitor.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/analogsignalmonitor.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/asichannel.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/asichannel.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/asirecorder.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/asirecorder.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/asisignalmonitor.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/asisignalmonitor.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/asistreamhandler.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/asistreamhandler.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/audioinput.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/audioinput.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/audioinputalsa.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/audioinputalsa.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/audioinputoss.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/audioinputoss.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/avcinfo.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/avcinfo.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/cetonchannel.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/cetonchannel.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/cetonrecorder.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/cetonrecorder.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/cetonrtsp.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/cetonrtsp.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/cetonsignalmonitor.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/cetonsignalmonitor.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/cetonstreamhandler.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/cetonstreamhandler.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/channelbase.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/channelbase.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/darwinavcinfo.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/darwinavcinfo.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/darwinfirewiredevice.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/darwinfirewiredevice.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/dtvchannel.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/dtvchannel.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/dtvrecorder.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/dtvrecorder.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/dtvsignalmonitor.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/dtvsignalmonitor.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/dummychannel.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/dvbcam.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/dvbcam.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/dvbchannel.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/dvbchannel.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/dvbdev/README (100%) rename mythtv/libs/libmythtv/{ => recorders}/dvbdev/dvbci.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/dvbdev/dvbci.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/dvbrecorder.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/dvbrecorder.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/dvbsignalmonitor.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/dvbsignalmonitor.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/dvbstreamhandler.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/dvbstreamhandler.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/dvbtypes.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/dvbtypes.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/firewirechannel.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/firewirechannel.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/firewiredevice.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/firewiredevice.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/firewirerecorder.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/firewirerecorder.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/firewiresignalmonitor.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/firewiresignalmonitor.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/go7007_myth.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/hdhrchannel.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/hdhrchannel.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/hdhrrecorder.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/hdhrrecorder.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/hdhrsignalmonitor.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/hdhrsignalmonitor.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/hdhrstreamhandler.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/hdhrstreamhandler.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/importrecorder.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/importrecorder.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/iptvchannel.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/iptvchannel.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/iptvrecorder.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/iptvrecorder.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/iptvsignalmonitor.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/iptvsignalmonitor.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/iptvstreamhandler.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/iptvstreamhandler.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/linuxavcinfo.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/linuxavcinfo.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/linuxfirewiredevice.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/linuxfirewiredevice.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/mpegrecorder.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/mpegrecorder.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/recorderbase.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/recorderbase.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/rtp/README.RTSP (100%) rename mythtv/libs/libmythtv/{ => recorders}/rtp/README.UDP (100%) rename mythtv/libs/libmythtv/{ => recorders}/rtp/packetbuffer.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/rtp/packetbuffer.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/rtp/rtpdatapacket.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/rtp/rtpfecpacket.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/rtp/rtppacketbuffer.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/rtp/rtppacketbuffer.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/rtp/rtptsdatapacket.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/rtp/udppacket.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/rtp/udppacketbuffer.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/scriptsignalmonitor.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/signalmonitor.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/signalmonitor.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/streamhandler.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/streamhandler.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/v4lchannel.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/v4lchannel.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/v4lrecorder.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/v4lrecorder.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/vbitext/cc.cpp (100%) rename mythtv/libs/libmythtv/{ => recorders}/vbitext/cc.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/vbitext/dllist.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/vbitext/hamm.c (100%) rename mythtv/libs/libmythtv/{ => recorders}/vbitext/hamm.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/vbitext/lang.c (100%) rename mythtv/libs/libmythtv/{ => recorders}/vbitext/lang.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/vbitext/vbi.c (100%) rename mythtv/libs/libmythtv/{ => recorders}/vbitext/vbi.h (100%) rename mythtv/libs/libmythtv/{ => recorders}/vbitext/vt.h (100%) diff --git a/mythtv/libs/libmythtv/iptvchannelfetcher.cpp b/mythtv/libs/libmythtv/channelscan/iptvchannelfetcher.cpp similarity index 100% rename from mythtv/libs/libmythtv/iptvchannelfetcher.cpp rename to mythtv/libs/libmythtv/channelscan/iptvchannelfetcher.cpp diff --git a/mythtv/libs/libmythtv/iptvchannelfetcher.h b/mythtv/libs/libmythtv/channelscan/iptvchannelfetcher.h similarity index 100% rename from mythtv/libs/libmythtv/iptvchannelfetcher.h rename to mythtv/libs/libmythtv/channelscan/iptvchannelfetcher.h diff --git a/mythtv/libs/libmythtv/dtvconfparser.h b/mythtv/libs/libmythtv/dtvconfparser.h index 7d914809ddb..f209f4a22fa 100644 --- a/mythtv/libs/libmythtv/dtvconfparser.h +++ b/mythtv/libs/libmythtv/dtvconfparser.h @@ -44,7 +44,7 @@ using namespace std; #include // MythTV headers -#include "dtvchannel.h" +#include "dtvmultiplex.h" class QStringList; diff --git a/mythtv/libs/libmythtv/frequencytables.h b/mythtv/libs/libmythtv/frequencytables.h index 4ea77f14dc3..4e67b2d4ad1 100644 --- a/mythtv/libs/libmythtv/frequencytables.h +++ b/mythtv/libs/libmythtv/frequencytables.h @@ -13,8 +13,6 @@ using namespace std; #include // MythTV includes -#include "dtvchannel.h" - #include "mythtvexp.h" #include "dtvconfparser.h" #include "dtvconfparserhelpers.h" diff --git a/mythtv/libs/libmythtv/libmythtv.pro b/mythtv/libs/libmythtv/libmythtv.pro index 8d9ec7035ee..41e5e362048 100644 --- a/mythtv/libs/libmythtv/libmythtv.pro +++ b/mythtv/libs/libmythtv/libmythtv.pro @@ -24,7 +24,12 @@ DEPENDPATH += ../libmyth ../libmyth/audio DEPENDPATH += ../libmythbase ../libmythhdhomerun DEPENDPATH += ../libmythdvdnav/ DEPENDPATH += ../libmythbluray/ -DEPENDPATH += ./dvbdev ./mpeg ./rtp ./channelscan ./visualisations +DEPENDPATH += ./mpeg ./channelscan ./visualisations +DEPENDPATH += ./recorders +DEPENDPATH += ./recorders/dvbdev +DEPENDPATH += ./recorders/HLS +DEPENDPATH += ./recorders/rtp +DEPENDPATH += ./recorders/vbitext DEPENDPATH += ../libmythlivemedia/BasicUsageEnvironment/include DEPENDPATH += ../libmythlivemedia/BasicUsageEnvironment DEPENDPATH += ../libmythlivemedia/groupsock/include @@ -73,9 +78,16 @@ using_valgrind:DEFINES += USING_VALGRIND # old libvbitext (Caption decoder) #using_v4l2 { !mingw { - HEADERS += vbitext/cc.h vbitext/dllist.h vbitext/hamm.h vbitext/lang.h - HEADERS += vbitext/vbi.h vbitext/vt.h - SOURCES += vbitext/cc.cpp vbitext/vbi.c vbitext/hamm.c vbitext/lang.c + HEADERS += recorders/vbitext/cc.h + HEADERS += recorders/vbitext/dllist.h + HEADERS += recorders/vbitext/hamm.h + HEADERS += recorders/vbitext/lang.h + HEADERS += recorders/vbitext/vbi.h + HEADERS += recorders/vbitext/vt.h + SOURCES += recorders/vbitext/cc.cpp + SOURCES += recorders/vbitext/vbi.c + SOURCES += recorders/vbitext/hamm.c + SOURCES += recorders/vbitext/lang.c } # mmx macros from avlib @@ -92,10 +104,10 @@ QMAKE_CLEAN += $(TARGET) $(TARGETA) $(TARGETD) $(TARGET0) $(TARGET1) $(TARGET2) HEADERS += filter.h format.h HEADERS += frame.h compat.h -# LZO / RTjpegN, used by NuppelDecoder & NuppelVideoRecorder +# LZO used by NuppelDecoder & NuppelVideoRecorder HEADERS += lzoconf.h -HEADERS += minilzo.h RTjpegN.h -SOURCES += minilzo.cpp RTjpegN.cpp +HEADERS += minilzo.h +SOURCES += minilzo.cpp # Misc. needed by backend/frontend HEADERS += mythtvexp.h @@ -161,9 +173,11 @@ SOURCES += diseqc.cpp diseqcsettings.cpp HEADERS += datadirect.h SOURCES += datadirect.cpp -# File Writer classes +# File/FIFO Writer classes HEADERS += filewriterbase.h avformatwriter.h +HEADERS += fifowriter.h SOURCES += filewriterbase.cpp avformatwriter.cpp +SOURCES += fifowriter.cpp # Teletext stuff HEADERS += teletextdecoder.h teletextreader.h vbilut.h @@ -206,6 +220,7 @@ HEADERS += frequencies.h frequencytables.h SOURCES += frequencies.cpp frequencytables.cpp HEADERS += channelutil.h dbchannelinfo.h +HEADERS += iptvtuningdata.h SOURCES += channelutil.cpp dbchannelinfo.cpp HEADERS += dtvmultiplex.h @@ -214,7 +229,9 @@ SOURCES += dtvmultiplex.cpp SOURCES += dtvconfparser.cpp dtvconfparserhelpers.cpp HEADERS += channelscan/scaninfo.h channelscan/channelimporter.h +HEADERS += channelscan/iptvchannelfetcher.h SOURCES += channelscan/scaninfo.cpp channelscan/channelimporter.cpp +SOURCES += channelscan/iptvchannelfetcher.cpp # subtitles: srt HEADERS += srtwriter.h @@ -434,12 +451,17 @@ using_frontend { using_backend { # Channel stuff - HEADERS += channelbase.h dtvchannel.h - HEADERS += signalmonitor.h dtvsignalmonitor.h - HEADERS += scriptsignalmonitor.h + HEADERS += recorders/channelbase.h + HEADERS += recorders/dtvchannel.h + HEADERS += recorders/signalmonitor.h + HEADERS += recorders/dtvsignalmonitor.h + HEADERS += recorders/scriptsignalmonitor.h + SOURCES += recorders/channelbase.cpp + SOURCES += recorders/dtvchannel.cpp + SOURCES += recorders/signalmonitor.cpp + SOURCES += recorders/dtvsignalmonitor.cpp + HEADERS += inputinfo.h inputgroupmap.h - SOURCES += channelbase.cpp dtvchannel.cpp - SOURCES += signalmonitor.cpp dtvsignalmonitor.cpp SOURCES += inputinfo.cpp inputgroupmap.cpp # Channel scanner stuff @@ -491,41 +513,53 @@ using_backend { HEADERS += programdata.h SOURCES += programdata.cpp - # TVRec & Recorder base classes - HEADERS += tv_rec.h - HEADERS += recorderbase.h DeviceReadBuffer.h - HEADERS += dtvrecorder.h recordingquality.h - SOURCES += tv_rec.cpp - SOURCES += recorderbase.cpp DeviceReadBuffer.cpp - SOURCES += dtvrecorder.cpp recordingquality.cpp + # TVRec stuff + HEADERS += tv_rec.h recordingquality.h + SOURCES += tv_rec.cpp recordingquality.cpp + + # Recorder base and util classes + HEADERS += recorders/recorderbase.h + HEADERS += recorders/DeviceReadBuffer.h + HEADERS += recorders/dtvrecorder.h + SOURCES += recorders/recorderbase.cpp + SOURCES += recorders/DeviceReadBuffer.cpp + SOURCES += recorders/dtvrecorder.cpp # Import recorder - HEADERS += importrecorder.h - SOURCES += importrecorder.cpp + HEADERS += recorders/importrecorder.h + SOURCES += recorders/importrecorder.cpp # Simple NuppelVideo Recorder using_ffmpeg_threads:DEFINES += USING_FFMPEG_THREADS - HEADERS += NuppelVideoRecorder.h fifowriter.h audioinput.h - SOURCES += NuppelVideoRecorder.cpp fifowriter.cpp audioinput.cpp + !mingw:HEADERS += recorders/NuppelVideoRecorder.h + HEADERS += recorders/RTjpegN.h + HEADERS += recorders/audioinput.h + HEADERS += recorders/go7007_myth.h + + !mingw:SOURCES += recorders/NuppelVideoRecorder.cpp + SOURCES += recorders/RTjpegN.cpp + SOURCES += recorders/audioinput.cpp using_alsa { - HEADERS += audioinputalsa.h - SOURCES += audioinputalsa.cpp + HEADERS += recorders/audioinputalsa.h + SOURCES += recorders/audioinputalsa.cpp DEFINES += USING_ALSA } using_oss { - HEADERS += audioinputoss.h - SOURCES += audioinputoss.cpp + HEADERS += recorders/audioinputoss.h + SOURCES += recorders/audioinputoss.cpp DEFINES += USING_OSS } # Support for Video4Linux devices !mingw { - HEADERS += v4lrecorder.h - SOURCES += v4lrecorder.cpp + HEADERS += recorders/v4lrecorder.h + SOURCES += recorders/v4lrecorder.cpp } using_v4l2 { - HEADERS += v4lchannel.h analogsignalmonitor.h - SOURCES += v4lchannel.cpp analogsignalmonitor.cpp + HEADERS += recorders/v4lchannel.h + HEADERS += recorders/analogsignalmonitor.h + SOURCES += recorders/v4lchannel.cpp + SOURCES += recorders/analogsignalmonitor.cpp DEFINES += USING_V4L2 using_v4l1:DEFINES += USING_V4L1 @@ -533,22 +567,30 @@ using_backend { # Support for cable boxes that provide Firewire out using_firewire { - HEADERS += firewirechannel.h firewirerecorder.h - HEADERS += firewiresignalmonitor.h firewiredevice.h - HEADERS += avcinfo.h - SOURCES += firewirechannel.cpp firewirerecorder.cpp - SOURCES += firewiresignalmonitor.cpp firewiredevice.cpp - SOURCES += avcinfo.cpp + HEADERS += recorders/firewirechannel.h + HEADERS += recorders/firewirerecorder.h + HEADERS += recorders/firewiresignalmonitor.h + HEADERS += recorders/firewiredevice.h + HEADERS += recorders/avcinfo.h + SOURCES += recorders/firewirechannel.cpp + SOURCES += recorders/firewirerecorder.cpp + SOURCES += recorders/firewiresignalmonitor.cpp + SOURCES += recorders/firewiredevice.cpp + SOURCES += recorders/avcinfo.cpp macx { - HEADERS += darwinfirewiredevice.h darwinavcinfo.h - SOURCES += darwinfirewiredevice.cpp darwinavcinfo.cpp + HEADERS += recorders/darwinfirewiredevice.h + HEADERS += recorders/darwinavcinfo.h + SOURCES += recorders/darwinfirewiredevice.cpp + SOURCES += recorders/darwinavcinfo.cpp DEFINES += USING_OSX_FIREWIRE } !macx { - HEADERS += linuxfirewiredevice.h linuxavcinfo.h - SOURCES += linuxfirewiredevice.cpp linuxavcinfo.cpp + HEADERS += recorders/linuxfirewiredevice.h + HEADERS += recorders/linuxavcinfo.h + SOURCES += recorders/linuxfirewiredevice.cpp + SOURCES += recorders/linuxavcinfo.cpp DEFINES += USING_LINUX_FIREWIRE } @@ -556,30 +598,45 @@ using_backend { } # Support for RTP/UDP streams - HEADERS += iptvchannel.h iptvrecorder.h - HEADERS += iptvsignalmonitor.h iptvstreamhandler.h - HEADERS += iptvchannelfetcher.h iptvtuningdata.h - HEADERS += udppacket.h udppacketbuffer.h - HEADERS += packetbuffer.h rtppacketbuffer.h - HEADERS += rtpdatapacket.h rtpfecpacket.h - - SOURCES += iptvchannel.cpp iptvrecorder.cpp - SOURCES += iptvsignalmonitor.cpp iptvstreamhandler.cpp - SOURCES += iptvchannelfetcher.cpp - SOURCES += packetbuffer.cpp rtppacketbuffer.cpp + HEADERS += recorders/iptvchannel.h + HEADERS += recorders/iptvrecorder.h + HEADERS += recorders/iptvsignalmonitor.h + HEADERS += recorders/iptvstreamhandler.h + HEADERS *= recorders/streamhandler.h + + HEADERS += recorders/rtp/udppacket.h + HEADERS += recorders/rtp/udppacketbuffer.h + HEADERS += recorders/rtp/packetbuffer.h + HEADERS += recorders/rtp/rtppacketbuffer.h + HEADERS += recorders/rtp/rtpdatapacket.h + HEADERS += recorders/rtp/rtpfecpacket.h + + SOURCES += recorders/iptvchannel.cpp + SOURCES += recorders/iptvrecorder.cpp + SOURCES += recorders/iptvsignalmonitor.cpp + SOURCES += recorders/iptvstreamhandler.cpp + SOURCES *= recorders/streamhandler.cpp + + SOURCES += recorders/rtp/packetbuffer.cpp + SOURCES += recorders/rtp/rtppacketbuffer.cpp + DEFINES += USING_IPTV # Support for HDHomeRun box using_hdhomerun { # MythTV HDHomeRun glue - HEADERS += hdhrsignalmonitor.h hdhrchannel.h - HEADERS += hdhrrecorder.h hdhrstreamhandler.h + HEADERS += recorders/hdhrsignalmonitor.h + HEADERS += recorders/hdhrchannel.h + HEADERS += recorders/hdhrrecorder.h + HEADERS += recorders/hdhrstreamhandler.h - SOURCES += hdhrsignalmonitor.cpp hdhrchannel.cpp - SOURCES += hdhrrecorder.cpp hdhrstreamhandler.cpp + SOURCES += recorders/hdhrsignalmonitor.cpp + SOURCES += recorders/hdhrchannel.cpp + SOURCES += recorders/hdhrrecorder.cpp + SOURCES += recorders/hdhrstreamhandler.cpp - HEADERS *= streamhandler.h - SOURCES *= streamhandler.cpp + HEADERS *= recorders/streamhandler.h + SOURCES *= recorders/streamhandler.cpp DEFINES += USING_HDHOMERUN } @@ -587,67 +644,79 @@ using_backend { # Support for Ceton using_ceton { # MythTV Ceton glue - HEADERS += cetonsignalmonitor.h cetonchannel.h - HEADERS += cetonrecorder.h cetonstreamhandler.h - HEADERS += cetonrtsp.h + HEADERS += recorders/cetonsignalmonitor.h + HEADERS += recorders/cetonchannel.h + HEADERS += recorders/cetonrecorder.h + HEADERS += recorders/cetonstreamhandler.h + HEADERS += recorders/cetonrtsp.h - SOURCES += cetonsignalmonitor.cpp cetonchannel.cpp - SOURCES += cetonrecorder.cpp cetonstreamhandler.cpp - SOURCES += cetonrtsp.cpp + SOURCES += recorders/cetonsignalmonitor.cpp + SOURCES += recorders/cetonchannel.cpp + SOURCES += recorders/cetonrecorder.cpp + SOURCES += recorders/cetonstreamhandler.cpp + SOURCES += recorders/cetonrtsp.cpp - HEADERS *= streamhandler.h - SOURCES *= streamhandler.cpp + HEADERS *= recorders/streamhandler.h + SOURCES *= recorders/streamhandler.cpp DEFINES += USING_CETON } # Support for PVR-150/250/350/500, etc. on Linux - using_ivtv:HEADERS += mpegrecorder.h - using_ivtv:SOURCES += mpegrecorder.cpp + using_ivtv:HEADERS *= recorders/mpegrecorder.h + using_ivtv:SOURCES *= recorders/mpegrecorder.cpp using_ivtv:DEFINES += USING_IVTV # Support for HD-PVR on Linux - using_hdpvr:HEADERS *= mpegrecorder.h - using_hdpvr:SOURCES *= mpegrecorder.cpp + using_hdpvr:HEADERS *= recorders/mpegrecorder.h + using_hdpvr:SOURCES *= recorders/mpegrecorder.cpp using_hdpvr:DEFINES += USING_HDPVR # Support for Linux DVB drivers using_dvb { # Basic DVB types - HEADERS += dvbtypes.h - SOURCES += dvbtypes.cpp + HEADERS += recorders/dvbtypes.h + SOURCES += recorders/dvbtypes.cpp # Channel stuff - HEADERS += dvbchannel.h dvbsignalmonitor.h - HEADERS += dvbcam.h - SOURCES += dvbchannel.cpp dvbsignalmonitor.cpp - SOURCES += dvbcam.cpp + HEADERS += recorders/dvbchannel.h + HEADERS += recorders/dvbsignalmonitor.h + HEADERS += recorders/dvbcam.h + SOURCES += recorders/dvbchannel.cpp + SOURCES += recorders/dvbsignalmonitor.cpp + SOURCES += recorders/dvbcam.cpp # DVB Recorder - HEADERS += dvbrecorder.h dvbstreamhandler.h - SOURCES += dvbrecorder.cpp dvbstreamhandler.cpp + HEADERS += recorders/dvbrecorder.h + HEADERS += recorders/dvbstreamhandler.h + SOURCES += recorders/dvbrecorder.cpp + SOURCES += recorders/dvbstreamhandler.cpp - HEADERS *= streamhandler.h - SOURCES *= streamhandler.cpp + HEADERS *= recorders/streamhandler.h + SOURCES *= recorders/streamhandler.cpp # Misc - HEADERS += dvbdev/dvbci.h - SOURCES += dvbdev/dvbci.cpp + HEADERS += recorders/dvbdev/dvbci.h + SOURCES += recorders/dvbdev/dvbci.cpp DEFINES += USING_DVB } using_asi { # Channel stuff - HEADERS += asichannel.h asisignalmonitor.h - SOURCES += asichannel.cpp asisignalmonitor.cpp + HEADERS += recorders/asichannel.h + HEADERS += recorders/asisignalmonitor.h + SOURCES += recorders/asichannel.cpp + SOURCES += recorders/asisignalmonitor.cpp # ASI Recorder - HEADERS += asirecorder.h asistreamhandler.h - SOURCES += asirecorder.cpp asistreamhandler.cpp + HEADERS += recorders/asirecorder.h + HEADERS += recorders/asistreamhandler.h + SOURCES += recorders/asirecorder.cpp + SOURCES += recorders/asistreamhandler.cpp - HEADERS *= streamhandler.h - SOURCES *= streamhandler.cpp + HEADERS *= recorders/streamhandler.h + SOURCES *= recorders/streamhandler.cpp DEFINES += USING_ASI } @@ -663,8 +732,6 @@ mingw { DEFINES += USING_MINGW HEADERS += videoout_d3d.h - HEADERS -= NuppelVideoRecorder.h - SOURCES -= NuppelVideoRecorder.cpp SOURCES += videoout_d3d.cpp using_dxva2: DEFINES += USING_DXVA2 diff --git a/mythtv/libs/libmythtv/DeviceReadBuffer.cpp b/mythtv/libs/libmythtv/recorders/DeviceReadBuffer.cpp similarity index 100% rename from mythtv/libs/libmythtv/DeviceReadBuffer.cpp rename to mythtv/libs/libmythtv/recorders/DeviceReadBuffer.cpp diff --git a/mythtv/libs/libmythtv/DeviceReadBuffer.h b/mythtv/libs/libmythtv/recorders/DeviceReadBuffer.h similarity index 100% rename from mythtv/libs/libmythtv/DeviceReadBuffer.h rename to mythtv/libs/libmythtv/recorders/DeviceReadBuffer.h diff --git a/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp b/mythtv/libs/libmythtv/recorders/NuppelVideoRecorder.cpp similarity index 100% rename from mythtv/libs/libmythtv/NuppelVideoRecorder.cpp rename to mythtv/libs/libmythtv/recorders/NuppelVideoRecorder.cpp diff --git a/mythtv/libs/libmythtv/NuppelVideoRecorder.h b/mythtv/libs/libmythtv/recorders/NuppelVideoRecorder.h similarity index 100% rename from mythtv/libs/libmythtv/NuppelVideoRecorder.h rename to mythtv/libs/libmythtv/recorders/NuppelVideoRecorder.h diff --git a/mythtv/libs/libmythtv/RTjpegN.cpp b/mythtv/libs/libmythtv/recorders/RTjpegN.cpp similarity index 100% rename from mythtv/libs/libmythtv/RTjpegN.cpp rename to mythtv/libs/libmythtv/recorders/RTjpegN.cpp diff --git a/mythtv/libs/libmythtv/RTjpegN.h b/mythtv/libs/libmythtv/recorders/RTjpegN.h similarity index 100% rename from mythtv/libs/libmythtv/RTjpegN.h rename to mythtv/libs/libmythtv/recorders/RTjpegN.h diff --git a/mythtv/libs/libmythtv/analogsignalmonitor.cpp b/mythtv/libs/libmythtv/recorders/analogsignalmonitor.cpp similarity index 100% rename from mythtv/libs/libmythtv/analogsignalmonitor.cpp rename to mythtv/libs/libmythtv/recorders/analogsignalmonitor.cpp diff --git a/mythtv/libs/libmythtv/analogsignalmonitor.h b/mythtv/libs/libmythtv/recorders/analogsignalmonitor.h similarity index 100% rename from mythtv/libs/libmythtv/analogsignalmonitor.h rename to mythtv/libs/libmythtv/recorders/analogsignalmonitor.h diff --git a/mythtv/libs/libmythtv/asichannel.cpp b/mythtv/libs/libmythtv/recorders/asichannel.cpp similarity index 100% rename from mythtv/libs/libmythtv/asichannel.cpp rename to mythtv/libs/libmythtv/recorders/asichannel.cpp diff --git a/mythtv/libs/libmythtv/asichannel.h b/mythtv/libs/libmythtv/recorders/asichannel.h similarity index 100% rename from mythtv/libs/libmythtv/asichannel.h rename to mythtv/libs/libmythtv/recorders/asichannel.h diff --git a/mythtv/libs/libmythtv/asirecorder.cpp b/mythtv/libs/libmythtv/recorders/asirecorder.cpp similarity index 100% rename from mythtv/libs/libmythtv/asirecorder.cpp rename to mythtv/libs/libmythtv/recorders/asirecorder.cpp diff --git a/mythtv/libs/libmythtv/asirecorder.h b/mythtv/libs/libmythtv/recorders/asirecorder.h similarity index 100% rename from mythtv/libs/libmythtv/asirecorder.h rename to mythtv/libs/libmythtv/recorders/asirecorder.h diff --git a/mythtv/libs/libmythtv/asisignalmonitor.cpp b/mythtv/libs/libmythtv/recorders/asisignalmonitor.cpp similarity index 100% rename from mythtv/libs/libmythtv/asisignalmonitor.cpp rename to mythtv/libs/libmythtv/recorders/asisignalmonitor.cpp diff --git a/mythtv/libs/libmythtv/asisignalmonitor.h b/mythtv/libs/libmythtv/recorders/asisignalmonitor.h similarity index 100% rename from mythtv/libs/libmythtv/asisignalmonitor.h rename to mythtv/libs/libmythtv/recorders/asisignalmonitor.h diff --git a/mythtv/libs/libmythtv/asistreamhandler.cpp b/mythtv/libs/libmythtv/recorders/asistreamhandler.cpp similarity index 100% rename from mythtv/libs/libmythtv/asistreamhandler.cpp rename to mythtv/libs/libmythtv/recorders/asistreamhandler.cpp diff --git a/mythtv/libs/libmythtv/asistreamhandler.h b/mythtv/libs/libmythtv/recorders/asistreamhandler.h similarity index 100% rename from mythtv/libs/libmythtv/asistreamhandler.h rename to mythtv/libs/libmythtv/recorders/asistreamhandler.h diff --git a/mythtv/libs/libmythtv/audioinput.cpp b/mythtv/libs/libmythtv/recorders/audioinput.cpp similarity index 100% rename from mythtv/libs/libmythtv/audioinput.cpp rename to mythtv/libs/libmythtv/recorders/audioinput.cpp diff --git a/mythtv/libs/libmythtv/audioinput.h b/mythtv/libs/libmythtv/recorders/audioinput.h similarity index 100% rename from mythtv/libs/libmythtv/audioinput.h rename to mythtv/libs/libmythtv/recorders/audioinput.h diff --git a/mythtv/libs/libmythtv/audioinputalsa.cpp b/mythtv/libs/libmythtv/recorders/audioinputalsa.cpp similarity index 100% rename from mythtv/libs/libmythtv/audioinputalsa.cpp rename to mythtv/libs/libmythtv/recorders/audioinputalsa.cpp diff --git a/mythtv/libs/libmythtv/audioinputalsa.h b/mythtv/libs/libmythtv/recorders/audioinputalsa.h similarity index 100% rename from mythtv/libs/libmythtv/audioinputalsa.h rename to mythtv/libs/libmythtv/recorders/audioinputalsa.h diff --git a/mythtv/libs/libmythtv/audioinputoss.cpp b/mythtv/libs/libmythtv/recorders/audioinputoss.cpp similarity index 100% rename from mythtv/libs/libmythtv/audioinputoss.cpp rename to mythtv/libs/libmythtv/recorders/audioinputoss.cpp diff --git a/mythtv/libs/libmythtv/audioinputoss.h b/mythtv/libs/libmythtv/recorders/audioinputoss.h similarity index 100% rename from mythtv/libs/libmythtv/audioinputoss.h rename to mythtv/libs/libmythtv/recorders/audioinputoss.h diff --git a/mythtv/libs/libmythtv/avcinfo.cpp b/mythtv/libs/libmythtv/recorders/avcinfo.cpp similarity index 100% rename from mythtv/libs/libmythtv/avcinfo.cpp rename to mythtv/libs/libmythtv/recorders/avcinfo.cpp diff --git a/mythtv/libs/libmythtv/avcinfo.h b/mythtv/libs/libmythtv/recorders/avcinfo.h similarity index 100% rename from mythtv/libs/libmythtv/avcinfo.h rename to mythtv/libs/libmythtv/recorders/avcinfo.h diff --git a/mythtv/libs/libmythtv/cetonchannel.cpp b/mythtv/libs/libmythtv/recorders/cetonchannel.cpp similarity index 100% rename from mythtv/libs/libmythtv/cetonchannel.cpp rename to mythtv/libs/libmythtv/recorders/cetonchannel.cpp diff --git a/mythtv/libs/libmythtv/cetonchannel.h b/mythtv/libs/libmythtv/recorders/cetonchannel.h similarity index 100% rename from mythtv/libs/libmythtv/cetonchannel.h rename to mythtv/libs/libmythtv/recorders/cetonchannel.h diff --git a/mythtv/libs/libmythtv/cetonrecorder.cpp b/mythtv/libs/libmythtv/recorders/cetonrecorder.cpp similarity index 100% rename from mythtv/libs/libmythtv/cetonrecorder.cpp rename to mythtv/libs/libmythtv/recorders/cetonrecorder.cpp diff --git a/mythtv/libs/libmythtv/cetonrecorder.h b/mythtv/libs/libmythtv/recorders/cetonrecorder.h similarity index 100% rename from mythtv/libs/libmythtv/cetonrecorder.h rename to mythtv/libs/libmythtv/recorders/cetonrecorder.h diff --git a/mythtv/libs/libmythtv/cetonrtsp.cpp b/mythtv/libs/libmythtv/recorders/cetonrtsp.cpp similarity index 100% rename from mythtv/libs/libmythtv/cetonrtsp.cpp rename to mythtv/libs/libmythtv/recorders/cetonrtsp.cpp diff --git a/mythtv/libs/libmythtv/cetonrtsp.h b/mythtv/libs/libmythtv/recorders/cetonrtsp.h similarity index 100% rename from mythtv/libs/libmythtv/cetonrtsp.h rename to mythtv/libs/libmythtv/recorders/cetonrtsp.h diff --git a/mythtv/libs/libmythtv/cetonsignalmonitor.cpp b/mythtv/libs/libmythtv/recorders/cetonsignalmonitor.cpp similarity index 100% rename from mythtv/libs/libmythtv/cetonsignalmonitor.cpp rename to mythtv/libs/libmythtv/recorders/cetonsignalmonitor.cpp diff --git a/mythtv/libs/libmythtv/cetonsignalmonitor.h b/mythtv/libs/libmythtv/recorders/cetonsignalmonitor.h similarity index 100% rename from mythtv/libs/libmythtv/cetonsignalmonitor.h rename to mythtv/libs/libmythtv/recorders/cetonsignalmonitor.h diff --git a/mythtv/libs/libmythtv/cetonstreamhandler.cpp b/mythtv/libs/libmythtv/recorders/cetonstreamhandler.cpp similarity index 100% rename from mythtv/libs/libmythtv/cetonstreamhandler.cpp rename to mythtv/libs/libmythtv/recorders/cetonstreamhandler.cpp diff --git a/mythtv/libs/libmythtv/cetonstreamhandler.h b/mythtv/libs/libmythtv/recorders/cetonstreamhandler.h similarity index 100% rename from mythtv/libs/libmythtv/cetonstreamhandler.h rename to mythtv/libs/libmythtv/recorders/cetonstreamhandler.h diff --git a/mythtv/libs/libmythtv/channelbase.cpp b/mythtv/libs/libmythtv/recorders/channelbase.cpp similarity index 100% rename from mythtv/libs/libmythtv/channelbase.cpp rename to mythtv/libs/libmythtv/recorders/channelbase.cpp diff --git a/mythtv/libs/libmythtv/channelbase.h b/mythtv/libs/libmythtv/recorders/channelbase.h similarity index 100% rename from mythtv/libs/libmythtv/channelbase.h rename to mythtv/libs/libmythtv/recorders/channelbase.h diff --git a/mythtv/libs/libmythtv/darwinavcinfo.cpp b/mythtv/libs/libmythtv/recorders/darwinavcinfo.cpp similarity index 100% rename from mythtv/libs/libmythtv/darwinavcinfo.cpp rename to mythtv/libs/libmythtv/recorders/darwinavcinfo.cpp diff --git a/mythtv/libs/libmythtv/darwinavcinfo.h b/mythtv/libs/libmythtv/recorders/darwinavcinfo.h similarity index 100% rename from mythtv/libs/libmythtv/darwinavcinfo.h rename to mythtv/libs/libmythtv/recorders/darwinavcinfo.h diff --git a/mythtv/libs/libmythtv/darwinfirewiredevice.cpp b/mythtv/libs/libmythtv/recorders/darwinfirewiredevice.cpp similarity index 100% rename from mythtv/libs/libmythtv/darwinfirewiredevice.cpp rename to mythtv/libs/libmythtv/recorders/darwinfirewiredevice.cpp diff --git a/mythtv/libs/libmythtv/darwinfirewiredevice.h b/mythtv/libs/libmythtv/recorders/darwinfirewiredevice.h similarity index 100% rename from mythtv/libs/libmythtv/darwinfirewiredevice.h rename to mythtv/libs/libmythtv/recorders/darwinfirewiredevice.h diff --git a/mythtv/libs/libmythtv/dtvchannel.cpp b/mythtv/libs/libmythtv/recorders/dtvchannel.cpp similarity index 100% rename from mythtv/libs/libmythtv/dtvchannel.cpp rename to mythtv/libs/libmythtv/recorders/dtvchannel.cpp diff --git a/mythtv/libs/libmythtv/dtvchannel.h b/mythtv/libs/libmythtv/recorders/dtvchannel.h similarity index 100% rename from mythtv/libs/libmythtv/dtvchannel.h rename to mythtv/libs/libmythtv/recorders/dtvchannel.h diff --git a/mythtv/libs/libmythtv/dtvrecorder.cpp b/mythtv/libs/libmythtv/recorders/dtvrecorder.cpp similarity index 100% rename from mythtv/libs/libmythtv/dtvrecorder.cpp rename to mythtv/libs/libmythtv/recorders/dtvrecorder.cpp diff --git a/mythtv/libs/libmythtv/dtvrecorder.h b/mythtv/libs/libmythtv/recorders/dtvrecorder.h similarity index 100% rename from mythtv/libs/libmythtv/dtvrecorder.h rename to mythtv/libs/libmythtv/recorders/dtvrecorder.h diff --git a/mythtv/libs/libmythtv/dtvsignalmonitor.cpp b/mythtv/libs/libmythtv/recorders/dtvsignalmonitor.cpp similarity index 100% rename from mythtv/libs/libmythtv/dtvsignalmonitor.cpp rename to mythtv/libs/libmythtv/recorders/dtvsignalmonitor.cpp diff --git a/mythtv/libs/libmythtv/dtvsignalmonitor.h b/mythtv/libs/libmythtv/recorders/dtvsignalmonitor.h similarity index 100% rename from mythtv/libs/libmythtv/dtvsignalmonitor.h rename to mythtv/libs/libmythtv/recorders/dtvsignalmonitor.h diff --git a/mythtv/libs/libmythtv/dummychannel.h b/mythtv/libs/libmythtv/recorders/dummychannel.h similarity index 100% rename from mythtv/libs/libmythtv/dummychannel.h rename to mythtv/libs/libmythtv/recorders/dummychannel.h diff --git a/mythtv/libs/libmythtv/dvbcam.cpp b/mythtv/libs/libmythtv/recorders/dvbcam.cpp similarity index 100% rename from mythtv/libs/libmythtv/dvbcam.cpp rename to mythtv/libs/libmythtv/recorders/dvbcam.cpp diff --git a/mythtv/libs/libmythtv/dvbcam.h b/mythtv/libs/libmythtv/recorders/dvbcam.h similarity index 100% rename from mythtv/libs/libmythtv/dvbcam.h rename to mythtv/libs/libmythtv/recorders/dvbcam.h diff --git a/mythtv/libs/libmythtv/dvbchannel.cpp b/mythtv/libs/libmythtv/recorders/dvbchannel.cpp similarity index 100% rename from mythtv/libs/libmythtv/dvbchannel.cpp rename to mythtv/libs/libmythtv/recorders/dvbchannel.cpp diff --git a/mythtv/libs/libmythtv/dvbchannel.h b/mythtv/libs/libmythtv/recorders/dvbchannel.h similarity index 100% rename from mythtv/libs/libmythtv/dvbchannel.h rename to mythtv/libs/libmythtv/recorders/dvbchannel.h diff --git a/mythtv/libs/libmythtv/dvbdev/README b/mythtv/libs/libmythtv/recorders/dvbdev/README similarity index 100% rename from mythtv/libs/libmythtv/dvbdev/README rename to mythtv/libs/libmythtv/recorders/dvbdev/README diff --git a/mythtv/libs/libmythtv/dvbdev/dvbci.cpp b/mythtv/libs/libmythtv/recorders/dvbdev/dvbci.cpp similarity index 100% rename from mythtv/libs/libmythtv/dvbdev/dvbci.cpp rename to mythtv/libs/libmythtv/recorders/dvbdev/dvbci.cpp diff --git a/mythtv/libs/libmythtv/dvbdev/dvbci.h b/mythtv/libs/libmythtv/recorders/dvbdev/dvbci.h similarity index 100% rename from mythtv/libs/libmythtv/dvbdev/dvbci.h rename to mythtv/libs/libmythtv/recorders/dvbdev/dvbci.h diff --git a/mythtv/libs/libmythtv/dvbrecorder.cpp b/mythtv/libs/libmythtv/recorders/dvbrecorder.cpp similarity index 100% rename from mythtv/libs/libmythtv/dvbrecorder.cpp rename to mythtv/libs/libmythtv/recorders/dvbrecorder.cpp diff --git a/mythtv/libs/libmythtv/dvbrecorder.h b/mythtv/libs/libmythtv/recorders/dvbrecorder.h similarity index 100% rename from mythtv/libs/libmythtv/dvbrecorder.h rename to mythtv/libs/libmythtv/recorders/dvbrecorder.h diff --git a/mythtv/libs/libmythtv/dvbsignalmonitor.cpp b/mythtv/libs/libmythtv/recorders/dvbsignalmonitor.cpp similarity index 100% rename from mythtv/libs/libmythtv/dvbsignalmonitor.cpp rename to mythtv/libs/libmythtv/recorders/dvbsignalmonitor.cpp diff --git a/mythtv/libs/libmythtv/dvbsignalmonitor.h b/mythtv/libs/libmythtv/recorders/dvbsignalmonitor.h similarity index 100% rename from mythtv/libs/libmythtv/dvbsignalmonitor.h rename to mythtv/libs/libmythtv/recorders/dvbsignalmonitor.h diff --git a/mythtv/libs/libmythtv/dvbstreamhandler.cpp b/mythtv/libs/libmythtv/recorders/dvbstreamhandler.cpp similarity index 100% rename from mythtv/libs/libmythtv/dvbstreamhandler.cpp rename to mythtv/libs/libmythtv/recorders/dvbstreamhandler.cpp diff --git a/mythtv/libs/libmythtv/dvbstreamhandler.h b/mythtv/libs/libmythtv/recorders/dvbstreamhandler.h similarity index 100% rename from mythtv/libs/libmythtv/dvbstreamhandler.h rename to mythtv/libs/libmythtv/recorders/dvbstreamhandler.h diff --git a/mythtv/libs/libmythtv/dvbtypes.cpp b/mythtv/libs/libmythtv/recorders/dvbtypes.cpp similarity index 100% rename from mythtv/libs/libmythtv/dvbtypes.cpp rename to mythtv/libs/libmythtv/recorders/dvbtypes.cpp diff --git a/mythtv/libs/libmythtv/dvbtypes.h b/mythtv/libs/libmythtv/recorders/dvbtypes.h similarity index 100% rename from mythtv/libs/libmythtv/dvbtypes.h rename to mythtv/libs/libmythtv/recorders/dvbtypes.h diff --git a/mythtv/libs/libmythtv/firewirechannel.cpp b/mythtv/libs/libmythtv/recorders/firewirechannel.cpp similarity index 100% rename from mythtv/libs/libmythtv/firewirechannel.cpp rename to mythtv/libs/libmythtv/recorders/firewirechannel.cpp diff --git a/mythtv/libs/libmythtv/firewirechannel.h b/mythtv/libs/libmythtv/recorders/firewirechannel.h similarity index 100% rename from mythtv/libs/libmythtv/firewirechannel.h rename to mythtv/libs/libmythtv/recorders/firewirechannel.h diff --git a/mythtv/libs/libmythtv/firewiredevice.cpp b/mythtv/libs/libmythtv/recorders/firewiredevice.cpp similarity index 100% rename from mythtv/libs/libmythtv/firewiredevice.cpp rename to mythtv/libs/libmythtv/recorders/firewiredevice.cpp diff --git a/mythtv/libs/libmythtv/firewiredevice.h b/mythtv/libs/libmythtv/recorders/firewiredevice.h similarity index 100% rename from mythtv/libs/libmythtv/firewiredevice.h rename to mythtv/libs/libmythtv/recorders/firewiredevice.h diff --git a/mythtv/libs/libmythtv/firewirerecorder.cpp b/mythtv/libs/libmythtv/recorders/firewirerecorder.cpp similarity index 100% rename from mythtv/libs/libmythtv/firewirerecorder.cpp rename to mythtv/libs/libmythtv/recorders/firewirerecorder.cpp diff --git a/mythtv/libs/libmythtv/firewirerecorder.h b/mythtv/libs/libmythtv/recorders/firewirerecorder.h similarity index 100% rename from mythtv/libs/libmythtv/firewirerecorder.h rename to mythtv/libs/libmythtv/recorders/firewirerecorder.h diff --git a/mythtv/libs/libmythtv/firewiresignalmonitor.cpp b/mythtv/libs/libmythtv/recorders/firewiresignalmonitor.cpp similarity index 100% rename from mythtv/libs/libmythtv/firewiresignalmonitor.cpp rename to mythtv/libs/libmythtv/recorders/firewiresignalmonitor.cpp diff --git a/mythtv/libs/libmythtv/firewiresignalmonitor.h b/mythtv/libs/libmythtv/recorders/firewiresignalmonitor.h similarity index 100% rename from mythtv/libs/libmythtv/firewiresignalmonitor.h rename to mythtv/libs/libmythtv/recorders/firewiresignalmonitor.h diff --git a/mythtv/libs/libmythtv/go7007_myth.h b/mythtv/libs/libmythtv/recorders/go7007_myth.h similarity index 100% rename from mythtv/libs/libmythtv/go7007_myth.h rename to mythtv/libs/libmythtv/recorders/go7007_myth.h diff --git a/mythtv/libs/libmythtv/hdhrchannel.cpp b/mythtv/libs/libmythtv/recorders/hdhrchannel.cpp similarity index 100% rename from mythtv/libs/libmythtv/hdhrchannel.cpp rename to mythtv/libs/libmythtv/recorders/hdhrchannel.cpp diff --git a/mythtv/libs/libmythtv/hdhrchannel.h b/mythtv/libs/libmythtv/recorders/hdhrchannel.h similarity index 100% rename from mythtv/libs/libmythtv/hdhrchannel.h rename to mythtv/libs/libmythtv/recorders/hdhrchannel.h diff --git a/mythtv/libs/libmythtv/hdhrrecorder.cpp b/mythtv/libs/libmythtv/recorders/hdhrrecorder.cpp similarity index 100% rename from mythtv/libs/libmythtv/hdhrrecorder.cpp rename to mythtv/libs/libmythtv/recorders/hdhrrecorder.cpp diff --git a/mythtv/libs/libmythtv/hdhrrecorder.h b/mythtv/libs/libmythtv/recorders/hdhrrecorder.h similarity index 100% rename from mythtv/libs/libmythtv/hdhrrecorder.h rename to mythtv/libs/libmythtv/recorders/hdhrrecorder.h diff --git a/mythtv/libs/libmythtv/hdhrsignalmonitor.cpp b/mythtv/libs/libmythtv/recorders/hdhrsignalmonitor.cpp similarity index 100% rename from mythtv/libs/libmythtv/hdhrsignalmonitor.cpp rename to mythtv/libs/libmythtv/recorders/hdhrsignalmonitor.cpp diff --git a/mythtv/libs/libmythtv/hdhrsignalmonitor.h b/mythtv/libs/libmythtv/recorders/hdhrsignalmonitor.h similarity index 100% rename from mythtv/libs/libmythtv/hdhrsignalmonitor.h rename to mythtv/libs/libmythtv/recorders/hdhrsignalmonitor.h diff --git a/mythtv/libs/libmythtv/hdhrstreamhandler.cpp b/mythtv/libs/libmythtv/recorders/hdhrstreamhandler.cpp similarity index 100% rename from mythtv/libs/libmythtv/hdhrstreamhandler.cpp rename to mythtv/libs/libmythtv/recorders/hdhrstreamhandler.cpp diff --git a/mythtv/libs/libmythtv/hdhrstreamhandler.h b/mythtv/libs/libmythtv/recorders/hdhrstreamhandler.h similarity index 100% rename from mythtv/libs/libmythtv/hdhrstreamhandler.h rename to mythtv/libs/libmythtv/recorders/hdhrstreamhandler.h diff --git a/mythtv/libs/libmythtv/importrecorder.cpp b/mythtv/libs/libmythtv/recorders/importrecorder.cpp similarity index 100% rename from mythtv/libs/libmythtv/importrecorder.cpp rename to mythtv/libs/libmythtv/recorders/importrecorder.cpp diff --git a/mythtv/libs/libmythtv/importrecorder.h b/mythtv/libs/libmythtv/recorders/importrecorder.h similarity index 100% rename from mythtv/libs/libmythtv/importrecorder.h rename to mythtv/libs/libmythtv/recorders/importrecorder.h diff --git a/mythtv/libs/libmythtv/iptvchannel.cpp b/mythtv/libs/libmythtv/recorders/iptvchannel.cpp similarity index 100% rename from mythtv/libs/libmythtv/iptvchannel.cpp rename to mythtv/libs/libmythtv/recorders/iptvchannel.cpp diff --git a/mythtv/libs/libmythtv/iptvchannel.h b/mythtv/libs/libmythtv/recorders/iptvchannel.h similarity index 100% rename from mythtv/libs/libmythtv/iptvchannel.h rename to mythtv/libs/libmythtv/recorders/iptvchannel.h diff --git a/mythtv/libs/libmythtv/iptvrecorder.cpp b/mythtv/libs/libmythtv/recorders/iptvrecorder.cpp similarity index 100% rename from mythtv/libs/libmythtv/iptvrecorder.cpp rename to mythtv/libs/libmythtv/recorders/iptvrecorder.cpp diff --git a/mythtv/libs/libmythtv/iptvrecorder.h b/mythtv/libs/libmythtv/recorders/iptvrecorder.h similarity index 100% rename from mythtv/libs/libmythtv/iptvrecorder.h rename to mythtv/libs/libmythtv/recorders/iptvrecorder.h diff --git a/mythtv/libs/libmythtv/iptvsignalmonitor.cpp b/mythtv/libs/libmythtv/recorders/iptvsignalmonitor.cpp similarity index 100% rename from mythtv/libs/libmythtv/iptvsignalmonitor.cpp rename to mythtv/libs/libmythtv/recorders/iptvsignalmonitor.cpp diff --git a/mythtv/libs/libmythtv/iptvsignalmonitor.h b/mythtv/libs/libmythtv/recorders/iptvsignalmonitor.h similarity index 100% rename from mythtv/libs/libmythtv/iptvsignalmonitor.h rename to mythtv/libs/libmythtv/recorders/iptvsignalmonitor.h diff --git a/mythtv/libs/libmythtv/iptvstreamhandler.cpp b/mythtv/libs/libmythtv/recorders/iptvstreamhandler.cpp similarity index 100% rename from mythtv/libs/libmythtv/iptvstreamhandler.cpp rename to mythtv/libs/libmythtv/recorders/iptvstreamhandler.cpp diff --git a/mythtv/libs/libmythtv/iptvstreamhandler.h b/mythtv/libs/libmythtv/recorders/iptvstreamhandler.h similarity index 100% rename from mythtv/libs/libmythtv/iptvstreamhandler.h rename to mythtv/libs/libmythtv/recorders/iptvstreamhandler.h diff --git a/mythtv/libs/libmythtv/linuxavcinfo.cpp b/mythtv/libs/libmythtv/recorders/linuxavcinfo.cpp similarity index 100% rename from mythtv/libs/libmythtv/linuxavcinfo.cpp rename to mythtv/libs/libmythtv/recorders/linuxavcinfo.cpp diff --git a/mythtv/libs/libmythtv/linuxavcinfo.h b/mythtv/libs/libmythtv/recorders/linuxavcinfo.h similarity index 100% rename from mythtv/libs/libmythtv/linuxavcinfo.h rename to mythtv/libs/libmythtv/recorders/linuxavcinfo.h diff --git a/mythtv/libs/libmythtv/linuxfirewiredevice.cpp b/mythtv/libs/libmythtv/recorders/linuxfirewiredevice.cpp similarity index 100% rename from mythtv/libs/libmythtv/linuxfirewiredevice.cpp rename to mythtv/libs/libmythtv/recorders/linuxfirewiredevice.cpp diff --git a/mythtv/libs/libmythtv/linuxfirewiredevice.h b/mythtv/libs/libmythtv/recorders/linuxfirewiredevice.h similarity index 100% rename from mythtv/libs/libmythtv/linuxfirewiredevice.h rename to mythtv/libs/libmythtv/recorders/linuxfirewiredevice.h diff --git a/mythtv/libs/libmythtv/mpegrecorder.cpp b/mythtv/libs/libmythtv/recorders/mpegrecorder.cpp similarity index 100% rename from mythtv/libs/libmythtv/mpegrecorder.cpp rename to mythtv/libs/libmythtv/recorders/mpegrecorder.cpp diff --git a/mythtv/libs/libmythtv/mpegrecorder.h b/mythtv/libs/libmythtv/recorders/mpegrecorder.h similarity index 100% rename from mythtv/libs/libmythtv/mpegrecorder.h rename to mythtv/libs/libmythtv/recorders/mpegrecorder.h diff --git a/mythtv/libs/libmythtv/recorderbase.cpp b/mythtv/libs/libmythtv/recorders/recorderbase.cpp similarity index 100% rename from mythtv/libs/libmythtv/recorderbase.cpp rename to mythtv/libs/libmythtv/recorders/recorderbase.cpp diff --git a/mythtv/libs/libmythtv/recorderbase.h b/mythtv/libs/libmythtv/recorders/recorderbase.h similarity index 100% rename from mythtv/libs/libmythtv/recorderbase.h rename to mythtv/libs/libmythtv/recorders/recorderbase.h diff --git a/mythtv/libs/libmythtv/rtp/README.RTSP b/mythtv/libs/libmythtv/recorders/rtp/README.RTSP similarity index 100% rename from mythtv/libs/libmythtv/rtp/README.RTSP rename to mythtv/libs/libmythtv/recorders/rtp/README.RTSP diff --git a/mythtv/libs/libmythtv/rtp/README.UDP b/mythtv/libs/libmythtv/recorders/rtp/README.UDP similarity index 100% rename from mythtv/libs/libmythtv/rtp/README.UDP rename to mythtv/libs/libmythtv/recorders/rtp/README.UDP diff --git a/mythtv/libs/libmythtv/rtp/packetbuffer.cpp b/mythtv/libs/libmythtv/recorders/rtp/packetbuffer.cpp similarity index 100% rename from mythtv/libs/libmythtv/rtp/packetbuffer.cpp rename to mythtv/libs/libmythtv/recorders/rtp/packetbuffer.cpp diff --git a/mythtv/libs/libmythtv/rtp/packetbuffer.h b/mythtv/libs/libmythtv/recorders/rtp/packetbuffer.h similarity index 100% rename from mythtv/libs/libmythtv/rtp/packetbuffer.h rename to mythtv/libs/libmythtv/recorders/rtp/packetbuffer.h diff --git a/mythtv/libs/libmythtv/rtp/rtpdatapacket.h b/mythtv/libs/libmythtv/recorders/rtp/rtpdatapacket.h similarity index 100% rename from mythtv/libs/libmythtv/rtp/rtpdatapacket.h rename to mythtv/libs/libmythtv/recorders/rtp/rtpdatapacket.h diff --git a/mythtv/libs/libmythtv/rtp/rtpfecpacket.h b/mythtv/libs/libmythtv/recorders/rtp/rtpfecpacket.h similarity index 100% rename from mythtv/libs/libmythtv/rtp/rtpfecpacket.h rename to mythtv/libs/libmythtv/recorders/rtp/rtpfecpacket.h diff --git a/mythtv/libs/libmythtv/rtp/rtppacketbuffer.cpp b/mythtv/libs/libmythtv/recorders/rtp/rtppacketbuffer.cpp similarity index 100% rename from mythtv/libs/libmythtv/rtp/rtppacketbuffer.cpp rename to mythtv/libs/libmythtv/recorders/rtp/rtppacketbuffer.cpp diff --git a/mythtv/libs/libmythtv/rtp/rtppacketbuffer.h b/mythtv/libs/libmythtv/recorders/rtp/rtppacketbuffer.h similarity index 100% rename from mythtv/libs/libmythtv/rtp/rtppacketbuffer.h rename to mythtv/libs/libmythtv/recorders/rtp/rtppacketbuffer.h diff --git a/mythtv/libs/libmythtv/rtp/rtptsdatapacket.h b/mythtv/libs/libmythtv/recorders/rtp/rtptsdatapacket.h similarity index 100% rename from mythtv/libs/libmythtv/rtp/rtptsdatapacket.h rename to mythtv/libs/libmythtv/recorders/rtp/rtptsdatapacket.h diff --git a/mythtv/libs/libmythtv/rtp/udppacket.h b/mythtv/libs/libmythtv/recorders/rtp/udppacket.h similarity index 100% rename from mythtv/libs/libmythtv/rtp/udppacket.h rename to mythtv/libs/libmythtv/recorders/rtp/udppacket.h diff --git a/mythtv/libs/libmythtv/rtp/udppacketbuffer.h b/mythtv/libs/libmythtv/recorders/rtp/udppacketbuffer.h similarity index 100% rename from mythtv/libs/libmythtv/rtp/udppacketbuffer.h rename to mythtv/libs/libmythtv/recorders/rtp/udppacketbuffer.h diff --git a/mythtv/libs/libmythtv/scriptsignalmonitor.h b/mythtv/libs/libmythtv/recorders/scriptsignalmonitor.h similarity index 100% rename from mythtv/libs/libmythtv/scriptsignalmonitor.h rename to mythtv/libs/libmythtv/recorders/scriptsignalmonitor.h diff --git a/mythtv/libs/libmythtv/signalmonitor.cpp b/mythtv/libs/libmythtv/recorders/signalmonitor.cpp similarity index 100% rename from mythtv/libs/libmythtv/signalmonitor.cpp rename to mythtv/libs/libmythtv/recorders/signalmonitor.cpp diff --git a/mythtv/libs/libmythtv/signalmonitor.h b/mythtv/libs/libmythtv/recorders/signalmonitor.h similarity index 100% rename from mythtv/libs/libmythtv/signalmonitor.h rename to mythtv/libs/libmythtv/recorders/signalmonitor.h diff --git a/mythtv/libs/libmythtv/streamhandler.cpp b/mythtv/libs/libmythtv/recorders/streamhandler.cpp similarity index 100% rename from mythtv/libs/libmythtv/streamhandler.cpp rename to mythtv/libs/libmythtv/recorders/streamhandler.cpp diff --git a/mythtv/libs/libmythtv/streamhandler.h b/mythtv/libs/libmythtv/recorders/streamhandler.h similarity index 100% rename from mythtv/libs/libmythtv/streamhandler.h rename to mythtv/libs/libmythtv/recorders/streamhandler.h diff --git a/mythtv/libs/libmythtv/v4lchannel.cpp b/mythtv/libs/libmythtv/recorders/v4lchannel.cpp similarity index 100% rename from mythtv/libs/libmythtv/v4lchannel.cpp rename to mythtv/libs/libmythtv/recorders/v4lchannel.cpp diff --git a/mythtv/libs/libmythtv/v4lchannel.h b/mythtv/libs/libmythtv/recorders/v4lchannel.h similarity index 100% rename from mythtv/libs/libmythtv/v4lchannel.h rename to mythtv/libs/libmythtv/recorders/v4lchannel.h diff --git a/mythtv/libs/libmythtv/v4lrecorder.cpp b/mythtv/libs/libmythtv/recorders/v4lrecorder.cpp similarity index 100% rename from mythtv/libs/libmythtv/v4lrecorder.cpp rename to mythtv/libs/libmythtv/recorders/v4lrecorder.cpp diff --git a/mythtv/libs/libmythtv/v4lrecorder.h b/mythtv/libs/libmythtv/recorders/v4lrecorder.h similarity index 100% rename from mythtv/libs/libmythtv/v4lrecorder.h rename to mythtv/libs/libmythtv/recorders/v4lrecorder.h diff --git a/mythtv/libs/libmythtv/vbitext/cc.cpp b/mythtv/libs/libmythtv/recorders/vbitext/cc.cpp similarity index 100% rename from mythtv/libs/libmythtv/vbitext/cc.cpp rename to mythtv/libs/libmythtv/recorders/vbitext/cc.cpp diff --git a/mythtv/libs/libmythtv/vbitext/cc.h b/mythtv/libs/libmythtv/recorders/vbitext/cc.h similarity index 100% rename from mythtv/libs/libmythtv/vbitext/cc.h rename to mythtv/libs/libmythtv/recorders/vbitext/cc.h diff --git a/mythtv/libs/libmythtv/vbitext/dllist.h b/mythtv/libs/libmythtv/recorders/vbitext/dllist.h similarity index 100% rename from mythtv/libs/libmythtv/vbitext/dllist.h rename to mythtv/libs/libmythtv/recorders/vbitext/dllist.h diff --git a/mythtv/libs/libmythtv/vbitext/hamm.c b/mythtv/libs/libmythtv/recorders/vbitext/hamm.c similarity index 100% rename from mythtv/libs/libmythtv/vbitext/hamm.c rename to mythtv/libs/libmythtv/recorders/vbitext/hamm.c diff --git a/mythtv/libs/libmythtv/vbitext/hamm.h b/mythtv/libs/libmythtv/recorders/vbitext/hamm.h similarity index 100% rename from mythtv/libs/libmythtv/vbitext/hamm.h rename to mythtv/libs/libmythtv/recorders/vbitext/hamm.h diff --git a/mythtv/libs/libmythtv/vbitext/lang.c b/mythtv/libs/libmythtv/recorders/vbitext/lang.c similarity index 100% rename from mythtv/libs/libmythtv/vbitext/lang.c rename to mythtv/libs/libmythtv/recorders/vbitext/lang.c diff --git a/mythtv/libs/libmythtv/vbitext/lang.h b/mythtv/libs/libmythtv/recorders/vbitext/lang.h similarity index 100% rename from mythtv/libs/libmythtv/vbitext/lang.h rename to mythtv/libs/libmythtv/recorders/vbitext/lang.h diff --git a/mythtv/libs/libmythtv/vbitext/vbi.c b/mythtv/libs/libmythtv/recorders/vbitext/vbi.c similarity index 100% rename from mythtv/libs/libmythtv/vbitext/vbi.c rename to mythtv/libs/libmythtv/recorders/vbitext/vbi.c diff --git a/mythtv/libs/libmythtv/vbitext/vbi.h b/mythtv/libs/libmythtv/recorders/vbitext/vbi.h similarity index 100% rename from mythtv/libs/libmythtv/vbitext/vbi.h rename to mythtv/libs/libmythtv/recorders/vbitext/vbi.h diff --git a/mythtv/libs/libmythtv/vbitext/vt.h b/mythtv/libs/libmythtv/recorders/vbitext/vt.h similarity index 100% rename from mythtv/libs/libmythtv/vbitext/vt.h rename to mythtv/libs/libmythtv/recorders/vbitext/vt.h diff --git a/mythtv/programs/mythtranscode/mythtranscode.pro b/mythtv/programs/mythtranscode/mythtranscode.pro index 99ace3431a0..133e7eb66e4 100644 --- a/mythtv/programs/mythtranscode/mythtranscode.pro +++ b/mythtv/programs/mythtranscode/mythtranscode.pro @@ -24,14 +24,16 @@ HEADERS += mpeg2fix.h transcodedefs.h commandlineparser.h HEADERS += replex/element.h replex/mpg_common.h replex/multiplex.h \ replex/pes.h replex/ringbuffer.h replex/ts.h -INCLUDEPATH += replex -INCLUDEPATH += ../../libs/libavcodec -INCLUDEPATH += ../../libs/libavformat -INCLUDEPATH += ../../libs/libavutil +DEPENDPATH += replex +DEPENDPATH += ../../libs/libavcodec +DEPENDPATH += ../../libs/libavformat +DEPENDPATH += ../../libs/libavutil +DEPENDPATH += ../../libs/libmythtv/recorders !contains( CONFIG_LIBMPEG2EXTERNAL, yes) { - DEPENDPATH += ../../libs/libmythmpeg2 - INCLUDEPATH += ../../libs/libmythmpeg2 + DEPENDPATH += ../../libs/libmythmpeg2 LIBS += -L../../libs/libmythmpeg2 -lmythmpeg2-$$LIBVERSION POST_TARGETDEPS += ../../libs/libmythmpeg2/libmythmpeg2-$${MYTH_LIB_EXT} } + +INCLUDEPATH += $$DEPENDPATH