Skip to content
Browse files

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...
1 parent ac6d8e1 commit 5d6b2c4b37668432e014cf432ba3cba0f3001c50 @jyavenard jyavenard committed May 18, 2012
Showing with 70 additions and 52 deletions.
  1. 0 mythtv/libs/libmythtv/{ → AirPlay}/mythairplayserver.cpp
  2. 0 mythtv/libs/libmythtv/{ → AirPlay}/mythairplayserver.h
  3. 0 mythtv/libs/libmythtv/{ → AirPlay}/mythraopconnection.cpp
  4. 0 mythtv/libs/libmythtv/{ → AirPlay}/mythraopconnection.h
  5. 0 mythtv/libs/libmythtv/{ → AirPlay}/mythraopdevice.cpp
  6. 0 mythtv/libs/libmythtv/{ → AirPlay}/mythraopdevice.h
  7. 0 mythtv/libs/libmythtv/{ → Bluray}/avformatdecoderbd.cpp
  8. 0 mythtv/libs/libmythtv/{ → Bluray}/avformatdecoderbd.h
  9. 0 mythtv/libs/libmythtv/{ → Bluray}/bdoverlayscreen.cpp
  10. 0 mythtv/libs/libmythtv/{ → Bluray}/bdoverlayscreen.h
  11. 0 mythtv/libs/libmythtv/{ → Bluray}/bdringbuffer.cpp
  12. 0 mythtv/libs/libmythtv/{ → Bluray}/bdringbuffer.h
  13. 0 mythtv/libs/libmythtv/{ → Bluray}/mythbdplayer.cpp
  14. 0 mythtv/libs/libmythtv/{ → Bluray}/mythbdplayer.h
  15. 0 mythtv/libs/libmythtv/{ → DVD}/avformatdecoderdvd.cpp
  16. 0 mythtv/libs/libmythtv/{ → DVD}/avformatdecoderdvd.h
  17. 0 mythtv/libs/libmythtv/{ → DVD}/dvdringbuffer.cpp
  18. 0 mythtv/libs/libmythtv/{ → DVD}/dvdringbuffer.h
  19. 0 mythtv/libs/libmythtv/{ → DVD}/mythdvdplayer.cpp
  20. 0 mythtv/libs/libmythtv/{ → DVD}/mythdvdplayer.h
  21. 0 mythtv/libs/libmythtv/{ → HLS}/httplivestream.cpp
  22. 0 mythtv/libs/libmythtv/{ → HLS}/httplivestream.h
  23. 0 mythtv/libs/libmythtv/{ → HLS}/httplivestreambuffer.cpp
  24. 0 mythtv/libs/libmythtv/{ → HLS}/httplivestreambuffer.h
  25. +2 −2 mythtv/libs/libmythtv/avformatdecoder.cpp
  26. +2 −2 mythtv/libs/libmythtv/decoderbase.cpp
  27. +49 −33 mythtv/libs/libmythtv/libmythtv.pro
  28. +2 −2 mythtv/libs/libmythtv/osd.cpp
  29. +2 −2 mythtv/libs/libmythtv/playercontext.cpp
  30. +3 −3 mythtv/libs/libmythtv/ringbuffer.cpp
  31. +0 −1 mythtv/libs/libmythtv/subtitlescreen.cpp
  32. +2 −2 mythtv/libs/libmythtv/tv_play.cpp
  33. +1 −1 mythtv/programs/mythbackend/services/content.cpp
  34. +6 −3 mythtv/programs/mythfrontend/main.cpp
  35. +1 −1 mythtv/programs/mythtranscode/transcode.cpp
