Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove libmythupnp Rtti and merge remnants of libmythservicecontracts into mythfrontend #1044

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

remove libmythupnp Rtti and merge remnants of libmythservicecontracts into mythfrontend #1044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f126a0f
libmythupnp: reduce unnecessary and transitive includes
ulmus-scott Feb 16, 2025
9767889
remove TaskTime
ulmus-scott Feb 16, 2025
de22c9b
remove Rtti
ulmus-scott Feb 16, 2025
a0b3dc9
move ServiceHost to mythfrontend
ulmus-scott Feb 16, 2025
30e2d3a
remove unnecessary references to libmythservicecontracts
ulmus-scott Feb 16, 2025
4a5ee7a
merge libmythservicecontracts into mythfrontend
ulmus-scott Feb 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion mythplugins/programs-libs.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion mythtv/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,6 @@ set_target_properties(
mythmetadata
mythmpeg2
mythprotoserver
mythservicecontracts
mythtv
mythui
mythupnp
Expand Down
2 changes: 0 additions & 2 deletions mythtv/html/tv/schedule.qsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import "/tv/js/tvutil.qjs"
var myth = new Myth();
var dvr = new Dvr();
var guide = new Guide();
var rtti = new Rtti();

var startTime = new Date();
if (getArg("StartTime"))
Expand Down Expand Up @@ -200,7 +199,6 @@ import "/tv/js/tvutil.qjs"
showing = upcomingShowings[listIdx];
// RecStatusToClass() - /tv/js/tvutil.qjs
var statusClass = RecStatusToClass(showing.Recording.Status);
//var statusClass = rtti.GetEnum( "RecStatus::Type" ).EnumItems[ showing.Recording.Status ].Value;
var programIdentifier = showing.Channel.ChanId + "_" + showing.StartTime.toISOString();
var showingChannelIcon = "/tv/images/channel_icon.svg";
if (showing.Channel.IconURL)
Expand Down
2 changes: 0 additions & 2 deletions mythtv/i18n/translate.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion mythtv/libs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
add_subdirectory(libmythbase)
add_subdirectory(libmythservicecontracts)
if(TARGET mythtv_mheg)
add_subdirectory(libmythfreemheg)
endif()
Expand Down
2 changes: 2 additions & 0 deletions mythtv/libs/libmyth/backendselect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
#include "libmythui/mythuibuttonlist.h"
#include "libmythui/mythuistatetype.h"
#include "libmythupnp/mythxmlclient.h"
#include "libmythupnp/ssdp.h"
#include "libmythupnp/ssdpcache.h"

BackendSelection::BackendSelection(
MythScreenStack *parent,
Expand Down
1 change: 0 additions & 1 deletion mythtv/libs/libmyth/libmyth.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ LIBS += -L../../external/FFmpeg/libswresample -lmythswresample
LIBS += -L../../external/FFmpeg/libavutil -lmythavutil
LIBS += -L../../external/FFmpeg/libavcodec -lmythavcodec
LIBS += -L../../external/FFmpeg/libavformat -lmythavformat
LIBS += -L../libmythservicecontracts -lmythservicecontracts-$${LIBVERSION}
!using_system_libbluray {
#INCLUDEPATH += ../../external/libmythbluray/src
DEPENDPATH += ../../external/libmythbluray
Expand Down
3 changes: 3 additions & 0 deletions mythtv/libs/libmyth/mythcontext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@
#include "libmythui/mythmainwindow.h"
#include "libmythui/mythuihelper.h"
#include "libmythupnp/mythxmlclient.h"
#include "libmythupnp/ssdp.h"
#include "libmythupnp/ssdpcache.h"
#include "libmythupnp/taskqueue.h"
#include "libmythupnp/upnp.h"

#include "backendselect.h"
Expand Down
2 changes: 0 additions & 2 deletions mythtv/libs/libmyth/test/test_audioconvert/test_audioconvert.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ INCLUDEPATH += ../../.. ../../../../external/FFmpeg
LIBS += -L../../../libmythbase -lmythbase-$$LIBVERSION
LIBS += -L../../../libmythui -lmythui-$$LIBVERSION
LIBS += -L../../../libmythupnp -lmythupnp-$$LIBVERSION
LIBS += -L../../../libmythservicecontracts -lmythservicecontracts-$$LIBVERSION
LIBS += -L../../../../external/FFmpeg/libswresample -lmythswresample
LIBS += -L../../../../external/FFmpeg/libavutil -lmythavutil
LIBS += -L../../../../external/FFmpeg/libavcodec -lmythavcodec
Expand All @@ -25,7 +24,6 @@ QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../../external/FFmpeg/libavformat
QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythbase
QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythui
QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythupnp
QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythservicecontracts

# Input
HEADERS += test_audioconvert.h
Expand Down
2 changes: 0 additions & 2 deletions mythtv/libs/libmyth/test/test_audioutils/test_audioutils.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ INCLUDEPATH += ../../.. ../../../../external/FFmpeg
LIBS += -L../../../libmythbase -lmythbase-$$LIBVERSION
LIBS += -L../../../libmythui -lmythui-$$LIBVERSION
LIBS += -L../../../libmythupnp -lmythupnp-$$LIBVERSION
LIBS += -L../../../libmythservicecontracts -lmythservicecontracts-$$LIBVERSION
LIBS += -L../../../../external/FFmpeg/libswresample -lmythswresample
LIBS += -L../../../../external/FFmpeg/libavutil -lmythavutil
LIBS += -L../../../../external/FFmpeg/libavcodec -lmythavcodec
Expand All @@ -25,7 +24,6 @@ QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../../external/FFmpeg/libavformat
QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythbase
QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythui
QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythupnp
QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythservicecontracts

# Input
HEADERS += test_audioutils.h
Expand Down
1 change: 0 additions & 1 deletion mythtv/libs/libmythmetadata/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ target_link_libraries(
PkgConfig::LIBSWSCALE
mythbase
mythui
mythservicecontracts
mythtv
myth)

Expand Down
1 change: 0 additions & 1 deletion mythtv/libs/libmythmetadata/libmythmetadata.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ INCLUDEPATH += $${CONFIG_TAGLIB_INCLUDES}

LIBS += -L../libmythbase -lmythbase-$${LIBVERSION}
LIBS += -L../libmythui -lmythui-$${LIBVERSION}
LIBS += -L../libmythservicecontracts -lmythservicecontracts-$${LIBVERSION}
LIBS += -L../../external/FFmpeg/libswresample -lmythswresample
LIBS += -L../../external/FFmpeg/libavutil -lmythavutil
LIBS += -L../../external/FFmpeg/libavcodec -lmythavcodec
Expand Down
2 changes: 0 additions & 2 deletions mythtv/libs/libmythmetadata/test/test_lyrics/test_lyrics.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ LIBS += ../../$(OBJECTS_DIR)lyricsdata.o
LIBS += -L../../../libmythbase -lmythbase-$$LIBVERSION
LIBS += -L../../../libmythui -lmythui-$$LIBVERSION
LIBS += -L../../../libmythupnp -lmythupnp-$$LIBVERSION
LIBS += -L../../../libmythservicecontracts -lmythservicecontracts-$$LIBVERSION
LIBS += -L../../../libmythtv -lmythtv-$$LIBVERSION
LIBS += -L../../../libmyth -lmyth-$$LIBVERSION
LIBS += -L../../../../external/FFmpeg/libavcodec -lmythavcodec
Expand Down Expand Up @@ -48,7 +47,6 @@ QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmyth
QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythtv
QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythui
QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythupnp
QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythservicecontracts
QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythfreemheg
QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythmetadata

Expand Down
2 changes: 0 additions & 2 deletions mythtv/libs/libmythmetadata/test/test_metadatagrabber/test_metadatagrabber.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ LIBS += ../../$(OBJECTS_DIR)lyricsdata.o
LIBS += -L../../../libmythbase -lmythbase-$$LIBVERSION
LIBS += -L../../../libmythui -lmythui-$$LIBVERSION
LIBS += -L../../../libmythupnp -lmythupnp-$$LIBVERSION
LIBS += -L../../../libmythservicecontracts -lmythservicecontracts-$$LIBVERSION
LIBS += -L../../../libmythtv -lmythtv-$$LIBVERSION
LIBS += -L../../../libmyth -lmyth-$$LIBVERSION
LIBS += -L../../../../external/FFmpeg/libavcodec -lmythavcodec
Expand Down Expand Up @@ -46,7 +45,6 @@ QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmyth
QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythtv
QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythui
QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythupnp
QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythservicecontracts
QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythfreemheg
QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythmetadata

Expand Down
2 changes: 0 additions & 2 deletions mythtv/libs/libmythmetadata/test/test_musicmetadata/test_musicmetadata.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ DEFINES += TEST_SOURCE_DIR='\'"$${PWD}"'\'
LIBS += -L../../../libmythbase -lmythbase-$$LIBVERSION
LIBS += -L../../../libmythui -lmythui-$$LIBVERSION
LIBS += -L../../../libmythupnp -lmythupnp-$$LIBVERSION
LIBS += -L../../../libmythservicecontracts -lmythservicecontracts-$$LIBVERSION
LIBS += -L../../../libmythtv -lmythtv-$$LIBVERSION
LIBS += -L../../../libmyth -lmyth-$$LIBVERSION
LIBS += -L../../../../external/FFmpeg/libavcodec -lmythavcodec
Expand Down Expand Up @@ -46,7 +45,6 @@ QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmyth
QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythtv
QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythui
QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythupnp
QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythservicecontracts
QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythfreemheg
QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythmetadata

Expand Down
2 changes: 0 additions & 2 deletions mythtv/libs/libmythmetadata/test/test_musicutils/test_musicutils.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ LIBS += ../../$(OBJECTS_DIR)lyricsdata.o
LIBS += -L../../../libmythbase -lmythbase-$$LIBVERSION
LIBS += -L../../../libmythui -lmythui-$$LIBVERSION
LIBS += -L../../../libmythupnp -lmythupnp-$$LIBVERSION
LIBS += -L../../../libmythservicecontracts -lmythservicecontracts-$$LIBVERSION
LIBS += -L../../../libmythtv -lmythtv-$$LIBVERSION
LIBS += -L../../../libmyth -lmyth-$$LIBVERSION
LIBS += -L../../../../external/FFmpeg/libavcodec -lmythavcodec
Expand Down Expand Up @@ -46,7 +45,6 @@ QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmyth
QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythtv
QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythui
QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythupnp
QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythservicecontracts
QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythfreemheg
QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythmetadata

Expand Down
2 changes: 0 additions & 2 deletions mythtv/libs/libmythmetadata/test/test_videometadata/test_videometadata.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ LIBS += -L../../../libmythtv -lmythtv-$$LIBVERSION
# libmythui for MythUIProgressDialog
LIBS += -L../../../libmythui -lmythui-$$LIBVERSION
LIBS += -L../../../libmythupnp -lmythupnp-$$LIBVERSION
LIBS += -L../../../libmythservicecontracts -lmythservicecontracts-$$LIBVERSION
LIBS += -L../../../../external/FFmpeg/libswresample -lmythswresample
LIBS += -L../../../../external/FFmpeg/libavutil -lmythavutil
LIBS += -L../../../../external/FFmpeg/libavcodec -lmythavcodec
Expand All @@ -37,7 +36,6 @@ QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythbase
QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmyth
QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythui
QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythupnp
QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythservicecontracts
QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythtv
QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythfreemheg

Expand Down
3 changes: 1 addition & 2 deletions mythtv/libs/libmythprotoserver/libmythprotoserver.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,12 @@ SOURCES += requesthandler/messagehandler.cpp
INCLUDEPATH += .. ../../external/FFmpeg

LIBS += -L../libmythbase -L../libmyth -L../libmythtv -L../libmythui
LIBS += -L../libmythupnp -L../libmythservicecontracts
LIBS += -L../libmythupnp
LIBS += -L../../external/FFmpeg/libswresample -lmythswresample
LIBS += -L../../external/FFmpeg/libavutil -L../../external/FFmpeg/libavcodec
LIBS += -L../../external/FFmpeg/libavformat -L../../external/FFmpeg/libswscale
LIBS += -lmythbase-$$LIBVERSION -lmyth-$$LIBVERSION -lmythui-$$LIBVERSION
LIBS += -lmythtv-$$LIBVERSION -lmythupnp-$$LIBVERSION
LIBS += -lmythservicecontracts-$$LIBVERSION
LIBS += -lmythavutil -lmythavcodec -lmythavformat -lmythswscale
LIBS += $$EXTRA_LIBS $$LATE_LIBS $$QMAKE_LIBS_DYNLOAD
using_mheg:LIBS += -L../libmythfreemheg -lmythfreemheg-$$LIBVERSION
Expand Down
62 changes: 0 additions & 62 deletions mythtv/libs/libmythservicecontracts/CMakeLists.txt
View file
Open in desktop

This file was deleted.

80 changes: 0 additions & 80 deletions mythtv/libs/libmythservicecontracts/datacontracts/enum.h
View file
Open in desktop

This file was deleted.

Loading
Loading