From 379ed523d00bc9b0deaac61aedda09de74e6d64d Mon Sep 17 00:00:00 2001 From: Mark Kendall Date: Fri, 1 Nov 2019 19:19:05 +0000 Subject: [PATCH] libmythtv: Move hardware decoder context classes into 'decoders' - along with the base class --- .../{ => decoders}/mythmediacodeccontext.cpp | 0 .../{ => decoders}/mythmediacodeccontext.h | 0 .../{ => decoders}/mythmmalcontext.cpp | 0 .../{ => decoders}/mythmmalcontext.h | 0 .../{ => decoders}/mythnvdeccontext.cpp | 0 .../{ => decoders}/mythnvdeccontext.h | 0 .../{ => decoders}/mythv4l2m2mcontext.cpp | 0 .../{ => decoders}/mythv4l2m2mcontext.h | 0 .../{ => decoders}/mythvaapicontext.cpp | 0 .../{ => decoders}/mythvaapicontext.h | 0 .../{ => decoders}/mythvdpaucontext.cpp | 0 .../{ => decoders}/mythvdpaucontext.h | 0 .../{ => decoders}/mythvdpauhelper.cpp | 0 .../{ => decoders}/mythvdpauhelper.h | 0 .../{ => decoders}/mythvtbcontext.cpp | 0 .../libmythtv/{ => decoders}/mythvtbcontext.h | 0 mythtv/libs/libmythtv/libmythtv.pro | 32 +++++++++---------- .../programs/mythfrontend/globalsettings.cpp | 2 +- 18 files changed, 17 insertions(+), 17 deletions(-) rename mythtv/libs/libmythtv/{ => decoders}/mythmediacodeccontext.cpp (100%) rename mythtv/libs/libmythtv/{ => decoders}/mythmediacodeccontext.h (100%) rename mythtv/libs/libmythtv/{ => decoders}/mythmmalcontext.cpp (100%) rename mythtv/libs/libmythtv/{ => decoders}/mythmmalcontext.h (100%) rename mythtv/libs/libmythtv/{ => decoders}/mythnvdeccontext.cpp (100%) rename mythtv/libs/libmythtv/{ => decoders}/mythnvdeccontext.h (100%) rename mythtv/libs/libmythtv/{ => decoders}/mythv4l2m2mcontext.cpp (100%) rename mythtv/libs/libmythtv/{ => decoders}/mythv4l2m2mcontext.h (100%) rename mythtv/libs/libmythtv/{ => decoders}/mythvaapicontext.cpp (100%) rename mythtv/libs/libmythtv/{ => decoders}/mythvaapicontext.h (100%) rename mythtv/libs/libmythtv/{ => decoders}/mythvdpaucontext.cpp (100%) rename mythtv/libs/libmythtv/{ => decoders}/mythvdpaucontext.h (100%) rename mythtv/libs/libmythtv/{ => decoders}/mythvdpauhelper.cpp (100%) rename mythtv/libs/libmythtv/{ => decoders}/mythvdpauhelper.h (100%) rename mythtv/libs/libmythtv/{ => decoders}/mythvtbcontext.cpp (100%) rename mythtv/libs/libmythtv/{ => decoders}/mythvtbcontext.h (100%) diff --git a/mythtv/libs/libmythtv/mythmediacodeccontext.cpp b/mythtv/libs/libmythtv/decoders/mythmediacodeccontext.cpp similarity index 100% rename from mythtv/libs/libmythtv/mythmediacodeccontext.cpp rename to mythtv/libs/libmythtv/decoders/mythmediacodeccontext.cpp diff --git a/mythtv/libs/libmythtv/mythmediacodeccontext.h b/mythtv/libs/libmythtv/decoders/mythmediacodeccontext.h similarity index 100% rename from mythtv/libs/libmythtv/mythmediacodeccontext.h rename to mythtv/libs/libmythtv/decoders/mythmediacodeccontext.h diff --git a/mythtv/libs/libmythtv/mythmmalcontext.cpp b/mythtv/libs/libmythtv/decoders/mythmmalcontext.cpp similarity index 100% rename from mythtv/libs/libmythtv/mythmmalcontext.cpp rename to mythtv/libs/libmythtv/decoders/mythmmalcontext.cpp diff --git a/mythtv/libs/libmythtv/mythmmalcontext.h b/mythtv/libs/libmythtv/decoders/mythmmalcontext.h similarity index 100% rename from mythtv/libs/libmythtv/mythmmalcontext.h rename to mythtv/libs/libmythtv/decoders/mythmmalcontext.h diff --git a/mythtv/libs/libmythtv/mythnvdeccontext.cpp b/mythtv/libs/libmythtv/decoders/mythnvdeccontext.cpp similarity index 100% rename from mythtv/libs/libmythtv/mythnvdeccontext.cpp rename to mythtv/libs/libmythtv/decoders/mythnvdeccontext.cpp diff --git a/mythtv/libs/libmythtv/mythnvdeccontext.h b/mythtv/libs/libmythtv/decoders/mythnvdeccontext.h similarity index 100% rename from mythtv/libs/libmythtv/mythnvdeccontext.h rename to mythtv/libs/libmythtv/decoders/mythnvdeccontext.h diff --git a/mythtv/libs/libmythtv/mythv4l2m2mcontext.cpp b/mythtv/libs/libmythtv/decoders/mythv4l2m2mcontext.cpp similarity index 100% rename from mythtv/libs/libmythtv/mythv4l2m2mcontext.cpp rename to mythtv/libs/libmythtv/decoders/mythv4l2m2mcontext.cpp diff --git a/mythtv/libs/libmythtv/mythv4l2m2mcontext.h b/mythtv/libs/libmythtv/decoders/mythv4l2m2mcontext.h similarity index 100% rename from mythtv/libs/libmythtv/mythv4l2m2mcontext.h rename to mythtv/libs/libmythtv/decoders/mythv4l2m2mcontext.h diff --git a/mythtv/libs/libmythtv/mythvaapicontext.cpp b/mythtv/libs/libmythtv/decoders/mythvaapicontext.cpp similarity index 100% rename from mythtv/libs/libmythtv/mythvaapicontext.cpp rename to mythtv/libs/libmythtv/decoders/mythvaapicontext.cpp diff --git a/mythtv/libs/libmythtv/mythvaapicontext.h b/mythtv/libs/libmythtv/decoders/mythvaapicontext.h similarity index 100% rename from mythtv/libs/libmythtv/mythvaapicontext.h rename to mythtv/libs/libmythtv/decoders/mythvaapicontext.h diff --git a/mythtv/libs/libmythtv/mythvdpaucontext.cpp b/mythtv/libs/libmythtv/decoders/mythvdpaucontext.cpp similarity index 100% rename from mythtv/libs/libmythtv/mythvdpaucontext.cpp rename to mythtv/libs/libmythtv/decoders/mythvdpaucontext.cpp diff --git a/mythtv/libs/libmythtv/mythvdpaucontext.h b/mythtv/libs/libmythtv/decoders/mythvdpaucontext.h similarity index 100% rename from mythtv/libs/libmythtv/mythvdpaucontext.h rename to mythtv/libs/libmythtv/decoders/mythvdpaucontext.h diff --git a/mythtv/libs/libmythtv/mythvdpauhelper.cpp b/mythtv/libs/libmythtv/decoders/mythvdpauhelper.cpp similarity index 100% rename from mythtv/libs/libmythtv/mythvdpauhelper.cpp rename to mythtv/libs/libmythtv/decoders/mythvdpauhelper.cpp diff --git a/mythtv/libs/libmythtv/mythvdpauhelper.h b/mythtv/libs/libmythtv/decoders/mythvdpauhelper.h similarity index 100% rename from mythtv/libs/libmythtv/mythvdpauhelper.h rename to mythtv/libs/libmythtv/decoders/mythvdpauhelper.h diff --git a/mythtv/libs/libmythtv/mythvtbcontext.cpp b/mythtv/libs/libmythtv/decoders/mythvtbcontext.cpp similarity index 100% rename from mythtv/libs/libmythtv/mythvtbcontext.cpp rename to mythtv/libs/libmythtv/decoders/mythvtbcontext.cpp diff --git a/mythtv/libs/libmythtv/mythvtbcontext.h b/mythtv/libs/libmythtv/decoders/mythvtbcontext.h similarity index 100% rename from mythtv/libs/libmythtv/mythvtbcontext.h rename to mythtv/libs/libmythtv/decoders/mythvtbcontext.h diff --git a/mythtv/libs/libmythtv/libmythtv.pro b/mythtv/libs/libmythtv/libmythtv.pro index a6f8af08d86..7398043615c 100644 --- a/mythtv/libs/libmythtv/libmythtv.pro +++ b/mythtv/libs/libmythtv/libmythtv.pro @@ -69,8 +69,8 @@ macx { LIBS += -framework VideoToolBox LIBS += -framework IOSurface DEFINES += USING_VTB - HEADERS += opengl/mythvtbinterop.h mythvtbcontext.h - SOURCES += opengl/mythvtbinterop.cpp mythvtbcontext.cpp + HEADERS += opengl/mythvtbinterop.h decoders/mythvtbcontext.h + SOURCES += opengl/mythvtbinterop.cpp decoders/mythvtbcontext.cpp using_firewire:using_backend { QMAKE_CXXFLAGS += -F$${CONFIG_MAC_AVC} @@ -375,8 +375,8 @@ using_frontend { SOURCES += decoders/mythcodeccontext.cpp using_mmal { - HEADERS += mythmmalcontext.h opengl/mythmmalinterop.h - SOURCES += mythmmalcontext.cpp opengl/mythmmalinterop.cpp + HEADERS += decoders/mythmmalcontext.h opengl/mythmmalinterop.h + SOURCES += decoders/mythmmalcontext.cpp opengl/mythmmalinterop.cpp LIBS += -L/opt/vc/lib -lmmal -lvcsm LIBS += -lEGL DEFINES += USING_MMAL @@ -457,11 +457,11 @@ using_frontend { using_vdpau { DEFINES += USING_VDPAU HEADERS += opengl/mythvdpauinterop.h - HEADERS += mythvdpaucontext.h - HEADERS += mythvdpauhelper.h + HEADERS += decoders/mythvdpaucontext.h + HEADERS += decoders/mythvdpauhelper.h SOURCES += opengl/mythvdpauinterop.cpp - SOURCES += mythvdpaucontext.cpp - SOURCES += mythvdpauhelper.cpp + SOURCES += decoders/mythvdpaucontext.cpp + SOURCES += decoders/mythvdpauhelper.cpp LIBS += -lvdpau } @@ -485,24 +485,24 @@ using_frontend { using_vaapi:using_opengl_video { DEFINES += USING_VAAPI - HEADERS += mythvaapicontext.h opengl/mythvaapiinterop.h - SOURCES += mythvaapicontext.cpp opengl/mythvaapiinterop.cpp + HEADERS += decoders/mythvaapicontext.h opengl/mythvaapiinterop.h + SOURCES += decoders/mythvaapicontext.cpp opengl/mythvaapiinterop.cpp LIBS += -lva -lva-x11 -lva-glx -lEGL } using_nvdec { DEFINES += USING_NVDEC HEADERS += opengl/mythnvdecinterop.h - HEADERS += mythnvdeccontext.h + HEADERS += decoders/mythnvdeccontext.h SOURCES += opengl/mythnvdecinterop.cpp - SOURCES += mythnvdeccontext.cpp + SOURCES += decoders/mythnvdeccontext.cpp INCLUDEPATH += ../../external/nv-codec-headers/include } using_mediacodec { DEFINES += USING_MEDIACODEC - HEADERS += mythmediacodeccontext.h opengl/mythmediacodecinterop.h - SOURCES += mythmediacodeccontext.cpp opengl/mythmediacodecinterop.cpp + HEADERS += decoders/mythmediacodeccontext.h opengl/mythmediacodecinterop.h + SOURCES += decoders/mythmediacodeccontext.cpp opengl/mythmediacodecinterop.cpp } # Misc. frontend @@ -672,8 +672,8 @@ using_backend { HEADERS += recorders/v4l2encsignalmonitor.h SOURCES += recorders/v4l2encsignalmonitor.cpp - HEADERS += mythv4l2m2mcontext.h - SOURCES += mythv4l2m2mcontext.cpp + HEADERS += decoders/mythv4l2m2mcontext.h + SOURCES += decoders/mythv4l2m2mcontext.cpp DEFINES += USING_V4L2 } diff --git a/mythtv/programs/mythfrontend/globalsettings.cpp b/mythtv/programs/mythfrontend/globalsettings.cpp index 7350aa7921b..affc7a1ddcc 100644 --- a/mythtv/programs/mythfrontend/globalsettings.cpp +++ b/mythtv/programs/mythfrontend/globalsettings.cpp @@ -47,7 +47,7 @@ #include "AirPlay/mythraopconnection.h" #endif #ifdef USING_VAAPI -#include "mythvaapicontext.h" +#include "decoders/mythvaapicontext.h" #endif //Use for playBackGroup, to be remove at one point