MythTV · ulmus-scott · Nov 20, 2022 · Nov 20, 2022 · Nov 20, 2022 · Nov 20, 2022
diff --git a/mythplugins/mytharchive/mytharchive/archivedbcheck.cpp b/mythplugins/mytharchive/mytharchive/archivedbcheck.cpp
@@ -5,9 +5,10 @@
 #include <QSqlError>
 
 // MythTV
-#include <libmyth/mythcontext.h>
+#include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdb.h>
 #include <libmythbase/mythdbcheck.h>
+#include <libmythbase/mythlogging.h>
 
 // mytharchive
 #include "archivedbcheck.h"

diff --git a/mythplugins/mytharchive/mytharchive/archivesettings.cpp b/mythplugins/mytharchive/mytharchive/archivesettings.cpp
@@ -5,7 +5,6 @@
 #include <unistd.h>
 
 // myth
-#include <libmyth/mythcontext.h>
 #include <libmythbase/mythdirs.h>
 #include <libmythbase/mythdate.h>
 

diff --git a/mythplugins/mytharchive/mytharchive/archiveutil.cpp b/mythplugins/mytharchive/mytharchive/archiveutil.cpp
@@ -11,8 +11,8 @@
 #include <QDomDocument>
 
 // myth
-#include <libmyth/mythcontext.h>
 #include <libmythbase/exitcodes.h>
+#include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdate.h>
 #include <libmythbase/mythlogging.h>
 #include <libmythbase/mythsystemlegacy.h>

diff --git a/mythplugins/mytharchive/mytharchive/editmetadata.cpp b/mythplugins/mytharchive/mytharchive/editmetadata.cpp
@@ -1,6 +1,6 @@
 
 // myth
-#include <libmyth/mythcontext.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythui/mythuibutton.h>
 #include <libmythui/mythuitext.h>
 #include <libmythui/mythuitextedit.h>

diff --git a/mythplugins/mytharchive/mytharchive/exportnative.cpp b/mythplugins/mytharchive/mytharchive/exportnative.cpp
@@ -10,9 +10,10 @@
 #include <QDomDocument>
 
 // myth
-#include <libmyth/mythcontext.h>
 #include <libmythbase/exitcodes.h>
+#include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdb.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythbase/mythsystemlegacy.h>
 #include <libmythbase/programinfo.h>
 #include <libmythbase/remoteutil.h>

diff --git a/mythplugins/mytharchive/mytharchive/fileselector.cpp b/mythplugins/mytharchive/mytharchive/fileselector.cpp
@@ -7,8 +7,8 @@
 #include <QVariant>
 
 // Myth
-#include <libmyth/mythcontext.h>
 #include <libmythbase/mythdb.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythbase/stringutil.h>
 #include <libmythui/mythdialogbox.h>
 #include <libmythui/mythmainwindow.h>

diff --git a/mythplugins/mytharchive/mytharchive/importnative.cpp b/mythplugins/mytharchive/mytharchive/importnative.cpp
@@ -7,10 +7,11 @@
 #include <QDomDocument>
 
 // Myth
-#include <libmyth/mythcontext.h>
 #include <libmythbase/exitcodes.h>
+#include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdate.h>
 #include <libmythbase/mythdbcon.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythbase/mythsystemlegacy.h>
 #include <libmythui/mythdialogbox.h>
 #include <libmythui/mythmainwindow.h>

diff --git a/mythplugins/mytharchive/mytharchive/logviewer.cpp b/mythplugins/mytharchive/mytharchive/logviewer.cpp
@@ -10,7 +10,9 @@
 #include <QTextStream>
 
 // mythtv
+#include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdbcon.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythui/mythdialogbox.h>
 #include <libmythui/mythmainwindow.h>
 #include <libmythui/mythuibutton.h>
@@ -78,6 +80,14 @@ void showLogViewer(void)
     }
 }
 
