MythTV · ulmus-scott · May 30, 2024 · May 31, 2024 · May 31, 2024 · May 31, 2024
diff --git a/mythplugins/mytharchive/mytharchive/archivesettings.h b/mythplugins/mytharchive/mytharchive/archivesettings.h
@@ -9,7 +9,7 @@
 #include <QCoreApplication>
 
 // MythTV headers
-#include <libmyth/standardsettings.h>
+#include <libmythui/standardsettings.h>
 
 
 class ArchiveSettings : public GroupSetting

diff --git a/mythplugins/mythgame/mythgame/gamesettings.h b/mythplugins/mythgame/mythgame/gamesettings.h
@@ -3,7 +3,7 @@
 
 // MythTV headers
 #include <libmythbase/mythpluginexport.h>
-#include <libmyth/standardsettings.h>
+#include <libmythui/standardsettings.h>
 
 QString GetGameTypeName(const QString &GameType);
 QString GetGameTypeExtensions(const QString &GameType);

diff --git a/mythplugins/mythmusic/mythmusic/cdrip.cpp b/mythplugins/mythmusic/mythmusic/cdrip.cpp
@@ -24,7 +24,6 @@
 
 // MythTV includes
 #include <libmyth/mythcontext.h>
-#include <libmyth/mythmediamonitor.h>
 #include <libmythbase/lcddevice.h>
 #include <libmythbase/mythdate.h>
 #include <libmythbase/mythdb.h>
@@ -34,6 +33,7 @@
 #include <libmythbase/remotefile.h>
 #include <libmythbase/storagegroup.h>
 #include <libmythmetadata/musicutils.h>
+#include <libmythui/mediamonitor.h>
 #include <libmythui/mythdialogbox.h>
 #include <libmythui/mythprogressdialog.h>
 #include <libmythui/mythscreenstack.h>

diff --git a/mythplugins/mythmusic/mythmusic/musicdbcheck.cpp b/mythplugins/mythmusic/mythmusic/musicdbcheck.cpp
@@ -8,7 +8,7 @@
 
 // MythTV
 #include <libmyth/mythcontext.h>
-#include <libmyth/schemawizard.h>
+#include <libmythui/schemawizard.h>
 #include <libmythbase/mythdb.h>
 #include <libmythbase/mythdbcheck.h>
 #include <libmythmetadata/musicmetadata.h>

diff --git a/mythplugins/mythmusic/mythmusic/mythmusic.cpp b/mythplugins/mythmusic/mythmusic/mythmusic.cpp
@@ -11,7 +11,6 @@
 
 // MythTV headers
 #include <libmyth/mythcontext.h>
-#include <libmyth/mythmediamonitor.h>
 #include <libmythbase/compat.h>
 #include <libmythbase/lcddevice.h>
 #include <libmythbase/mythdb.h>
@@ -23,6 +22,7 @@
 #include <libmythmetadata/musicfilescanner.h>
 #include <libmythmetadata/musicmetadata.h>
 #include <libmythmetadata/musicutils.h>
+#include <libmythui/mediamonitor.h>
 #include <libmythui/mythprogressdialog.h>
 #include <libmythui/myththemedmenu.h>
 #include <libmythui/mythuihelper.h>

diff --git a/mythplugins/mythmusic/mythmusic/playlist.cpp b/mythplugins/mythmusic/mythmusic/playlist.cpp
@@ -13,12 +13,12 @@
 
 // MythTV
 #include <libmyth/mythcontext.h>
-#include <libmyth/mythmediamonitor.h>
 #include <libmythbase/compat.h>
 #include <libmythbase/exitcodes.h>
 #include <libmythbase/mythdb.h>
 #include <libmythbase/mythmiscutil.h>
 #include <libmythbase/mythsystemlegacy.h>
+#include <libmythui/mediamonitor.h>
 
 // mythmusic
 #include "musicdata.h"

