merge libmythservicecontracts into mythfrontend

MythTV · Feb 16, 2025 · 424cbd5 · 424cbd5
1 parent 15a4825
commit 424cbd5
Show file tree

Hide file tree

Showing 20 changed files with 25 additions and 148 deletions.
diff --git a/mythplugins/programs-libs.pro b/mythplugins/programs-libs.pro
@@ -3,7 +3,6 @@ DEPENDPATH *= $${INCLUDEPATH}
 
 LIBS += -L$${SYSROOT}$${LIBDIR} $$EXTRA_LIBS -lmythbase-$$LIBVERSION
 LIBS += -lmyth-$$LIBVERSION -lmythui-$$LIBVERSION -lmythupnp-$$LIBVERSION
-LIBS += -lmythservicecontracts-$$LIBVERSION
 LIBS += -lmythavcodec
 LIBS += -lmythavutil
 LIBS += -lmythavformat

diff --git a/mythtv/CMakeLists.txt b/mythtv/CMakeLists.txt
@@ -252,7 +252,6 @@ set_target_properties(
   mythmetadata
   mythmpeg2
   mythprotoserver
-  mythservicecontracts
   mythtv
   mythui
   mythupnp

diff --git a/mythtv/i18n/translate.pro b/mythtv/i18n/translate.pro
@@ -10,8 +10,6 @@ SOURCES += ../libs/libmyth/audio/*.cpp
 SOURCES += ../libs/libmyth/audio/*.h
 SOURCES += ../libs/libmythmetadata/*.cpp
 SOURCES += ../libs/libmythmetadata/*.h
-SOURCES += ../libs/libmythservicecontracts/enums/*.cpp
-SOURCES += ../libs/libmythservicecontracts/enums/*.h
 SOURCES += ../libs/libmythtv/*.cpp
 SOURCES += ../libs/libmythtv/*.h
 SOURCES += ../libs/libmythtv/AirPlay/*.cpp

diff --git a/mythtv/libs/CMakeLists.txt b/mythtv/libs/CMakeLists.txt
@@ -1,5 +1,4 @@
 add_subdirectory(libmythbase)
-add_subdirectory(libmythservicecontracts)
 if(TARGET mythtv_mheg)
   add_subdirectory(libmythfreemheg)
 endif()

diff --git a/mythtv/libs/libmythservicecontracts/CMakeLists.txt b/mythtv/libs/libmythservicecontracts/CMakeLists.txt
diff --git a/mythtv/libs/libmythservicecontracts/libmythservicecontracts.pro b/mythtv/libs/libmythservicecontracts/libmythservicecontracts.pro
diff --git a/mythtv/libs/libmythservicecontracts/serviceexp.h b/mythtv/libs/libmythservicecontracts/serviceexp.h
diff --git a/mythtv/libs/libs.pro b/mythtv/libs/libs.pro
@@ -4,8 +4,6 @@ TEMPLATE = subdirs
 
 # Libraries without dependencies
 SUBDIRS += libmythbase
-SUBDIRS += libmythservicecontracts
-libmythservicecontracts.depends = libmythbase
 
 using_mheg:SUBDIRS += libmythfreemheg
 !contains( CONFIG_LIBMPEG2EXTERNAL, yes):SUBDIRS += libmythmpeg2

diff --git a/mythtv/programs/mythfrontend/CMakeLists.txt b/mythtv/programs/mythfrontend/CMakeLists.txt
@@ -94,6 +94,12 @@ add_executable(
   schedulecommon.h
   scheduleeditor.cpp
   scheduleeditor.h
+  servicecontracts/datacontracthelper.h
+  servicecontracts/frontendActionList.h
+  servicecontracts/frontendServices.h
+  servicecontracts/frontendStatus.h
+  servicecontracts/service.cpp
+  servicecontracts/service.h
   serviceHosts/frontendServiceHost.h
   serviceHosts/servicehost.cpp
   serviceHosts/servicehost.h
@@ -170,7 +176,6 @@ target_link_libraries(
          mythtv
          mythbase
          mythmetadata
-         mythservicecontracts
          mythui
          mythupnp
          $<TARGET_NAME_IF_EXISTS:PkgConfig::LibCEC>

diff --git a/mythtv/programs/mythfrontend/mythfrontend.pro b/mythtv/programs/mythfrontend/mythfrontend.pro
@@ -80,6 +80,13 @@ SOURCES += galleryconfig.cpp            galleryviews.cpp
 SOURCES += galleryslide.cpp             gallerytransitions.cpp
 SOURCES += galleryinfo.cpp              prevreclist.cpp
 
+HEADERS += servicecontracts/datacontracthelper.h
+HEADERS += servicecontracts/frontendActionList.h
+HEADERS += servicecontracts/frontendServices.h
+HEADERS += servicecontracts/frontendStatus.h
+SOURCES += servicecontracts/service.cpp
+HEADERS += servicecontracts/service.h
+
 HEADERS += serviceHosts/frontendServiceHost.h
 SOURCES += serviceHosts/servicehost.cpp
 HEADERS += serviceHosts/servicehost.h

diff --git a/mythtv/programs/mythfrontend/serviceHosts/servicehost.h b/mythtv/programs/mythfrontend/serviceHosts/servicehost.h
@@ -19,7 +19,7 @@
 #include <QString>
 #include <QVariant>
 
-#include "libmythservicecontracts/service.h"
+#include "servicecontracts/service.h"
 
 #include "libmythupnp/httprequest.h"
 #include "libmythupnp/httpserver.h"

diff --git a/...mythservicecontracts/datacontracthelper.h → ...end/servicecontracts/datacontracthelper.h b/...mythservicecontracts/datacontracthelper.h → ...end/servicecontracts/datacontracthelper.h
diff --git a/...tracts/datacontracts/frontendActionList.h → ...end/servicecontracts/frontendActionList.h b/...tracts/datacontracts/frontendActionList.h → ...end/servicecontracts/frontendActionList.h
@@ -1,12 +1,11 @@
 #ifndef FRONTENDACTIONLIST_H
 #define FRONTENDACTIONLIST_H
 
-#include "libmythservicecontracts/serviceexp.h"
-#include "libmythservicecontracts/datacontracthelper.h"
+#include "datacontracthelper.h"
 
 namespace DTC
 {
-    class SERVICE_PUBLIC FrontendActionList : public QObject
+    class FrontendActionList : public QObject
     {
         Q_OBJECT
         Q_CLASSINFO("version", "1.0");

diff --git a/...vicecontracts/services/frontendServices.h → ...ntend/servicecontracts/frontendServices.h b/...vicecontracts/services/frontendServices.h → ...ntend/servicecontracts/frontendServices.h
@@ -1,12 +1,12 @@
 #ifndef FRONTENDSERVICES_H
 #define FRONTENDSERVICES_H
 
-#include "libmythservicecontracts/service.h"
+#include "service.h"
 
-#include "libmythservicecontracts/datacontracts/frontendActionList.h"
-#include "libmythservicecontracts/datacontracts/frontendStatus.h"
+#include "frontendActionList.h"
+#include "frontendStatus.h"
 
-class SERVICE_PUBLIC FrontendServices : public Service
+class FrontendServices : public Service
 {
     Q_OBJECT
     Q_CLASSINFO( "version", "2.1" );

diff --git a/...econtracts/datacontracts/frontendStatus.h → ...rontend/servicecontracts/frontendStatus.h b/...econtracts/datacontracts/frontendStatus.h → ...rontend/servicecontracts/frontendStatus.h
@@ -1,12 +1,11 @@
 #ifndef FRONTENDSTATUS_H
 #define FRONTENDSTATUS_H
 
-#include "libmythservicecontracts/serviceexp.h"
-#include "libmythservicecontracts/datacontracthelper.h"
+#include "datacontracthelper.h"
 
 namespace DTC
 {
-    class SERVICE_PUBLIC FrontendStatus : public QObject
+    class FrontendStatus : public QObject
     {
         Q_OBJECT
         Q_CLASSINFO("version", "1.1");

diff --git a/.../libs/libmythservicecontracts/service.cpp → ...mythfrontend/servicecontracts/service.cpp b/.../libs/libmythservicecontracts/service.cpp → ...mythfrontend/servicecontracts/service.cpp
diff --git a/...tv/libs/libmythservicecontracts/service.h → ...s/mythfrontend/servicecontracts/service.h b/...tv/libs/libmythservicecontracts/service.h → ...s/mythfrontend/servicecontracts/service.h
@@ -20,8 +20,6 @@
 #include <QDateTime>
 #include <QString>
 
-#include "serviceexp.h"
-
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -39,7 +37,7 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
 
-class SERVICE_PUBLIC Service : public QObject 
+class Service : public QObject
 {
     Q_OBJECT
 

diff --git a/mythtv/programs/mythfrontend/services/frontend.h b/mythtv/programs/mythfrontend/services/frontend.h
@@ -5,8 +5,8 @@
 #if CONFIG_QTSCRIPT
 #include <QScriptEngine>
 #endif
-#include "libmythservicecontracts/services/frontendServices.h"
-#include "libmythservicecontracts/service.h"
+#include "servicecontracts/frontendServices.h"
+#include "servicecontracts/service.h"
 
 class Frontend : public FrontendServices
 {

diff --git a/mythtv/programs/mythfrontend/test/test_videolist/test_videolist.pro b/mythtv/programs/mythfrontend/test/test_videolist/test_videolist.pro
@@ -15,7 +15,6 @@ LIBS += ../../obj/upnpscanner.o ../../obj/moc_upnpscanner.o
 
 # Add all the necessary libraries
 LIBS += -L../../../../libs/libmythbase -lmythbase-$$LIBVERSION
-LIBS += -L../../../../libs/libmythservicecontracts -lmythservicecontracts-$$LIBVERSION
 LIBS += -L../../../../libs/libmythui -lmythui-$$LIBVERSION
 LIBS += -L../../../../libs/libmythupnp -lmythupnp-$$LIBVERSION
 LIBS += -L../../../../libs/libmyth -lmyth-$$LIBVERSION
@@ -35,7 +34,6 @@ using_mheg:QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../../libs/libmythfreemheg
 QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../../libs/libmythmetadata
 QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../../libs/libmythtv
 QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../../libs/libmyth
-QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../../libs/libmythservicecontracts
 QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../../libs/libmythupnp
 QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../../libs/libmythui
 QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../../libs/libmythbase

diff --git a/mythtv/programs/programs-libs.pro b/mythtv/programs/programs-libs.pro
@@ -33,7 +33,6 @@ LIBS += -L../../libs/libmythbase
 LIBS += -L../../libs/libmythui
 LIBS += -L../../libs/libmythupnp
 LIBS += -L../../libs/libmythmetadata
-LIBS += -L../../libs/libmythservicecontracts
 LIBS += -L../../libs/libmythprotoserver
 
 # Insist that /usr/local/lib come after all the libraries provided
@@ -56,7 +55,6 @@ LIBS += -lmythbase-$$LIBVERSION
 LIBS += -lmythui-$$LIBVERSION
 LIBS += -lmyth-$$LIBVERSION
 LIBS += -lmythmetadata-$$LIBVERSION
-LIBS += -lmythservicecontracts-$$LIBVERSION
 LIBS += -lmythprotoserver-$$LIBVERSION
 
 using_frontend: using_opengl: QT += opengl
@@ -89,7 +87,6 @@ win32 {
     POST_TARGETDEPS += ../../external/FFmpeg/libavfilter/$$avLibName(avfilter)
     POST_TARGETDEPS += ../../libs/libmythupnp/libmythupnp-$${MYTH_SHLIB_EXT}
     POST_TARGETDEPS += ../../libs/libmythbase/libmythbase-$${MYTH_SHLIB_EXT}
-    POST_TARGETDEPS += ../../libs/libmythservicecontracts/libmythservicecontracts-$${MYTH_SHLIB_EXT}
     POST_TARGETDEPS += ../../libs/libmythprotoserver/libmythprotoserver-$${MYTH_SHLIB_EXT}
 }