From 5d6b2c4b37668432e014cf432ba3cba0f3001c50 Mon Sep 17 00:00:00 2001 From: Jean-Yves Avenard Date: Fri, 18 May 2012 14:15:34 +1000 Subject: [PATCH] Reorganise libmythtv, creating a DVD, Bluray and HLS sub-folder and moving their respective related code into them. Way too many files in libmythtv, getting lost... Long way to go... --- .../{ => AirPlay}/mythairplayserver.cpp | 0 .../{ => AirPlay}/mythairplayserver.h | 0 .../{ => AirPlay}/mythraopconnection.cpp | 0 .../{ => AirPlay}/mythraopconnection.h | 0 .../{ => AirPlay}/mythraopdevice.cpp | 0 .../libmythtv/{ => AirPlay}/mythraopdevice.h | 0 .../{ => Bluray}/avformatdecoderbd.cpp | 0 .../{ => Bluray}/avformatdecoderbd.h | 0 .../{ => Bluray}/bdoverlayscreen.cpp | 0 .../libmythtv/{ => Bluray}/bdoverlayscreen.h | 0 .../libmythtv/{ => Bluray}/bdringbuffer.cpp | 0 .../libmythtv/{ => Bluray}/bdringbuffer.h | 0 .../libmythtv/{ => Bluray}/mythbdplayer.cpp | 0 .../libmythtv/{ => Bluray}/mythbdplayer.h | 0 .../{ => DVD}/avformatdecoderdvd.cpp | 0 .../libmythtv/{ => DVD}/avformatdecoderdvd.h | 0 .../libmythtv/{ => DVD}/dvdringbuffer.cpp | 0 .../libs/libmythtv/{ => DVD}/dvdringbuffer.h | 0 .../libmythtv/{ => DVD}/mythdvdplayer.cpp | 0 .../libs/libmythtv/{ => DVD}/mythdvdplayer.h | 0 .../libmythtv/{ => HLS}/httplivestream.cpp | 0 .../libs/libmythtv/{ => HLS}/httplivestream.h | 0 .../{ => HLS}/httplivestreambuffer.cpp | 0 .../{ => HLS}/httplivestreambuffer.h | 0 mythtv/libs/libmythtv/avformatdecoder.cpp | 4 +- mythtv/libs/libmythtv/decoderbase.cpp | 4 +- mythtv/libs/libmythtv/libmythtv.pro | 82 +++++++++++-------- mythtv/libs/libmythtv/osd.cpp | 4 +- mythtv/libs/libmythtv/playercontext.cpp | 4 +- mythtv/libs/libmythtv/ringbuffer.cpp | 6 +- mythtv/libs/libmythtv/subtitlescreen.cpp | 1 - mythtv/libs/libmythtv/tv_play.cpp | 4 +- .../programs/mythbackend/services/content.cpp | 2 +- mythtv/programs/mythfrontend/main.cpp | 9 +- mythtv/programs/mythtranscode/transcode.cpp | 2 +- 35 files changed, 70 insertions(+), 52 deletions(-) rename mythtv/libs/libmythtv/{ => AirPlay}/mythairplayserver.cpp (100%) rename mythtv/libs/libmythtv/{ => AirPlay}/mythairplayserver.h (100%) rename mythtv/libs/libmythtv/{ => AirPlay}/mythraopconnection.cpp (100%) rename mythtv/libs/libmythtv/{ => AirPlay}/mythraopconnection.h (100%) rename mythtv/libs/libmythtv/{ => AirPlay}/mythraopdevice.cpp (100%) rename mythtv/libs/libmythtv/{ => AirPlay}/mythraopdevice.h (100%) rename mythtv/libs/libmythtv/{ => Bluray}/avformatdecoderbd.cpp (100%) rename mythtv/libs/libmythtv/{ => Bluray}/avformatdecoderbd.h (100%) rename mythtv/libs/libmythtv/{ => Bluray}/bdoverlayscreen.cpp (100%) rename mythtv/libs/libmythtv/{ => Bluray}/bdoverlayscreen.h (100%) rename mythtv/libs/libmythtv/{ => Bluray}/bdringbuffer.cpp (100%) rename mythtv/libs/libmythtv/{ => Bluray}/bdringbuffer.h (100%) rename mythtv/libs/libmythtv/{ => Bluray}/mythbdplayer.cpp (100%) rename mythtv/libs/libmythtv/{ => Bluray}/mythbdplayer.h (100%) rename mythtv/libs/libmythtv/{ => DVD}/avformatdecoderdvd.cpp (100%) rename mythtv/libs/libmythtv/{ => DVD}/avformatdecoderdvd.h (100%) rename mythtv/libs/libmythtv/{ => DVD}/dvdringbuffer.cpp (100%) rename mythtv/libs/libmythtv/{ => DVD}/dvdringbuffer.h (100%) rename mythtv/libs/libmythtv/{ => DVD}/mythdvdplayer.cpp (100%) rename mythtv/libs/libmythtv/{ => DVD}/mythdvdplayer.h (100%) rename mythtv/libs/libmythtv/{ => HLS}/httplivestream.cpp (100%) rename mythtv/libs/libmythtv/{ => HLS}/httplivestream.h (100%) rename mythtv/libs/libmythtv/{ => HLS}/httplivestreambuffer.cpp (100%) rename mythtv/libs/libmythtv/{ => HLS}/httplivestreambuffer.h (100%) diff --git a/mythtv/libs/libmythtv/mythairplayserver.cpp b/mythtv/libs/libmythtv/AirPlay/mythairplayserver.cpp similarity index 100% rename from mythtv/libs/libmythtv/mythairplayserver.cpp rename to mythtv/libs/libmythtv/AirPlay/mythairplayserver.cpp diff --git a/mythtv/libs/libmythtv/mythairplayserver.h b/mythtv/libs/libmythtv/AirPlay/mythairplayserver.h similarity index 100% rename from mythtv/libs/libmythtv/mythairplayserver.h rename to mythtv/libs/libmythtv/AirPlay/mythairplayserver.h diff --git a/mythtv/libs/libmythtv/mythraopconnection.cpp b/mythtv/libs/libmythtv/AirPlay/mythraopconnection.cpp similarity index 100% rename from mythtv/libs/libmythtv/mythraopconnection.cpp rename to mythtv/libs/libmythtv/AirPlay/mythraopconnection.cpp diff --git a/mythtv/libs/libmythtv/mythraopconnection.h b/mythtv/libs/libmythtv/AirPlay/mythraopconnection.h similarity index 100% rename from mythtv/libs/libmythtv/mythraopconnection.h rename to mythtv/libs/libmythtv/AirPlay/mythraopconnection.h diff --git a/mythtv/libs/libmythtv/mythraopdevice.cpp b/mythtv/libs/libmythtv/AirPlay/mythraopdevice.cpp similarity index 100% rename from mythtv/libs/libmythtv/mythraopdevice.cpp rename to mythtv/libs/libmythtv/AirPlay/mythraopdevice.cpp diff --git a/mythtv/libs/libmythtv/mythraopdevice.h b/mythtv/libs/libmythtv/AirPlay/mythraopdevice.h similarity index 100% rename from mythtv/libs/libmythtv/mythraopdevice.h rename to mythtv/libs/libmythtv/AirPlay/mythraopdevice.h diff --git a/mythtv/libs/libmythtv/avformatdecoderbd.cpp b/mythtv/libs/libmythtv/Bluray/avformatdecoderbd.cpp similarity index 100% rename from mythtv/libs/libmythtv/avformatdecoderbd.cpp rename to mythtv/libs/libmythtv/Bluray/avformatdecoderbd.cpp diff --git a/mythtv/libs/libmythtv/avformatdecoderbd.h b/mythtv/libs/libmythtv/Bluray/avformatdecoderbd.h similarity index 100% rename from mythtv/libs/libmythtv/avformatdecoderbd.h rename to mythtv/libs/libmythtv/Bluray/avformatdecoderbd.h diff --git a/mythtv/libs/libmythtv/bdoverlayscreen.cpp b/mythtv/libs/libmythtv/Bluray/bdoverlayscreen.cpp similarity index 100% rename from mythtv/libs/libmythtv/bdoverlayscreen.cpp rename to mythtv/libs/libmythtv/Bluray/bdoverlayscreen.cpp diff --git a/mythtv/libs/libmythtv/bdoverlayscreen.h b/mythtv/libs/libmythtv/Bluray/bdoverlayscreen.h similarity index 100% rename from mythtv/libs/libmythtv/bdoverlayscreen.h rename to mythtv/libs/libmythtv/Bluray/bdoverlayscreen.h diff --git a/mythtv/libs/libmythtv/bdringbuffer.cpp b/mythtv/libs/libmythtv/Bluray/bdringbuffer.cpp similarity index 100% rename from mythtv/libs/libmythtv/bdringbuffer.cpp rename to mythtv/libs/libmythtv/Bluray/bdringbuffer.cpp diff --git a/mythtv/libs/libmythtv/bdringbuffer.h b/mythtv/libs/libmythtv/Bluray/bdringbuffer.h similarity index 100% rename from mythtv/libs/libmythtv/bdringbuffer.h rename to mythtv/libs/libmythtv/Bluray/bdringbuffer.h diff --git a/mythtv/libs/libmythtv/mythbdplayer.cpp b/mythtv/libs/libmythtv/Bluray/mythbdplayer.cpp similarity index 100% rename from mythtv/libs/libmythtv/mythbdplayer.cpp rename to mythtv/libs/libmythtv/Bluray/mythbdplayer.cpp diff --git a/mythtv/libs/libmythtv/mythbdplayer.h b/mythtv/libs/libmythtv/Bluray/mythbdplayer.h similarity index 100% rename from mythtv/libs/libmythtv/mythbdplayer.h rename to mythtv/libs/libmythtv/Bluray/mythbdplayer.h diff --git a/mythtv/libs/libmythtv/avformatdecoderdvd.cpp b/mythtv/libs/libmythtv/DVD/avformatdecoderdvd.cpp similarity index 100% rename from mythtv/libs/libmythtv/avformatdecoderdvd.cpp rename to mythtv/libs/libmythtv/DVD/avformatdecoderdvd.cpp diff --git a/mythtv/libs/libmythtv/avformatdecoderdvd.h b/mythtv/libs/libmythtv/DVD/avformatdecoderdvd.h similarity index 100% rename from mythtv/libs/libmythtv/avformatdecoderdvd.h rename to mythtv/libs/libmythtv/DVD/avformatdecoderdvd.h diff --git a/mythtv/libs/libmythtv/dvdringbuffer.cpp b/mythtv/libs/libmythtv/DVD/dvdringbuffer.cpp similarity index 100% rename from mythtv/libs/libmythtv/dvdringbuffer.cpp rename to mythtv/libs/libmythtv/DVD/dvdringbuffer.cpp diff --git a/mythtv/libs/libmythtv/dvdringbuffer.h b/mythtv/libs/libmythtv/DVD/dvdringbuffer.h similarity index 100% rename from mythtv/libs/libmythtv/dvdringbuffer.h rename to mythtv/libs/libmythtv/DVD/dvdringbuffer.h diff --git a/mythtv/libs/libmythtv/mythdvdplayer.cpp b/mythtv/libs/libmythtv/DVD/mythdvdplayer.cpp similarity index 100% rename from mythtv/libs/libmythtv/mythdvdplayer.cpp rename to mythtv/libs/libmythtv/DVD/mythdvdplayer.cpp diff --git a/mythtv/libs/libmythtv/mythdvdplayer.h b/mythtv/libs/libmythtv/DVD/mythdvdplayer.h similarity index 100% rename from mythtv/libs/libmythtv/mythdvdplayer.h rename to mythtv/libs/libmythtv/DVD/mythdvdplayer.h diff --git a/mythtv/libs/libmythtv/httplivestream.cpp b/mythtv/libs/libmythtv/HLS/httplivestream.cpp similarity index 100% rename from mythtv/libs/libmythtv/httplivestream.cpp rename to mythtv/libs/libmythtv/HLS/httplivestream.cpp diff --git a/mythtv/libs/libmythtv/httplivestream.h b/mythtv/libs/libmythtv/HLS/httplivestream.h similarity index 100% rename from mythtv/libs/libmythtv/httplivestream.h rename to mythtv/libs/libmythtv/HLS/httplivestream.h diff --git a/mythtv/libs/libmythtv/httplivestreambuffer.cpp b/mythtv/libs/libmythtv/HLS/httplivestreambuffer.cpp similarity index 100% rename from mythtv/libs/libmythtv/httplivestreambuffer.cpp rename to mythtv/libs/libmythtv/HLS/httplivestreambuffer.cpp diff --git a/mythtv/libs/libmythtv/httplivestreambuffer.h b/mythtv/libs/libmythtv/HLS/httplivestreambuffer.h similarity index 100% rename from mythtv/libs/libmythtv/httplivestreambuffer.h rename to mythtv/libs/libmythtv/HLS/httplivestreambuffer.h diff --git a/mythtv/libs/libmythtv/avformatdecoder.cpp b/mythtv/libs/libmythtv/avformatdecoder.cpp index 445a475bd76..c07da430c36 100644 --- a/mythtv/libs/libmythtv/avformatdecoder.cpp +++ b/mythtv/libs/libmythtv/avformatdecoder.cpp @@ -33,10 +33,10 @@ using namespace std; #include "teletextdecoder.h" #include "subtitlereader.h" #include "interactivetv.h" -#include "dvdringbuffer.h" -#include "bdringbuffer.h" #include "videodisplayprofile.h" #include "mythuihelper.h" +#include "DVD/dvdringbuffer.h" +#include "Bluray/bdringbuffer.h" #include "lcddevice.h" diff --git a/mythtv/libs/libmythtv/decoderbase.cpp b/mythtv/libs/libmythtv/decoderbase.cpp index 3286be989ef..cee01debff4 100644 --- a/mythtv/libs/libmythtv/decoderbase.cpp +++ b/mythtv/libs/libmythtv/decoderbase.cpp @@ -13,9 +13,9 @@ using namespace std; #include "decoderbase.h" #include "programinfo.h" #include "livetvchain.h" -#include "dvdringbuffer.h" -#include "bdringbuffer.h" #include "iso639.h" +#include "DVD/dvdringbuffer.h" +#include "Bluray/bdringbuffer.h" #define LOC QString("Dec: ") diff --git a/mythtv/libs/libmythtv/libmythtv.pro b/mythtv/libs/libmythtv/libmythtv.pro index 6670325e51d..35d8d1a166f 100644 --- a/mythtv/libs/libmythtv/libmythtv.pro +++ b/mythtv/libs/libmythtv/libmythtv.pro @@ -22,8 +22,6 @@ contains(INCLUDEPATH, /usr/local/include) { DEPENDPATH += . DEPENDPATH += ../libmyth ../libmyth/audio DEPENDPATH += ../libmythbase ../libmythhdhomerun -DEPENDPATH += ../libmythdvdnav/ -DEPENDPATH += ../libmythbluray/ DEPENDPATH += ./dvbdev ./mpeg ./iptv ./channelscan ./visualisations DEPENDPATH += ../libmythlivemedia/BasicUsageEnvironment/include DEPENDPATH += ../libmythlivemedia/BasicUsageEnvironment @@ -48,8 +46,6 @@ LIBS += -L../../external/FFmpeg/libavcodec LIBS += -L../../external/FFmpeg/libavformat LIBS += -L../../external/FFmpeg/libswscale LIBS += -L../libmythui -L../libmythupnp -LIBS += -L../libmythdvdnav -LIBS += -L../libmythbluray LIBS += -L../libmythbase LIBS += -L../libmythservicecontracts LIBS += -lmyth-$$LIBVERSION @@ -58,8 +54,7 @@ LIBS += -lmythavformat LIBS += -lmythavcodec LIBS += -lmythavutil LIBS += -lmythui-$$LIBVERSION -lmythupnp-$$LIBVERSION -LIBS += -lmythdvdnav-$$LIBVERSION -LIBS += -lmythbluray-$$LIBVERSION -lmythbase-$$LIBVERSION +LIBS += -lmythbase-$$LIBVERSION LIBS += -lmythservicecontracts-$$LIBVERSION using_mheg: LIBS += -L../libmythfreemheg -lmythfreemheg-$$LIBVERSION using_live: LIBS += -L../libmythlivemedia -lmythlivemedia-$$LIBVERSION @@ -72,8 +67,6 @@ POST_TARGETDEPS += ../../external/FFmpeg/libavutil/$$avLibName(avutil) POST_TARGETDEPS += ../../external/FFmpeg/libavcodec/$$avLibName(avcodec) POST_TARGETDEPS += ../../external/FFmpeg/libavformat/$$avLibName(avformat) POST_TARGETDEPS += ../../external/FFmpeg/libswscale/$$avLibName(swscale) -POST_TARGETDEPS += ../libmythdvdnav/libmythdvdnav-$${MYTH_LIB_EXT} -POST_TARGETDEPS += ../libmythbluray/libmythbluray-$${MYTH_LIB_EXT} using_mheg: POST_TARGETDEPS += ../libmythfreemheg/libmythfreemheg-$${MYTH_SHLIB_EXT} using_live: POST_TARGETDEPS += ../libmythlivemedia/libmythlivemedia-$${MYTH_SHLIB_EXT} using_hdhomerun: POST_TARGETDEPS += ../libmythhdhomerun/libmythhdhomerun-$${MYTH_SHLIB_EXT} @@ -164,9 +157,7 @@ HEADERS += recordingrule.h HEADERS += mythsystemevent.h HEADERS += avfringbuffer.h ThreadedFileWriter.h HEADERS += ringbuffer.h fileringbuffer.h -HEADERS += dvdringbuffer.h bdringbuffer.h HEADERS += streamingringbuffer.h metadataimagehelper.h -HEADERS += httplivestreambuffer.h SOURCES += recordinginfo.cpp SOURCES += dbcheck.cpp @@ -193,14 +184,8 @@ SOURCES += recordingrule.cpp SOURCES += mythsystemevent.cpp SOURCES += avfringbuffer.cpp ThreadedFileWriter.cpp SOURCES += ringbuffer.cpp fileringBuffer.cpp -SOURCES += dvdringbuffer.cpp bdringbuffer.cpp SOURCES += streamingringbuffer.cpp metadataimagehelper.cpp -#HLS player -SOURCES += httplivestreambuffer.cpp -using_libcrypto:DEFINES += USING_LIBCRYPTO -using_libcrypto:LIBS += -lcrypto - # DiSEqC HEADERS += diseqc.h diseqcsettings.h SOURCES += diseqc.cpp diseqcsettings.cpp @@ -213,10 +198,6 @@ SOURCES += datadirect.cpp HEADERS += filewriterbase.h avformatwriter.h SOURCES += filewriterbase.cpp avformatwriter.cpp -# HTTP Live Streaming -HEADERS += httplivestream.h -SOURCES += httplivestream.cpp - # Teletext stuff HEADERS += teletextdecoder.h teletextreader.h vbilut.h SOURCES += teletextdecoder.cpp teletextreader.cpp vbilut.cpp @@ -230,7 +211,7 @@ HEADERS += mpeg/mpegstreamdata.h mpeg/atscstreamdata.h HEADERS += mpeg/dvbstreamdata.h mpeg/scanstreamdata.h HEADERS += mpeg/mpegdescriptors.h mpeg/atscdescriptors.h HEADERS += mpeg/sctedescriptors.h mpeg/dvbdescriptors.h -HEADERS += mpeg/splicedescriptors.h +HEADERS += mpeg/splicedescriptors.h HEADERS += mpeg/dishdescriptors.h mpeg/premieredescriptors.h HEADERS += mpeg/atsc_huffman.h HEADERS += mpeg/freesat_huffman.h mpeg/freesat_tables.h @@ -278,6 +259,47 @@ inc.files += mythtvexp.h metadataimagehelper.h INSTALLS += inc +#DVD stuff +DEPENDPATH += ../libmythdvdnav/ +INCLUDEPATH += ../libmythdvdnav +POST_TARGETDEPS += ../libmythdvdnav/libmythdvdnav-$${MYTH_LIB_EXT} +HEADERS += DVD/dvdringbuffer.h +SOURCES += DVD/dvdringbuffer.cpp +using_frontend { + HEADERS += DVD/mythdvdplayer.h + SOURCES += DVD/mythdvdplayer.cpp + HEADERS += DVD/avformatdecoderdvd.h + SOURCES += DVD/avformatdecoderdvd.cpp +} +LIBS += -L../libmythdvdnav +LIBS += -lmythdvdnav-$$LIBVERSION + +#Bluray stuff +DEPENDPATH += ../libmythbluray/ +INCLUDEPATH += ../libmythbluray/ +POST_TARGETDEPS += ../libmythbluray/libmythbluray-$${MYTH_LIB_EXT} +HEADERS += Bluray/bdringbuffer.h +SOURCES += Bluray/bdringbuffer.cpp +using_frontend { + HEADERS += Bluray/mythbdplayer.h + SOURCES += Bluray/mythbdplayer.cpp + HEADERS += Bluray/avformatdecoderbd.h + SOURCES += Bluray/avformatdecoderbd.cpp + HEADERS += Bluray/bdoverlayscreen.h + SOURCES += Bluray/bdoverlayscreen.cpp +} +LIBS += -L../libmythbluray +LIBS += -lmythbluray-$$LIBVERSION + +#HLS stuff +HEADERS += HLS/httplivestream.h +SOURCES += HLS/httplivestream.cpp +HEADERS += HLS/httplivestreambuffer.h +SOURCES += HLS/httplivestreambuffer.cpp +using_libcrypto:DEFINES += USING_LIBCRYPTO +using_libcrypto:LIBS += -lcrypto + + using_frontend { # Recording profile stuff HEADERS += profilegroup.h @@ -285,20 +307,18 @@ using_frontend { # Video playback HEADERS += tv_play.h mythplayer.h - HEADERS += mythdvdplayer.h audioplayer.h + HEADERS += audioplayer.h HEADERS += mythccextractorplayer.h teletextextractorreader.h HEADERS += playercontext.h HEADERS += tv_play_win.h deletemap.h HEADERS += mythcommflagplayer.h commbreakmap.h - HEADERS += mythbdplayer.h HEADERS += mythiowrapper.h tvbrowsehelper.h SOURCES += tv_play.cpp mythplayer.cpp - SOURCES += mythdvdplayer.cpp audioplayer.cpp + SOURCES += audioplayer.cpp SOURCES += mythccextractorplayer.cpp teletextextractorreader.cpp SOURCES += playercontext.cpp SOURCES += tv_play_win.cpp deletemap.cpp SOURCES += mythcommflagplayer.cpp commbreakmap.cpp - SOURCES += mythbdplayer.cpp SOURCES += mythiowrapper.cpp tvbrowsehelper.cpp # Text subtitle parser @@ -308,11 +328,9 @@ using_frontend { # A/V decoders HEADERS += decoderbase.h HEADERS += nuppeldecoder.h avformatdecoder.h - HEADERS += avformatdecoderbd.h avformatdecoderdvd.h HEADERS += privatedecoder.h SOURCES += decoderbase.cpp SOURCES += nuppeldecoder.cpp avformatdecoder.cpp - SOURCES += avformatdecoderbd.cpp avformatdecoderdvd.cpp SOURCES += privatedecoder.cpp using_crystalhd { @@ -335,10 +353,8 @@ using_frontend { # On screen display (video output overlay) HEADERS += osd.h teletextscreen.h HEADERS += subtitlescreen.h interactivescreen.h - HEADERS += bdoverlayscreen.h SOURCES += osd.cpp teletextscreen.cpp SOURCES += subtitlescreen.cpp interactivescreen.cpp - SOURCES += bdoverlayscreen.cpp # Video output HEADERS += videooutbase.h videoout_null.h @@ -422,10 +438,10 @@ using_frontend { using_libdns_sd { !macx: LIBS += -ldns_sd - HEADERS += mythairplayserver.h - SOURCES += mythairplayserver.cpp - using_libcrypto: HEADERS += mythraopdevice.h mythraopconnection.h - using_libcrypto: SOURCES += mythraopdevice.cpp mythraopconnection.cpp + HEADERS += AirPlay/mythairplayserver.h + SOURCES += AirPlay/mythairplayserver.cpp + using_libcrypto: HEADERS += AirPlay/mythraopdevice.h AirPlay/mythraopconnection.h + using_libcrypto: SOURCES += AirPlay/mythraopdevice.cpp AirPlay/mythraopconnection.cpp } using_mheg { diff --git a/mythtv/libs/libmythtv/osd.cpp b/mythtv/libs/libmythtv/osd.cpp index d72d5b03c8f..94782aa14ce 100644 --- a/mythtv/libs/libmythtv/osd.cpp +++ b/mythtv/libs/libmythtv/osd.cpp @@ -17,13 +17,13 @@ #include "mythuistatetype.h" // libmythtv -#include "bdringbuffer.h" #include "channelutil.h" #include "teletextscreen.h" #include "subtitlescreen.h" #include "interactivescreen.h" -#include "bdoverlayscreen.h" #include "osd.h" +#include "Bluray/bdringbuffer.h" +#include "Bluray/bdoverlayscreen.h" #define LOC QString("OSD: ") diff --git a/mythtv/libs/libmythtv/playercontext.cpp b/mythtv/libs/libmythtv/playercontext.cpp index 8717f5434c0..8997ca9acee 100644 --- a/mythtv/libs/libmythtv/playercontext.cpp +++ b/mythtv/libs/libmythtv/playercontext.cpp @@ -6,8 +6,6 @@ #include "playercontext.h" #include "mythplayer.h" -#include "mythdvdplayer.h" -#include "mythbdplayer.h" #include "remoteencoder.h" #include "livetvchain.h" #include "ringbuffer.h" @@ -18,6 +16,8 @@ #include "videometadatautil.h" #include "metadataimagehelper.h" #include "mythlogging.h" +#include "DVD/mythdvdplayer.h" +#include "Bluray/mythbdplayer.h" #define LOC QString("playCtx: ") diff --git a/mythtv/libs/libmythtv/ringbuffer.cpp b/mythtv/libs/libmythtv/ringbuffer.cpp index 2de6f637785..878a8d3d40a 100644 --- a/mythtv/libs/libmythtv/ringbuffer.cpp +++ b/mythtv/libs/libmythtv/ringbuffer.cpp @@ -16,10 +16,7 @@ #include "ThreadedFileWriter.h" #include "fileringbuffer.h" -#include "dvdringbuffer.h" -#include "bdringbuffer.h" #include "streamingringbuffer.h" -#include "httplivestreambuffer.h" #include "livetvchain.h" #include "mythcontext.h" #include "ringbuffer.h" @@ -28,6 +25,9 @@ #include "compat.h" #include "mythmiscutil.h" #include "mythlogging.h" +#include "DVD/dvdringbuffer.h" +#include "Bluray/bdringbuffer.h" +#include "HLS/httplivestreambuffer.h" // about one second at 35mbit #define BUFFER_SIZE_MINIMUM 4 * 1024 * 1024 diff --git a/mythtv/libs/libmythtv/subtitlescreen.cpp b/mythtv/libs/libmythtv/subtitlescreen.cpp index 9900a4eddb6..b0d946ac3ac 100644 --- a/mythtv/libs/libmythtv/subtitlescreen.cpp +++ b/mythtv/libs/libmythtv/subtitlescreen.cpp @@ -7,7 +7,6 @@ #include "mythuiimage.h" #include "mythpainter.h" #include "subtitlescreen.h" -#include "bdringbuffer.h" #define LOC QString("Subtitles: ") #define LOC_WARN QString("Subtitles Warning: ") diff --git a/mythtv/libs/libmythtv/tv_play.cpp b/mythtv/libs/libmythtv/tv_play.cpp index a1b98bc88a8..cc8a595a7ca 100644 --- a/mythtv/libs/libmythtv/tv_play.cpp +++ b/mythtv/libs/libmythtv/tv_play.cpp @@ -39,8 +39,6 @@ using namespace std; #include "mythconfig.h" #include "livetvchain.h" #include "playgroup.h" -#include "dvdringbuffer.h" -#include "bdringbuffer.h" #include "datadirect.h" #include "sourceutil.h" #include "cardutil.h" @@ -59,6 +57,8 @@ using namespace std; #include "tvbrowsehelper.h" #include "mythlogging.h" #include "mythuistatetracker.h" +#include "DVD/dvdringbuffer.h" +#include "Bluray/bdringbuffer.h" #if ! HAVE_ROUND #define round(x) ((int) ((x) + 0.5)) diff --git a/mythtv/programs/mythbackend/services/content.cpp b/mythtv/programs/mythbackend/services/content.cpp index ff03a7d2e62..bf4dc8ef674 100644 --- a/mythtv/programs/mythbackend/services/content.cpp +++ b/mythtv/programs/mythbackend/services/content.cpp @@ -37,8 +37,8 @@ #include "mythmiscutil.h" #include "mythdownloadmanager.h" #include "metadataimagehelper.h" -#include "httplivestream.h" #include "videometadatalistmanager.h" +#include "HLS/httplivestream.h" ///////////////////////////////////////////////////////////////////////////// // diff --git a/mythtv/programs/mythfrontend/main.cpp b/mythtv/programs/mythfrontend/main.cpp index 2dbb68935e5..5931176c9ef 100644 --- a/mythtv/programs/mythfrontend/main.cpp +++ b/mythtv/programs/mythfrontend/main.cpp @@ -38,7 +38,6 @@ using namespace std; #include "grabbersettings.h" #include "playgroup.h" #include "networkcontrol.h" -#include "dvdringbuffer.h" #include "scheduledrecording.h" #include "mythsystemevent.h" #include "hardwareprofile.h" @@ -85,14 +84,18 @@ using namespace std; #include "videometadatasettings.h" #include "videolist.h" +// DVD +#include "DVD/dvdringbuffer.h" + +// AirPlay #ifdef USING_RAOP -#include "mythraopdevice.h" +#include "AirPlay/mythraopdevice.h" #endif #ifdef USING_LIBDNS_SD #include #include "bonjourregister.h" -#include "mythairplayserver.h" +#include "AirPlay/mythairplayserver.h" #endif static ExitPrompter *exitPopup = NULL; diff --git a/mythtv/programs/mythtranscode/transcode.cpp b/mythtv/programs/mythtranscode/transcode.cpp index c350fb814ea..4e57b608e44 100644 --- a/mythtv/programs/mythtranscode/transcode.cpp +++ b/mythtv/programs/mythtranscode/transcode.cpp @@ -27,7 +27,7 @@ #include "programinfo.h" #include "mythdbcon.h" #include "avformatwriter.h" -#include "httplivestream.h" +#include "HLS/httplivestream.h" extern "C" {