diff --git a/mythplugins/mythzoneminder/mythzoneminder/zmsettings.h b/mythplugins/mythzoneminder/mythzoneminder/zmsettings.h
@@ -7,7 +7,7 @@
 
 #include <QCoreApplication>
 
-#include <libmyth/standardsettings.h>
+#include <libmythui/standardsettings.h>
 
 class ZMSettings : public GroupSetting
 {

diff --git a/mythtv/libs/libmyth/CMakeLists.txt b/mythtv/libs/libmyth/CMakeLists.txt
@@ -12,20 +12,14 @@ endif()
 # Enumerate all headers
 #
 set(LIBMYTH_HEADERS
-    langsettings.h
     mythaverror.h
     mythcontext.h
     mythexp.h
-    mythmediamonitor.h
-    mythterminal.h
     output.h
-    schemawizard.h
-    standardsettings.h
-    storagegroupeditor.h
-    visual.h)
+    visual.h
+    )
 
-set(LIBMYTH_HEADERS_NOT_INSTALLED backendselect.h dbsettings.h guistartup.h
-                                  rawsettingseditor.h)
+set(LIBMYTH_HEADERS_NOT_INSTALLED backendselect.h dbsettings.h)
 
 set(AUDIO_HEADERS
     audio/audioconvert.h
@@ -73,17 +67,10 @@ add_library(
   audio/volumebase.cpp
   backendselect.cpp
   dbsettings.cpp
-  guistartup.cpp
-  langsettings.cpp
   mythaverror.cpp
   mythcontext.cpp
-  mythmediamonitor.cpp
-  mythterminal.cpp
   output.cpp
-  rawsettingseditor.cpp
-  schemawizard.cpp
-  standardsettings.cpp
-  storagegroupeditor.cpp)
+  )
 
 #
 # Platform stuff
@@ -107,18 +94,11 @@ if(TARGET PkgConfig::PULSEAUDIO)
                                 audio/audiooutputpulse.h)
   endif()
 endif()
-if(UNIX)
-  target_sources(myth PRIVATE mediamonitor-unix.cpp mediamonitor-unix.h)
-  if(NOT TARGET ${QT_PKG_NAME}::DBus)
-    set_source_files_properties(mediamonitor-unix.h PROPERTIES SKIP_AUTOMOC
-                                                               TRUE)
-  endif()
-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(
@@ -127,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)
@@ -138,13 +118,7 @@ if(APPLE)
   target_link_libraries(
     myth
     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()
+            ${APPLE_AUDIOUNIT_LIBRARY} ${APPLE_COREAUDIO_LIBRARY})
 endif()
 
 #