+LogViewer::LogViewer(MythScreenStack *parent)
+    : MythScreenType(parent, "logviewer"),
+      m_autoUpdate(gCoreContext->GetBoolSetting("LogViewerAutoUpdate", true)),
+      m_updateTime(gCoreContext->GetDurSetting<std::chrono::seconds>(
+                       "LogViewerUpdateTime", DEFAULT_UPDATE_TIME))
+{
+}
+
 LogViewer::~LogViewer(void)
 {
     gCoreContext->SaveDurSetting("LogViewerUpdateTime", m_updateTime);

diff --git a/mythplugins/mytharchive/mytharchive/logviewer.h b/mythplugins/mytharchive/mytharchive/logviewer.h
@@ -5,7 +5,6 @@
 #include <QTimer>
 
 // myth
-#include <libmyth/mythcontext.h>
 #include <libmythui/mythscreentype.h>
 
 static constexpr std::chrono::seconds DEFAULT_UPDATE_TIME { 5s };
@@ -22,12 +21,7 @@ class LogViewer : public MythScreenType
 
   public:
 
-    explicit LogViewer(MythScreenStack *parent)
-        : MythScreenType(parent, "logviewer"),
-          m_autoUpdate(gCoreContext->GetBoolSetting("LogViewerAutoUpdate", true)),
-          m_updateTime(gCoreContext->GetDurSetting<std::chrono::seconds>(
-                           "LogViewerUpdateTime", DEFAULT_UPDATE_TIME))
-        {};
+    explicit LogViewer(MythScreenStack *parent);
    ~LogViewer(void) override;
 
     bool Create(void) override; // MythScreenType

diff --git a/mythplugins/mytharchive/mytharchive/mytharchive.cpp b/mythplugins/mytharchive/mytharchive/mytharchive.cpp
@@ -18,8 +18,9 @@
 #include <QTimer>
 
 // mythtv
-#include <libmyth/mythcontext.h>
+#include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythcoreutil.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythbase/mythplugin.h>
 #include <libmythbase/mythpluginapi.h>
 #include <libmythbase/mythsystemlegacy.h>

diff --git a/mythplugins/mytharchive/mytharchive/mythburn.cpp b/mythplugins/mytharchive/mytharchive/mythburn.cpp
@@ -12,11 +12,12 @@
 
 // myth
 #include <mythconfig.h>
-#include <libmyth/mythcontext.h>
 #include <libmythbase/exitcodes.h>
+#include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdate.h>
 #include <libmythbase/mythdb.h>
 #include <libmythbase/mythdirs.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythbase/mythmiscutil.h>
 #include <libmythbase/mythsystemlegacy.h>
 #include <libmythbase/stringutil.h>

diff --git a/mythplugins/mytharchive/mytharchive/recordingselector.cpp b/mythplugins/mytharchive/mytharchive/recordingselector.cpp
@@ -10,7 +10,6 @@
 #include <QTimer>
 
 // mythtv
-#include <libmyth/mythcontext.h>
 #include <libmythbase/mthread.h>
 #include <libmythbase/mythdate.h>
 #include <libmythbase/mythdb.h>

diff --git a/mythplugins/mytharchive/mytharchive/remoteavformatcontext.h b/mythplugins/mytharchive/mytharchive/remoteavformatcontext.h
@@ -5,7 +5,6 @@
 
 #include <QString>
 
-#include <libmythbase/mythlogging.h>
 #include <libmythbase/remotefile.h>
 
 extern "C" {

diff --git a/mythplugins/mytharchive/mytharchive/selectdestination.cpp b/mythplugins/mytharchive/mytharchive/selectdestination.cpp
@@ -7,8 +7,9 @@
 #include <QKeyEvent>
 
 // myth
-#include <libmyth/mythcontext.h>
+#include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythcoreutil.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythbase/stringutil.h>
 #include <libmythui/mythmainwindow.h>
 #include <libmythui/mythuibutton.h>

diff --git a/mythplugins/mytharchive/mytharchive/themeselector.cpp b/mythplugins/mytharchive/mytharchive/themeselector.cpp
@@ -11,8 +11,9 @@
 #include <QCoreApplication>
 
 // myth
-#include <libmyth/mythcontext.h>
+#include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdirs.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythui/mythmainwindow.h>
 #include <libmythui/mythuibutton.h>
 #include <libmythui/mythuibuttonlist.h>

diff --git a/mythplugins/mytharchive/mytharchive/thumbfinder.cpp b/mythplugins/mytharchive/mytharchive/thumbfinder.cpp
@@ -41,10 +41,10 @@
 
 // myth
 #include <mythconfig.h>
-#include <libmyth/mythcontext.h>
 #include <libmythbase/mythdate.h>
 #include <libmythbase/mythdbcon.h>
 #include <libmythbase/mythdirs.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythbase/mythmiscutil.h> // for MythFile::copy
 #include <libmythbase/programinfo.h>
 #include <libmythui/mythdialogbox.h>

diff --git a/mythplugins/mytharchive/mytharchive/videoselector.cpp b/mythplugins/mytharchive/mytharchive/videoselector.cpp
@@ -8,11 +8,12 @@
 #include <QTimer>
 
 // mythtv
-#include <libmyth/mythcontext.h>
+#include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdb.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythbase/remotefile.h>
 #include <libmythbase/stringutil.h>
-#include <libmythmetadata/videoutils.h>
+#include <libmythbase/storagegroup.h>
 #include <libmythui/mythdialogbox.h>
 #include <libmythui/mythmainwindow.h>
 #include <libmythui/mythuibutton.h>
@@ -451,7 +452,7 @@ std::vector<VideoInfo *> *VideoSelector::getVideoListFromDB(void)
                 if (info->filename.isEmpty())
                 {
                     // file must not be local or doesn't exist
-                    info->filename = generate_file_url("Videos", host, filename);
+                    info->filename = StorageGroup::generate_file_url("Videos", host, filename);
                 }
             }
 

diff --git a/mythplugins/mytharchive/mytharchivehelper/mytharchivehelper.cpp b/mythplugins/mytharchive/mytharchivehelper/mytharchivehelper.cpp
@@ -55,6 +55,7 @@
 #include <libmythbase/exitcodes.h>
 #include <libmythbase/mythcommandlineparser.h>
 #include <libmythbase/mythcoreutil.h>
+#include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdate.h>
 #include <libmythbase/mythdb.h>
 #include <libmythbase/mythdirs.h>
@@ -2390,12 +2391,10 @@ static int main_local(int argc, char **argv)
     // Don't listen to console input
     close(0);
 
-    gContext = new MythContext(MYTH_BINARY_VERSION);
-    if (!gContext->Init(false))
+    MythContext context {MYTH_BINARY_VERSION};
+    if (!context.Init(false))
     {
         LOG(VB_GENERAL, LOG_ERR, "Failed to init MythContext, exiting.");
-        delete gContext;
-        gContext = nullptr;
         return GENERIC_EXIT_NO_MYTHCONTEXT;
     }
 
@@ -2556,9 +2555,6 @@ static int main_local(int argc, char **argv)
         cmdline.PrintHelp();
     }
 
