libmythtv: Move decoder classes into a sub-folder

MythTV · Apr 29, 2019 · ba1766c · ba1766c
1 parent d5d5c23
commit ba1766c
Show file tree

Hide file tree

Showing 16 changed files with 16 additions and 15 deletions.
diff --git a/mythtv/libs/libmythtv/avformatdecoder.cpp → ...bs/libmythtv/decoders/avformatdecoder.cpp b/mythtv/libs/libmythtv/avformatdecoder.cpp → ...bs/libmythtv/decoders/avformatdecoder.cpp
diff --git a/mythtv/libs/libmythtv/avformatdecoder.h → ...libs/libmythtv/decoders/avformatdecoder.h b/mythtv/libs/libmythtv/avformatdecoder.h → ...libs/libmythtv/decoders/avformatdecoder.h
diff --git a/mythtv/libs/libmythtv/decoderbase.cpp → ...v/libs/libmythtv/decoders/decoderbase.cpp b/mythtv/libs/libmythtv/decoderbase.cpp → ...v/libs/libmythtv/decoders/decoderbase.cpp
diff --git a/mythtv/libs/libmythtv/decoderbase.h → mythtv/libs/libmythtv/decoders/decoderbase.h b/mythtv/libs/libmythtv/decoderbase.h → mythtv/libs/libmythtv/decoders/decoderbase.h
diff --git a/mythtv/libs/libmythtv/mythcodeccontext.cpp → ...s/libmythtv/decoders/mythcodeccontext.cpp b/mythtv/libs/libmythtv/mythcodeccontext.cpp → ...s/libmythtv/decoders/mythcodeccontext.cpp
diff --git a/mythtv/libs/libmythtv/mythcodeccontext.h → ...ibs/libmythtv/decoders/mythcodeccontext.h b/mythtv/libs/libmythtv/mythcodeccontext.h → ...ibs/libmythtv/decoders/mythcodeccontext.h
diff --git a/mythtv/libs/libmythtv/nuppeldecoder.cpp → ...libs/libmythtv/decoders/nuppeldecoder.cpp b/mythtv/libs/libmythtv/nuppeldecoder.cpp → ...libs/libmythtv/decoders/nuppeldecoder.cpp
diff --git a/mythtv/libs/libmythtv/nuppeldecoder.h → ...v/libs/libmythtv/decoders/nuppeldecoder.h b/mythtv/libs/libmythtv/nuppeldecoder.h → ...v/libs/libmythtv/decoders/nuppeldecoder.h
diff --git a/mythtv/libs/libmythtv/privatedecoder.cpp → ...ibs/libmythtv/decoders/privatedecoder.cpp b/mythtv/libs/libmythtv/privatedecoder.cpp → ...ibs/libmythtv/decoders/privatedecoder.cpp
diff --git a/mythtv/libs/libmythtv/privatedecoder.h → .../libs/libmythtv/decoders/privatedecoder.h b/mythtv/libs/libmythtv/privatedecoder.h → .../libs/libmythtv/decoders/privatedecoder.h
diff --git a/mythtv/libs/libmythtv/privatedecoder_omx.cpp → ...libmythtv/decoders/privatedecoder_omx.cpp b/mythtv/libs/libmythtv/privatedecoder_omx.cpp → ...libmythtv/decoders/privatedecoder_omx.cpp
diff --git a/mythtv/libs/libmythtv/privatedecoder_omx.h → ...s/libmythtv/decoders/privatedecoder_omx.h b/mythtv/libs/libmythtv/privatedecoder_omx.h → ...s/libmythtv/decoders/privatedecoder_omx.h
diff --git a/mythtv/libs/libmythtv/libmythtv.pro b/mythtv/libs/libmythtv/libmythtv.pro
@@ -28,13 +28,12 @@ contains(INCLUDEPATH, /usr/X11R6/include) {
 DEPENDPATH  += .
 DEPENDPATH  += ../libmyth ../libmyth/audio
 DEPENDPATH  += ../libmythbase
-DEPENDPATH  += ./mpeg ./channelscan ./visualisations
+DEPENDPATH  += ./mpeg ./channelscan ./visualisations ./mheg ./decoders
 DEPENDPATH  += ./recorders
 DEPENDPATH  += ./recorders/dvbdev
 DEPENDPATH  += ./recorders/rtp
 DEPENDPATH  += ./recorders/vbitext
 DEPENDPATH  += ./recorders/HLS
-DEPENDPATH  += ./mheg
 DEPENDPATH  += ../libmythlivemedia/BasicUsageEnvironment/include
 DEPENDPATH  += ../libmythlivemedia/BasicUsageEnvironment
 DEPENDPATH  += ../libmythlivemedia/groupsock/include
@@ -364,19 +363,21 @@ using_frontend {
     SOURCES += textsubtitleparser.cpp   xine_demux_sputext.cpp
 
     # A/V decoders
-    HEADERS += decoderbase.h
-    HEADERS += nuppeldecoder.h          avformatdecoder.h
-    HEADERS += privatedecoder.h
-    HEADERS += mythcodeccontext.h
-    SOURCES += decoderbase.cpp
-    SOURCES += nuppeldecoder.cpp        avformatdecoder.cpp
-    SOURCES += privatedecoder.cpp
-    SOURCES += mythcodeccontext.cpp
+    HEADERS += decoders/decoderbase.h
+    HEADERS += decoders/nuppeldecoder.h
+    HEADERS += decoders/avformatdecoder.h
+    HEADERS += decoders/privatedecoder.h
+    HEADERS += decoders/mythcodeccontext.h
+    SOURCES += decoders/decoderbase.cpp
+    SOURCES += decoders/nuppeldecoder.cpp
+    SOURCES += decoders/avformatdecoder.cpp
+    SOURCES += decoders/privatedecoder.cpp
+    SOURCES += decoders/mythcodeccontext.cpp
 
     using_openmax {
         DEFINES += USING_OPENMAX
-        HEADERS += privatedecoder_omx.h
-        SOURCES += privatedecoder_omx.cpp
+        HEADERS += decoders/privatedecoder_omx.h
+        SOURCES += decoders/privatedecoder_omx.cpp
         HEADERS += videoout_omx.h
         SOURCES += videoout_omx.cpp
         contains( HAVE_OPENMAX_BROADCOM, yes ) {

diff --git a/mythtv/libs/libmythtv/mythplayer.h b/mythtv/libs/libmythtv/mythplayer.h
@@ -21,7 +21,7 @@
 #include "subtitlereader.h"
 #include "cc608reader.h"
 #include "cc708reader.h"
-#include "decoderbase.h"
+#include "decoders/decoderbase.h"
 #include "deletemap.h"
 #include "commbreakmap.h"
 #include "audioplayer.h"

diff --git a/mythtv/libs/libmythtv/tv_play.h b/mythtv/libs/libmythtv/tv_play.h
@@ -31,7 +31,7 @@ using namespace std;
 #include "channelgroup.h"
 #include "mythtimer.h"
 #include "osd.h"
-#include "decoderbase.h"
+#include "decoders/decoderbase.h"
 
 class QEvent;
 class QKeyEvent;

diff --git a/mythtv/programs/mythfrontend/globalsettings.cpp b/mythtv/programs/mythfrontend/globalsettings.cpp
@@ -38,7 +38,7 @@
 #include "mythuihelper.h"
 #include "mythuidefines.h"
 #include "langsettings.h"
-#include "mythcodeccontext.h"
+#include "decoders/mythcodeccontext.h"
 #include "mythsorthelper.h"
 #ifdef USE_OPENGL_PAINTER
 #include "mythrender_opengl.h"