Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Reorganise libmythtv, creating a DVD, Bluray and HLS sub-folder and m…
…oving their respective related code into them.

Way too many files in libmythtv, getting lost...
Long way to go...
  • Loading branch information
jyavenard committed May 18, 2012
1 parent ac6d8e1 commit 5d6b2c4
Show file tree
Hide file tree
Showing 35 changed files with 70 additions and 52 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/avformatdecoder.cpp
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/decoderbase.cpp
Expand Up @@ -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: ")

Expand Down
82 changes: 49 additions & 33 deletions mythtv/libs/libmythtv/libmythtv.pro
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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}
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -278,27 +259,66 @@ 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
SOURCES += profilegroup.cpp

# 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
Expand All @@ -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 {
Expand All @@ -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
Expand Down Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/osd.cpp
Expand Up @@ -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: ")

Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/playercontext.cpp
Expand Up @@ -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"
Expand All @@ -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: ")

Expand Down
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/ringbuffer.cpp
Expand Up @@ -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"
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion mythtv/libs/libmythtv/subtitlescreen.cpp
Expand Up @@ -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: ")
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/tv_play.cpp
Expand Up @@ -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"
Expand All @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion mythtv/programs/mythbackend/services/content.cpp
Expand Up @@ -37,8 +37,8 @@
#include "mythmiscutil.h"
#include "mythdownloadmanager.h"
#include "metadataimagehelper.h"
#include "httplivestream.h"
#include "videometadatalistmanager.h"
#include "HLS/httplivestream.h"

/////////////////////////////////////////////////////////////////////////////
//
Expand Down
9 changes: 6 additions & 3 deletions mythtv/programs/mythfrontend/main.cpp
Expand Up @@ -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"
Expand Down Expand Up @@ -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 <QScopedPointer>
#include "bonjourregister.h"
#include "mythairplayserver.h"
#include "AirPlay/mythairplayserver.h"
#endif

static ExitPrompter *exitPopup = NULL;
Expand Down
2 changes: 1 addition & 1 deletion mythtv/programs/mythtranscode/transcode.cpp
Expand Up @@ -27,7 +27,7 @@
#include "programinfo.h"
#include "mythdbcon.h"
#include "avformatwriter.h"
#include "httplivestream.h"
#include "HLS/httplivestream.h"


extern "C" {
Expand Down

0 comments on commit 5d6b2c4

Please sign in to comment.