-    delete gContext;
-    gContext = nullptr;
-
     exit(res);
 }
 

diff --git a/mythplugins/mythbrowser/mythbrowser/bookmarkeditor.cpp b/mythplugins/mythbrowser/mythbrowser/bookmarkeditor.cpp
@@ -1,8 +1,8 @@
 
 // MythTV
-#include <libmyth/mythcontext.h>
 #include <libmythbase/mythdate.h>
 #include <libmythbase/mythdbcon.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythui/mythmainwindow.h>
 
 // mythbrowser

diff --git a/mythplugins/mythbrowser/mythbrowser/bookmarkmanager.cpp b/mythplugins/mythbrowser/mythbrowser/bookmarkmanager.cpp
@@ -6,9 +6,10 @@
 #include <QString>
 
 // MythTV
-#include <libmyth/mythcontext.h>
+#include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdbcon.h>
 #include <libmythbase/mythdirs.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythbase/mythsystemlegacy.h>
 #include <libmythui/mythmainwindow.h>
 #include <libmythui/mythuibuttonlist.h>

diff --git a/mythplugins/mythbrowser/mythbrowser/browserdbutil.cpp b/mythplugins/mythbrowser/mythbrowser/browserdbutil.cpp
@@ -2,9 +2,10 @@
 #include <QSqlError>
 
 // MythTV
-#include <libmyth/mythcontext.h>
+#include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdb.h>
 #include <libmythbase/mythdbcheck.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythbase/mythsorthelper.h>
 
 // mythbrowser

diff --git a/mythplugins/mythbrowser/mythbrowser/libmythbrowser.cpp b/mythplugins/mythbrowser/mythbrowser/libmythbrowser.cpp
@@ -5,7 +5,8 @@
 #include <QApplication>
 
 // MythTV
-#include <libmyth/mythcontext.h>
+#include <libmythbase/mythcorecontext.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythbase/mythpluginapi.h>
 #include <libmythbase/mythversion.h>
 #include <libmythui/mythmainwindow.h>

diff --git a/mythplugins/mythbrowser/mythbrowser/mythbrowser.cpp b/mythplugins/mythbrowser/mythbrowser/mythbrowser.cpp
@@ -5,7 +5,6 @@
 #include <QEvent>
 
 // MythTV