View
0 mythtv/libs/libmythtv/mythairplayserver.cpp → ...s/libmythtv/AirPlay/mythairplayserver.cpp
File renamed without changes.
View
0 mythtv/libs/libmythtv/mythairplayserver.h → ...ibs/libmythtv/AirPlay/mythairplayserver.h
File renamed without changes.
View
0 mythtv/libs/libmythtv/mythraopconnection.cpp → .../libmythtv/AirPlay/mythraopconnection.cpp
File renamed without changes.
View
0 mythtv/libs/libmythtv/mythraopconnection.h → ...bs/libmythtv/AirPlay/mythraopconnection.h
File renamed without changes.
View
0 mythtv/libs/libmythtv/mythraopdevice.cpp → ...libs/libmythtv/AirPlay/mythraopdevice.cpp
File renamed without changes.
View
0 mythtv/libs/libmythtv/mythraopdevice.h → ...v/libs/libmythtv/AirPlay/mythraopdevice.h
File renamed without changes.
View
0 mythtv/libs/libmythtv/avformatdecoderbd.cpp → ...bs/libmythtv/Bluray/avformatdecoderbd.cpp
File renamed without changes.
View
0 mythtv/libs/libmythtv/avformatdecoderbd.h → ...libs/libmythtv/Bluray/avformatdecoderbd.h
File renamed without changes.
View
0 mythtv/libs/libmythtv/bdoverlayscreen.cpp → ...libs/libmythtv/Bluray/bdoverlayscreen.cpp
File renamed without changes.
View
0 mythtv/libs/libmythtv/bdoverlayscreen.h → ...v/libs/libmythtv/Bluray/bdoverlayscreen.h
File renamed without changes.
View
0 mythtv/libs/libmythtv/bdringbuffer.cpp → ...tv/libs/libmythtv/Bluray/bdringbuffer.cpp
File renamed without changes.
View
0 mythtv/libs/libmythtv/bdringbuffer.h → mythtv/libs/libmythtv/Bluray/bdringbuffer.h
File renamed without changes.
View
0 mythtv/libs/libmythtv/mythbdplayer.cpp → ...tv/libs/libmythtv/Bluray/mythbdplayer.cpp
File renamed without changes.
View
0 mythtv/libs/libmythtv/mythbdplayer.h → mythtv/libs/libmythtv/Bluray/mythbdplayer.h
File renamed without changes.
View
0 mythtv/libs/libmythtv/avformatdecoderdvd.cpp → ...libs/libmythtv/DVD/avformatdecoderdvd.cpp
File renamed without changes.
View
0 mythtv/libs/libmythtv/avformatdecoderdvd.h → ...v/libs/libmythtv/DVD/avformatdecoderdvd.h
File renamed without changes.
View
0 mythtv/libs/libmythtv/dvdringbuffer.cpp → mythtv/libs/libmythtv/DVD/dvdringbuffer.cpp
File renamed without changes.
View
0 mythtv/libs/libmythtv/dvdringbuffer.h → mythtv/libs/libmythtv/DVD/dvdringbuffer.h
File renamed without changes.
View
0 mythtv/libs/libmythtv/mythdvdplayer.cpp → mythtv/libs/libmythtv/DVD/mythdvdplayer.cpp
File renamed without changes.
View
0 mythtv/libs/libmythtv/mythdvdplayer.h → mythtv/libs/libmythtv/DVD/mythdvdplayer.h
File renamed without changes.
View
0 mythtv/libs/libmythtv/httplivestream.cpp → mythtv/libs/libmythtv/HLS/httplivestream.cpp
File renamed without changes.
View
0 mythtv/libs/libmythtv/httplivestream.h → mythtv/libs/libmythtv/HLS/httplivestream.h
File renamed without changes.
View
0 ...v/libs/libmythtv/httplivestreambuffer.cpp → ...bs/libmythtv/HLS/httplivestreambuffer.cpp
File renamed without changes.
View
0 mythtv/libs/libmythtv/httplivestreambuffer.h → ...libs/libmythtv/HLS/httplivestreambuffer.h
File renamed without changes.
View
4 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"
View
4 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: ")
View
82 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,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
@@ -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 {
View
4 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: ")
View
4 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: ")
View
6 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
View
1 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: ")
View
4 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))
View
2 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"
/////////////////////////////////////////////////////////////////////////////
//
View
9 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 <QScopedPointer>
#include "bonjourregister.h"
-#include "mythairplayserver.h"
+#include "AirPlay/mythairplayserver.h"
#endif
static ExitPrompter *exitPopup = NULL;
View
2 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" {

0 comments on commit 5d6b2c4

Please sign in to comment.
Something went wrong with that request. Please try again.