From 75c2b22841e0063b9e769c5cdf42905f7008069b Mon Sep 17 00:00:00 2001 From: Scott Theisen Date: Sat, 1 Jun 2024 15:51:00 -0400 Subject: [PATCH] move mediamonitor from libmyth to libmythui (needs distclean) --- mythplugins/mythmusic/mythmusic/cdrip.cpp | 2 +- mythplugins/mythmusic/mythmusic/mythmusic.cpp | 2 +- mythplugins/mythmusic/mythmusic/playlist.cpp | 2 +- mythtv/libs/libmyth/CMakeLists.txt | 19 ++---------- mythtv/libs/libmyth/libmyth.pro | 29 +++---------------- mythtv/libs/libmyth/mythcontext.cpp | 2 +- mythtv/libs/libmythmetadata/imagemanager.cpp | 2 +- mythtv/libs/libmythtv/DVD/mythdvdbuffer.cpp | 2 +- mythtv/libs/libmythui/CMakeLists.txt | 17 +++++++++++ mythtv/libs/libmythui/libmythui.pro | 25 ++++++++++++++++ .../mediamonitor-darwin.cpp | 2 +- .../mediamonitor-darwin.h | 0 .../mediamonitor-unix.cpp | 2 +- .../mediamonitor-unix.h | 2 +- .../mediamonitor-windows.cpp | 0 .../mediamonitor-windows.h | 2 +- .../mediamonitor.cpp} | 2 +- .../mediamonitor.h} | 0 mythtv/programs/mythfrontend/mythfrontend.cpp | 2 +- 19 files changed, 61 insertions(+), 53 deletions(-) rename mythtv/libs/{libmyth => libmythui}/mediamonitor-darwin.cpp (99%) rename mythtv/libs/{libmyth => libmythui}/mediamonitor-darwin.h (100%) rename mythtv/libs/{libmyth => libmythui}/mediamonitor-unix.cpp (99%) rename mythtv/libs/{libmyth => libmythui}/mediamonitor-unix.h (98%) rename mythtv/libs/{libmyth => libmythui}/mediamonitor-windows.cpp (100%) rename mythtv/libs/{libmyth => libmythui}/mediamonitor-windows.h (93%) rename mythtv/libs/{libmyth/mythmediamonitor.cpp => libmythui/mediamonitor.cpp} (99%) rename mythtv/libs/{libmyth/mythmediamonitor.h => libmythui/mediamonitor.h} (100%) diff --git a/mythplugins/mythmusic/mythmusic/cdrip.cpp b/mythplugins/mythmusic/mythmusic/cdrip.cpp index 8157b110270..3a7f0756c94 100644 --- a/mythplugins/mythmusic/mythmusic/cdrip.cpp +++ b/mythplugins/mythmusic/mythmusic/cdrip.cpp @@ -24,7 +24,6 @@ // MythTV includes #include -#include #include #include #include @@ -34,6 +33,7 @@ #include #include #include +#include #include #include #include diff --git a/mythplugins/mythmusic/mythmusic/mythmusic.cpp b/mythplugins/mythmusic/mythmusic/mythmusic.cpp index c3baaba715f..dc642d165e1 100644 --- a/mythplugins/mythmusic/mythmusic/mythmusic.cpp +++ b/mythplugins/mythmusic/mythmusic/mythmusic.cpp @@ -11,7 +11,6 @@ // MythTV headers #include -#include #include #include #include @@ -23,6 +22,7 @@ #include #include #include +#include #include #include #include diff --git a/mythplugins/mythmusic/mythmusic/playlist.cpp b/mythplugins/mythmusic/mythmusic/playlist.cpp index 883de0c0c79..da1f1f0941b 100644 --- a/mythplugins/mythmusic/mythmusic/playlist.cpp +++ b/mythplugins/mythmusic/mythmusic/playlist.cpp @@ -13,12 +13,12 @@ // MythTV #include -#include #include #include #include #include #include +#include // mythmusic #include "musicdata.h" diff --git a/mythtv/libs/libmyth/CMakeLists.txt b/mythtv/libs/libmyth/CMakeLists.txt index 65f10da40dc..fa0f782aaa2 100644 --- a/mythtv/libs/libmyth/CMakeLists.txt +++ b/mythtv/libs/libmyth/CMakeLists.txt @@ -15,7 +15,6 @@ set(LIBMYTH_HEADERS mythaverror.h mythcontext.h mythexp.h - mythmediamonitor.h output.h visual.h ) @@ -70,7 +69,6 @@ add_library( dbsettings.cpp mythaverror.cpp mythcontext.cpp - mythmediamonitor.cpp output.cpp ) @@ -96,14 +94,11 @@ if(TARGET PkgConfig::PULSEAUDIO) audio/audiooutputpulse.h) endif() endif() -if(UNIX) - target_sources(myth PRIVATE mediamonitor-unix.cpp mediamonitor-unix.h) -endif() + if(WIN32) target_sources( myth - PRIVATE mediamonitor-windows.cpp mediamonitor-windows.h - audio/audiooutputwin.cpp audio/audiooutputdx.cpp + PRIVATE audio/audiooutputwin.cpp audio/audiooutputdx.cpp audio/audiooutputwin.h audio/audiooutputdx.h) elseif(ANDROID) target_sources( @@ -112,7 +107,7 @@ elseif(ANDROID) endif() if(MINGW OR win32-msvc) - target_sources(myth PRIVATE mediamonitor-windows.cpp audio/audiooutputwin.cpp + target_sources(myth PRIVATE audio/audiooutputwin.cpp audio/audiooutputdx.cpp) target_link_libraries(myth PRIVATE winmm ws2_32 user32 PkgConfig::SAMPLERATE PkgConfig::SoundTouch) @@ -125,19 +120,12 @@ if(APPLE) PRIVATE ${APPLE_APPLICATIONSERVICES_LIBRARY} ${APPLE_AUDIOTOOLBOX_LIBRARY} ${APPLE_AUDIOUNIT_LIBRARY} ${APPLE_COREAUDIO_LIBRARY} ${APPLE_IOKIT_LIBRARY}) - if(DARWIN_DA) - set_target_properties(myth PROPERTIES COMPILE_DEFINITIONS USING_DARWIN_DA) - target_sources(myth PRIVATE mediamonitor-darwin.cpp mediamonitor-darwin.h) - target_link_libraries(myth PRIVATE ${APPLE_DISKARBITRATION_LIBRARY}) - endif() endif() # # All remaining target information # -set_source_files_properties(mediamonitor-unix.h PROPERTIES SKIP_AUTOMOC TRUE) - target_compile_definitions(myth PRIVATE MYTH_API) target_include_directories( @@ -158,7 +146,6 @@ target_link_libraries( $ $ $ - $ $<$:winmm> $<$:ws2_32> $<$:user32> diff --git a/mythtv/libs/libmyth/libmyth.pro b/mythtv/libs/libmyth/libmyth.pro index ae9c54a825a..d2bc1270a0a 100644 --- a/mythtv/libs/libmyth/libmyth.pro +++ b/mythtv/libs/libmyth/libmyth.pro @@ -38,7 +38,7 @@ HEADERS += audio/volumebase.h audio/eldutils.h HEADERS += audio/audiooutputgraph.h HEADERS += backendselect.h dbsettings.h HEADERS += mythaverror.h mythcontext.h -HEADERS += mythexp.h mythmediamonitor.h +HEADERS += mythexp.h HEADERS += output.h HEADERS += visual.h @@ -52,7 +52,6 @@ SOURCES += audio/volumebase.cpp audio/eldutils.cpp SOURCES += audio/audiooutputgraph.cpp SOURCES += backendselect.cpp dbsettings.cpp SOURCES += mythaverror.cpp mythcontext.cpp -SOURCES += mythmediamonitor.cpp SOURCES += output.cpp INCLUDEPATH += .. @@ -87,7 +86,7 @@ inc.path = $${PREFIX}/include/mythtv/libmyth inc.files = dialogbox.h mythcontext.h inc.files += mythwidgets.h remotefile.h volumecontrol.h inc.files += inetcomms.h -inc.files += mythaverror.h mythmediamonitor.h +inc.files += mythaverror.h inc.files += visual.h output.h inc.files += mythexp.h @@ -114,14 +113,6 @@ using_pulse { } } -unix:!cygwin { - SOURCES += mediamonitor-unix.cpp - HEADERS += mediamonitor-unix.h - !android { - using_qtdbus: QT += dbus - } -} - android { SOURCES += audio/audiooutputopensles.cpp SOURCES += audio/audiooutputaudiotrack.cpp @@ -132,17 +123,15 @@ HEADERS += audio/audiooutputaudiotrack.h cygwin { QMAKE_LFLAGS_SHLIB += -Wl,--noinhibit-exec DEFINES += _WIN32 - #HEADERS += mediamonitor-windows.h - #SOURCES += mediamonitor-windows.cpp } mingw:DEFINES += USING_MINGW mingw | win32-msvc* { - SOURCES += mediamonitor-windows.cpp audio/audiooutputwin.cpp + SOURCES += audio/audiooutputwin.cpp SOURCES += audio/audiooutputdx.cpp - HEADERS += mediamonitor-windows.h audio/audiooutputwin.h + HEADERS += audio/audiooutputwin.h HEADERS += audio/audiooutputdx.h LIBS += -lwinmm -lws2_32 -luser32 -lsamplerate -lSoundTouch } @@ -151,21 +140,11 @@ macx { HEADERS += audio/audiooutputca.h SOURCES += audio/audiooutputca.cpp - darwin_da { - SOURCES -= mediamonitor-unix.cpp - HEADERS -= mediamonitor-unix.h - HEADERS += mediamonitor-darwin.h - SOURCES += mediamonitor-darwin.cpp - DEFINES += USING_DARWIN_DA - } - # Mac OS X Frameworks - darwin_da : LIBS += -framework DiskArbitration LIBS += -framework ApplicationServices LIBS += -framework AudioUnit LIBS += -framework AudioToolbox LIBS += -framework CoreAudio - LIBS += -framework IOKit } INSTALLS += inc inc2 diff --git a/mythtv/libs/libmyth/mythcontext.cpp b/mythtv/libs/libmyth/mythcontext.cpp index 92255eeb7f2..cb4bd5a82dd 100644 --- a/mythtv/libs/libmyth/mythcontext.cpp +++ b/mythtv/libs/libmyth/mythcontext.cpp @@ -47,6 +47,7 @@ #include "libmythbase/remotefile.h" #include "libmythui/guistartup.h" #include "libmythui/langsettings.h" +#include "libmythui/mediamonitor.h" #include "libmythui/mythdialogbox.h" #include "libmythui/mythimage.h" #include "libmythui/mythmainwindow.h" @@ -57,7 +58,6 @@ #include "backendselect.h" #include "dbsettings.h" #include "mythcontext.h" -#include "mythmediamonitor.h" #define LOC QString("MythContext: ") diff --git a/mythtv/libs/libmythmetadata/imagemanager.cpp b/mythtv/libs/libmythmetadata/imagemanager.cpp index 89f35331bd1..ba19e7b6fea 100644 --- a/mythtv/libs/libmythmetadata/imagemanager.cpp +++ b/mythtv/libs/libmythmetadata/imagemanager.cpp @@ -4,9 +4,9 @@ #include #include -#include "libmyth/mythmediamonitor.h" #include "libmythbase/mthreadpool.h" #include "libmythbase/mythdate.h" +#include "libmythui/mediamonitor.h" #include "dbaccess.h" // for FileAssociations diff --git a/mythtv/libs/libmythtv/DVD/mythdvdbuffer.cpp b/mythtv/libs/libmythtv/DVD/mythdvdbuffer.cpp index 538697912c6..e0248d4fde9 100644 --- a/mythtv/libs/libmythtv/DVD/mythdvdbuffer.cpp +++ b/mythtv/libs/libmythtv/DVD/mythdvdbuffer.cpp @@ -9,12 +9,12 @@ // MythTV #include "libmyth/mythcontext.h" -#include "libmyth/mythmediamonitor.h" #include "libmythbase/compat.h" #include "libmythbase/iso639.h" #include "libmythbase/mythconfig.h" #include "libmythbase/mythlogging.h" #include "libmythbase/sizetliteral.h" +#include "libmythui/mediamonitor.h" #include "libmythui/mythmainwindow.h" #include "libmythui/mythuiactions.h" diff --git a/mythtv/libs/libmythui/CMakeLists.txt b/mythtv/libs/libmythui/CMakeLists.txt index 8701f800536..db2d2c53a94 100644 --- a/mythtv/libs/libmythui/CMakeLists.txt +++ b/mythtv/libs/libmythui/CMakeLists.txt @@ -14,6 +14,7 @@ endif() set(HEADERS_TO_INSTALL langsettings.h + mediamonitor.h mythcolourspace.h mythdialogbox.h mythfontproperties.h @@ -102,6 +103,7 @@ add_library( devices/mythinputdevicehandler.cpp guistartup.cpp langsettings.cpp + mediamonitor.cpp mythcolourspace.cpp mythdialogbox.cpp mythdisplay.cpp @@ -350,8 +352,14 @@ if(ANDROID) platforms/mythscreensaverandroid.h) endif() +if(UNIX) + target_sources(mythui PRIVATE mediamonitor-unix.cpp mediamonitor-unix.h) + set_source_files_properties(mediamonitor-unix.h PROPERTIES SKIP_AUTOMOC TRUE) +endif() + if(WIN32) target_sources(mythui PRIVATE mythpainter_d3d9.cpp mythrender_d3d9.cpp + mediamonitor-windows.cpp mediamonitor-windows.h platforms/mythdisplaywindows.cpp) target_compile_definitions(mythui PRIVATE NODRAWTEXT) target_link_libraries(mythui PUBLIC user32 gdi32) @@ -360,6 +368,10 @@ if(WIN32) endif() endif() +if(MINGW OR win32-msvc) + target_sources(mythui PRIVATE mediamonitor-windows.cpp mediamonitor-windows.h) +endif() + if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") target_link_libraries(mythui PRIVATE ${APPLE_COCOA_LIBRARY} ${APPLE_IOKIT_LIBRARY}) @@ -382,6 +394,11 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") if(NOT ENABLE_LIRC) target_sources(mythui PRIVATE devices/lircevent.cpp devices/lircevent.h) endif() + if(DARWIN_DA) + set_target_properties(mythui PROPERTIES COMPILE_DEFINITIONS USING_DARWIN_DA) + target_sources(mythui PRIVATE mediamonitor-darwin.cpp mediamonitor-darwin.h) + target_link_libraries(mythui PRIVATE ${APPLE_DISKARBITRATION_LIBRARY}) + endif() endif() if(TARGET joystick) diff --git a/mythtv/libs/libmythui/libmythui.pro b/mythtv/libs/libmythui/libmythui.pro index 0a66208bdbf..144b2d9c7b5 100644 --- a/mythtv/libs/libmythui/libmythui.pro +++ b/mythtv/libs/libmythui/libmythui.pro @@ -54,6 +54,7 @@ HEADERS += devices/mythinputdevicehandler.h HEADERS += mythuiprocedural.h HEADERS += guistartup.h HEADERS += langsettings.h +HEADERS += mediamonitor.h HEADERS += mythterminal.h HEADERS += rawsettingseditor.h HEADERS += schemawizard.h @@ -96,6 +97,7 @@ SOURCES += devices/mythinputdevicehandler.cpp SOURCES += mythuiprocedural.cpp SOURCES += guistartup.cpp SOURCES += langsettings.cpp +SOURCES += mediamonitor.cpp SOURCES += mythterminal.cpp SOURCES += rawsettingseditor.cpp SOURCES += schemawizard.cpp @@ -128,6 +130,7 @@ inc.files += mythuistatetracker.h mythuianimation.h mythuiscrollbar.h inc.files += mythnotificationcenter.h mythnotification.h mythuicomposite.h inc.files += mythhdr.h mythcolourspace.h inc.files += langsettings.h +inc.files += mediamonitor.h inc.files += schemawizard.h inc.files += standardsettings.h inc.files += storagegroupeditor.h @@ -221,6 +224,19 @@ using_qtdbus { SOURCES += platforms/mythdisplaymutter.cpp } +unix:!cygwin { + SOURCES += mediamonitor-unix.cpp + HEADERS += mediamonitor-unix.h + !android { + using_qtdbus: QT += dbus + } +} + +mingw | win32-msvc* { + SOURCES += mediamonitor-windows.cpp + HEADERS += mediamonitor-windows.h +} + macx { HEADERS += platforms/mythscreensaverosx.h HEADERS += platforms/mythosxutils.h @@ -240,6 +256,15 @@ macx { !using_lirc: HEADERS += devices/lircevent.h !using_lirc: SOURCES += devices/lircevent.cpp } + + darwin_da { + SOURCES -= mediamonitor-unix.cpp + HEADERS -= mediamonitor-unix.h + HEADERS += mediamonitor-darwin.h + SOURCES += mediamonitor-darwin.cpp + DEFINES += USING_DARWIN_DA + LIBS += -framework DiskArbitration + } } android { diff --git a/mythtv/libs/libmyth/mediamonitor-darwin.cpp b/mythtv/libs/libmythui/mediamonitor-darwin.cpp similarity index 99% rename from mythtv/libs/libmyth/mediamonitor-darwin.cpp rename to mythtv/libs/libmythui/mediamonitor-darwin.cpp index 5773255e9ea..84aa9bf3d99 100644 --- a/mythtv/libs/libmyth/mediamonitor-darwin.cpp +++ b/mythtv/libs/libmythui/mediamonitor-darwin.cpp @@ -13,7 +13,7 @@ #include "libmythbase/mythlogging.h" #include "mediamonitor-darwin.h" -#include "mythmediamonitor.h" +#include "mediamonitor.h" #include #include diff --git a/mythtv/libs/libmyth/mediamonitor-darwin.h b/mythtv/libs/libmythui/mediamonitor-darwin.h similarity index 100% rename from mythtv/libs/libmyth/mediamonitor-darwin.h rename to mythtv/libs/libmythui/mediamonitor-darwin.h diff --git a/mythtv/libs/libmyth/mediamonitor-unix.cpp b/mythtv/libs/libmythui/mediamonitor-unix.cpp similarity index 99% rename from mythtv/libs/libmyth/mediamonitor-unix.cpp rename to mythtv/libs/libmythui/mediamonitor-unix.cpp index ad577082bf4..bc2bf6d9fcb 100644 --- a/mythtv/libs/libmyth/mediamonitor-unix.cpp +++ b/mythtv/libs/libmythui/mediamonitor-unix.cpp @@ -44,7 +44,7 @@ #include "libmythbase/mythsystemlegacy.h" #include "mediamonitor-unix.h" -#include "mythmediamonitor.h" +#include "mediamonitor.h" #if HAVE_LIBUDEV extern "C" { diff --git a/mythtv/libs/libmyth/mediamonitor-unix.h b/mythtv/libs/libmythui/mediamonitor-unix.h similarity index 98% rename from mythtv/libs/libmyth/mediamonitor-unix.h rename to mythtv/libs/libmythui/mediamonitor-unix.h index 1dc131b4f73..922ea7589fd 100644 --- a/mythtv/libs/libmyth/mediamonitor-unix.h +++ b/mythtv/libs/libmythui/mediamonitor-unix.h @@ -11,7 +11,7 @@ #include #endif -#include "mythmediamonitor.h" +#include "mediamonitor.h" class MediaMonitorUnix : public MediaMonitor { diff --git a/mythtv/libs/libmyth/mediamonitor-windows.cpp b/mythtv/libs/libmythui/mediamonitor-windows.cpp similarity index 100% rename from mythtv/libs/libmyth/mediamonitor-windows.cpp rename to mythtv/libs/libmythui/mediamonitor-windows.cpp diff --git a/mythtv/libs/libmyth/mediamonitor-windows.h b/mythtv/libs/libmythui/mediamonitor-windows.h similarity index 93% rename from mythtv/libs/libmyth/mediamonitor-windows.h rename to mythtv/libs/libmythui/mediamonitor-windows.h index d82ea2f72ab..033291a4d1c 100644 --- a/mythtv/libs/libmyth/mediamonitor-windows.h +++ b/mythtv/libs/libmythui/mediamonitor-windows.h @@ -1,7 +1,7 @@ #ifndef MYTH_MEDIA_MONITOR_WINDOWS_H #define MYTH_MEDIA_MONITOR_WINDOWS_H -#include "mythmediamonitor.h" +#include "mediamonitor.h" #define DEFAULT_DVD "e:" #define DEFAULT_CD "e:" diff --git a/mythtv/libs/libmyth/mythmediamonitor.cpp b/mythtv/libs/libmythui/mediamonitor.cpp similarity index 99% rename from mythtv/libs/libmyth/mythmediamonitor.cpp rename to mythtv/libs/libmythui/mediamonitor.cpp index a21ded49e0d..380535c021a 100644 --- a/mythtv/libs/libmyth/mythmediamonitor.cpp +++ b/mythtv/libs/libmythui/mediamonitor.cpp @@ -1,3 +1,4 @@ +#include "mediamonitor.h" // Standard C headers #include @@ -24,7 +25,6 @@ #include "libmythui/mythdialogbox.h" #include "libmythui/mythmainwindow.h" -#include "mythmediamonitor.h" #ifdef USING_DARWIN_DA #include "mediamonitor-darwin.h" #elif defined(Q_OS_WIN) diff --git a/mythtv/libs/libmyth/mythmediamonitor.h b/mythtv/libs/libmythui/mediamonitor.h similarity index 100% rename from mythtv/libs/libmyth/mythmediamonitor.h rename to mythtv/libs/libmythui/mediamonitor.h diff --git a/mythtv/programs/mythfrontend/mythfrontend.cpp b/mythtv/programs/mythfrontend/mythfrontend.cpp index 7ffcdb2c6a6..2e0aff3d127 100644 --- a/mythtv/programs/mythfrontend/mythfrontend.cpp +++ b/mythtv/programs/mythfrontend/mythfrontend.cpp @@ -33,7 +33,6 @@ #include "libmyth/audio/audiooutput.h" #include "libmythui/langsettings.h" #include "libmyth/mythcontext.h" -#include "libmyth/mythmediamonitor.h" #include "libmythui/standardsettings.h" #include "libmythbase/cleanupguard.h" #include "libmythbase/compat.h" // For SIG* on MinGW @@ -64,6 +63,7 @@ #include "libmythtv/scheduledrecording.h" #include "libmythtv/tv.h" #include "libmythtv/tvremoteutil.h" +#include "libmythui/mediamonitor.h" #include "libmythui/mythmainwindow.h" #include "libmythui/myththemedmenu.h" #include "libmythui/mythuihelper.h"