-#include <libmyth/mythcontext.h>
 #include <libmythbase/mythlogging.h>
 #include <libmythui/mythmainwindow.h>
 #include <libmythui/mythuihelper.h>

diff --git a/mythplugins/mythbrowser/mythbrowser/mythflashplayer.cpp b/mythplugins/mythbrowser/mythbrowser/mythflashplayer.cpp
@@ -6,7 +6,6 @@
 #include <QEvent>
 
 // MythTV
-#include <libmyth/mythcontext.h>
 #include <libmythbase/mythlogging.h>
 #include <libmythtv/playgroup.h>
 #include <libmythui/mythmainwindow.h>

diff --git a/mythplugins/mythbrowser/mythbrowser/webpage.cpp b/mythplugins/mythbrowser/mythbrowser/webpage.cpp
@@ -6,7 +6,6 @@
 #include <QIcon>
 
 // MythTV
-#include <libmythbase/mythlogging.h>
 #include <libmythui/mythmainwindow.h>
 
 // mythbrowser

diff --git a/mythplugins/mythgame/mythgame/gamedbcheck.cpp b/mythplugins/mythgame/mythgame/gamedbcheck.cpp
@@ -6,9 +6,10 @@
 #include <QSqlError>
 
 // MythTV
-#include <libmyth/mythcontext.h>
+#include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdb.h>
 #include <libmythbase/mythdbcheck.h>
+#include <libmythbase/mythlogging.h>
 
 // MythGame
 #include "gamedbcheck.h"

diff --git a/mythplugins/mythgame/mythgame/gamedetails.cpp b/mythplugins/mythgame/mythgame/gamedetails.cpp
@@ -3,7 +3,6 @@
 #include <QFile>
 
 // MythTV
-#include <libmyth/mythcontext.h>
 #include <libmythui/mythdialogbox.h>
 #include <libmythui/mythuibutton.h>
 #include <libmythui/mythuihelper.h>

diff --git a/mythplugins/mythgame/mythgame/gamehandler.cpp b/mythplugins/mythgame/mythgame/gamehandler.cpp
@@ -7,9 +7,10 @@
 #include <QRegularExpression>
 
 // MythTV
-#include <libmyth/mythcontext.h>
+#include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdb.h>
 #include <libmythbase/mythdbcon.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythbase/mythsystemlegacy.h>
 #include <libmythui/mythdialogbox.h>
 #include <libmythui/mythmainwindow.h>

diff --git a/mythplugins/mythgame/mythgame/gamescan.cpp b/mythplugins/mythgame/mythgame/gamescan.cpp
@@ -9,7 +9,7 @@
 #include <QUrl>
 
 // MythTV
-#include <libmyth/mythcontext.h>
+#include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythevent.h>
 #include <libmythbase/mythlogging.h>
 #include <libmythbase/remoteutil.h>

diff --git a/mythplugins/mythgame/mythgame/gamesettings.cpp b/mythplugins/mythgame/mythgame/gamesettings.cpp
@@ -7,6 +7,7 @@
 // MythTV
 #include <libmythbase/mythdb.h>
 #include <libmythbase/mythdirs.h>
+#include <libmythbase/mythlogging.h>
 
 // MythGame
 #include "gamesettings.h"

diff --git a/mythplugins/mythgame/mythgame/gameui.cpp b/mythplugins/mythgame/mythgame/gameui.cpp
@@ -4,8 +4,9 @@
 #include <QTimer>
 
 // MythTV
-#include <libmyth/mythcontext.h>
+#include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdirs.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythmetadata/mythuimetadataresults.h>
 #include <libmythui/mythdialogbox.h>
 #include <libmythui/mythgenerictree.h>

diff --git a/mythplugins/mythgame/mythgame/mythgame.cpp b/mythplugins/mythgame/mythgame/mythgame.cpp
@@ -1,7 +1,8 @@
 // MythTV
-#include <libmyth/mythcontext.h>
 #include <libmythbase/lcddevice.h>
+#include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdbcon.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythbase/mythpluginapi.h>
 #include <libmythbase/mythversion.h>
 #include <libmythui/myththemedmenu.h>

diff --git a/mythplugins/mythgame/mythgame/rom_metadata.cpp b/mythplugins/mythgame/mythgame/rom_metadata.cpp
@@ -4,9 +4,6 @@
 // Qt
 #include <QFile>
 
-// MythTV
-#include <libmyth/mythcontext.h>
-
 // MythGame
 #include "rom_metadata.h"