@@ -171,7 +145,6 @@ target_link_libraries(
           $<TARGET_NAME_IF_EXISTS:PkgConfig::ALSA>
           $<TARGET_NAME_IF_EXISTS:PkgConfig::JACK>
           $<TARGET_NAME_IF_EXISTS:PkgConfig::PULSEAUDIO>
-          $<TARGET_NAME_IF_EXISTS:Qt${QT_VERSION_MAJOR}::DBus>
           $<$<BOOL:${WIN32}>:winmm>
           $<$<BOOL:${WIN32}>:ws2_32>
           $<$<BOOL:${WIN32}>:user32>

diff --git a/mythtv/libs/libmyth/dbsettings.h b/mythtv/libs/libmyth/dbsettings.h
@@ -5,7 +5,9 @@
 #include <QCoreApplication>
 
 // MythTV headers
-#include "standardsettings.h"
+#include "libmythui/standardsettings.h"
+
+#include "mythexp.h"
 
 class MPUBLIC DatabaseSettings : public GroupSetting
 {

diff --git a/mythtv/libs/libmyth/libmyth.pro b/mythtv/libs/libmyth/libmyth.pro
@@ -37,19 +37,10 @@ HEADERS += audio/audiosettings.h audio/audiooutputsettings.h audio/pink.h
 HEADERS += audio/volumebase.h audio/eldutils.h
 HEADERS += audio/audiooutputgraph.h
 HEADERS += backendselect.h dbsettings.h
-HEADERS += langsettings.h
-HEADERS +=
 HEADERS += mythaverror.h mythcontext.h
-HEADERS += mythexp.h mythmediamonitor.h
-HEADERS += schemawizard.h
+HEADERS += mythexp.h
 HEADERS += output.h
-HEADERS +=
-HEADERS += standardsettings.h
 HEADERS += visual.h
-HEADERS += storagegroupeditor.h
-HEADERS += mythterminal.h
-HEADERS += rawsettingseditor.h
-HEADERS += guistartup.h
 
 SOURCES += audio/audiooutput.cpp audio/audiooutputbase.cpp
 SOURCES += audio/spdifencoder.cpp audio/audiooutputdigitalencoder.cpp
@@ -60,18 +51,8 @@ SOURCES += audio/audiosettings.cpp audio/audiooutputsettings.cpp audio/pink.cpp
 SOURCES += audio/volumebase.cpp audio/eldutils.cpp
 SOURCES += audio/audiooutputgraph.cpp
 SOURCES += backendselect.cpp dbsettings.cpp
-SOURCES += langsettings.cpp
-SOURCES +=
 SOURCES += mythaverror.cpp mythcontext.cpp
-SOURCES += mythmediamonitor.cpp
-SOURCES += schemawizard.cpp
 SOURCES += output.cpp
-SOURCES +=
-SOURCES += standardsettings.cpp
-SOURCES += storagegroupeditor.cpp
-SOURCES += mythterminal.cpp
-SOURCES += rawsettingseditor.cpp
-SOURCES += guistartup.cpp
 
 INCLUDEPATH += ..
 INCLUDEPATH += ../../external/FFmpeg
@@ -104,12 +85,10 @@ LIBS += -L../libmythservicecontracts         -lmythservicecontracts-$${LIBVERSIO
 inc.path = $${PREFIX}/include/mythtv/libmyth
 inc.files  = dialogbox.h mythcontext.h
 inc.files += mythwidgets.h remotefile.h volumecontrol.h
-inc.files += inetcomms.h schemawizard.h
-inc.files += mythaverror.h mythmediamonitor.h
-inc.files += visual.h output.h langsettings.h
-inc.files += mythexp.h storagegroupeditor.h
-inc.files += mythterminal.h
-inc.files += standardsettings.h
+inc.files += inetcomms.h
+inc.files += mythaverror.h
+inc.files += visual.h output.h
+inc.files += mythexp.h
 
 inc2.path = $${PREFIX}/include/mythtv/libmyth/audio
 inc2.files += audio/audiooutput.h audio/audiosettings.h
@@ -134,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
@@ -152,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
 }
@@ -171,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
@@ -45,6 +45,9 @@
 #include "libmythbase/mythversion.h"
 #include "libmythbase/portchecker.h"
 #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"
@@ -54,10 +57,7 @@
 
 #include "backendselect.h"
 #include "dbsettings.h"
-#include "guistartup.h"
-#include "langsettings.h"
 #include "mythcontext.h"
-#include "mythmediamonitor.h"
 
 #define LOC      QString("MythContext: ")
 

diff --git a/mythtv/libs/libmyth/test/CMakeLists.txt b/mythtv/libs/libmyth/test/CMakeLists.txt
@@ -10,4 +10,3 @@ endif()
 
 add_subdirectory(test_audioconvert)
 add_subdirectory(test_audioutils)
-add_subdirectory(test_settings)
diff --git a/mythtv/libs/libmyth/test/test_settings/test_settings.pro b/mythtv/libs/libmyth/test/test_settings/test_settings.pro
diff --git a/mythtv/libs/libmythmetadata/imagemanager.cpp b/mythtv/libs/libmythmetadata/imagemanager.cpp
@@ -4,9 +4,9 @@
 #include <QRunnable>
 #include <utility>
 
-#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
@@ -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"