From 5954e5847fd8baedc157c91329ab2f9e8bde609b Mon Sep 17 00:00:00 2001 From: Scott Theisen Date: Thu, 3 Jul 2025 02:34:33 -0400 Subject: [PATCH 01/13] move RemoteDownloadFile() and RemoteDownloadFileNow() to remotefile.* All of the users of these functions already included remotefile.h. --- .../mythnetvision/mythnetvision/netbase.cpp | 1 - mythtv/libs/libmythbase/remotefile.cpp | 35 +++++++++++++++++++ mythtv/libs/libmythbase/remotefile.h | 7 ++++ mythtv/libs/libmythbase/remoteutil.cpp | 35 ------------------- mythtv/libs/libmythbase/remoteutil.h | 7 ---- .../mythfrontend/setupwizard_video.cpp | 1 - mythtv/programs/mythfrontend/themechooser.cpp | 1 - 7 files changed, 42 insertions(+), 45 deletions(-) diff --git a/mythplugins/mythnetvision/mythnetvision/netbase.cpp b/mythplugins/mythnetvision/mythnetvision/netbase.cpp index ac4be0ce1ad..9e411d6593a 100644 --- a/mythplugins/mythnetvision/mythnetvision/netbase.cpp +++ b/mythplugins/mythnetvision/mythnetvision/netbase.cpp @@ -5,7 +5,6 @@ #include #include #include -#include #include #include #include diff --git a/mythtv/libs/libmythbase/remotefile.cpp b/mythtv/libs/libmythbase/remotefile.cpp index 03c2a0ae9c7..275025d0d18 100644 --- a/mythtv/libs/libmythbase/remotefile.cpp +++ b/mythtv/libs/libmythbase/remotefile.cpp @@ -1455,4 +1455,39 @@ bool RemoteFile::Resume(bool repos) return true; } +static QString downloadRemoteFile(const QString &cmd, const QString &url, + const QString &storageGroup, + const QString &filename) +{ + QStringList strlist(cmd); + strlist << url; + strlist << storageGroup; + strlist << filename; + + bool ok = gCoreContext->SendReceiveStringList(strlist); + + if (!ok || strlist.size() < 2 || strlist[0] != "OK") + { + LOG(VB_GENERAL, LOG_ERR, + "downloadRemoteFile(): " + cmd + " returned ERROR!"); + return {}; + } + + return strlist[1]; +} + +QString RemoteDownloadFile(const QString &url, + const QString &storageGroup, + const QString &filename) +{ + return downloadRemoteFile("DOWNLOAD_FILE", url, storageGroup, filename); +} + +QString RemoteDownloadFileNow(const QString &url, + const QString &storageGroup, + const QString &filename) +{ + return downloadRemoteFile("DOWNLOAD_FILE_NOW", url, storageGroup, filename); +} + /* vim: set expandtab tabstop=4 shiftwidth=4: */ diff --git a/mythtv/libs/libmythbase/remotefile.h b/mythtv/libs/libmythbase/remotefile.h index aff3b062bd5..abf179353d4 100644 --- a/mythtv/libs/libmythbase/remotefile.h +++ b/mythtv/libs/libmythbase/remotefile.h @@ -100,4 +100,11 @@ class MBASE_PUBLIC RemoteFile ThreadedFileWriter *m_fileWriter {nullptr}; }; +MBASE_PUBLIC QString RemoteDownloadFile(const QString &url, + const QString &storageGroup, + const QString &filename = ""); +MBASE_PUBLIC QString RemoteDownloadFileNow(const QString &url, + const QString &storageGroup, + const QString &filename = ""); + #endif diff --git a/mythtv/libs/libmythbase/remoteutil.cpp b/mythtv/libs/libmythbase/remoteutil.cpp index f149d3f4a06..fc1867c3e70 100644 --- a/mythtv/libs/libmythbase/remoteutil.cpp +++ b/mythtv/libs/libmythbase/remoteutil.cpp @@ -585,39 +585,4 @@ bool RemoteGetActiveBackends(QStringList *list) return true; } -static QString downloadRemoteFile(const QString &cmd, const QString &url, - const QString &storageGroup, - const QString &filename) -{ - QStringList strlist(cmd); - strlist << url; - strlist << storageGroup; - strlist << filename; - - bool ok = gCoreContext->SendReceiveStringList(strlist); - - if (!ok || strlist.size() < 2 || strlist[0] != "OK") - { - LOG(VB_GENERAL, LOG_ERR, - "downloadRemoteFile(): " + cmd + " returned ERROR!"); - return {}; - } - - return strlist[1]; -} - -QString RemoteDownloadFile(const QString &url, - const QString &storageGroup, - const QString &filename) -{ - return downloadRemoteFile("DOWNLOAD_FILE", url, storageGroup, filename); -} - -QString RemoteDownloadFileNow(const QString &url, - const QString &storageGroup, - const QString &filename) -{ - return downloadRemoteFile("DOWNLOAD_FILE_NOW", url, storageGroup, filename); -} - /* vim: set expandtab tabstop=4 shiftwidth=4: */ diff --git a/mythtv/libs/libmythbase/remoteutil.h b/mythtv/libs/libmythbase/remoteutil.h index ad2f97675d9..3a081acdaa6 100644 --- a/mythtv/libs/libmythbase/remoteutil.h +++ b/mythtv/libs/libmythbase/remoteutil.h @@ -52,13 +52,6 @@ MBASE_PUBLIC bool RemoteGetFileList(const QString& host, const QString& path, QS QString sgroup, bool fileNamesOnly = false); MBASE_PUBLIC bool RemoteGetActiveBackends(QStringList *list); -MBASE_PUBLIC QString RemoteDownloadFile(const QString &url, - const QString &storageGroup, - const QString &filename = ""); -MBASE_PUBLIC QString RemoteDownloadFileNow(const QString &url, - const QString &storageGroup, - const QString &filename = ""); - #endif // REMOTEUTIL_H_ /* vim: set expandtab tabstop=4 shiftwidth=4: */ diff --git a/mythtv/programs/mythfrontend/setupwizard_video.cpp b/mythtv/programs/mythfrontend/setupwizard_video.cpp index 62279fe351a..0e1b60a7818 100644 --- a/mythtv/programs/mythfrontend/setupwizard_video.cpp +++ b/mythtv/programs/mythfrontend/setupwizard_video.cpp @@ -9,7 +9,6 @@ #include "libmythbase/mythdirs.h" #include "libmythbase/mythlogging.h" #include "libmythbase/remotefile.h" -#include "libmythbase/remoteutil.h" #include "libmythbase/storagegroup.h" #include "libmythui/mythprogressdialog.h" diff --git a/mythtv/programs/mythfrontend/themechooser.cpp b/mythtv/programs/mythfrontend/themechooser.cpp index 28e8edb2bd4..4db23c3f859 100644 --- a/mythtv/programs/mythfrontend/themechooser.cpp +++ b/mythtv/programs/mythfrontend/themechooser.cpp @@ -15,7 +15,6 @@ #include "libmythbase/mythversion.h" #include "libmythbase/programtypes.h" #include "libmythbase/remotefile.h" -#include "libmythbase/remoteutil.h" #include "libmythbase/storagegroup.h" #include "libmythbase/unziputil.h" // for extractZIP #include "libmythtv/mythsystemevent.h" From c00e18804ddb2c78bc72d3c737c133bf81fbcc99 Mon Sep 17 00:00:00 2001 From: Scott Theisen Date: Thu, 3 Jul 2025 03:14:25 -0400 Subject: [PATCH 02/13] Move RemoteGet(Load|Uptime|MemStats) to mythmiscutil.* The corresponding local implementations are already there and their only user already includes mythmiscutil.h. --- mythtv/libs/libmythbase/mythmiscutil.cpp | 51 ++++++++++++++++++++++ mythtv/libs/libmythbase/mythmiscutil.h | 5 +++ mythtv/libs/libmythbase/remoteutil.cpp | 51 ---------------------- mythtv/libs/libmythbase/remoteutil.h | 6 --- mythtv/programs/mythfrontend/statusbox.cpp | 4 +- 5 files changed, 58 insertions(+), 59 deletions(-) diff --git a/mythtv/libs/libmythbase/mythmiscutil.cpp b/mythtv/libs/libmythbase/mythmiscutil.cpp index d626211a886..fbbb213a5a4 100644 --- a/mythtv/libs/libmythbase/mythmiscutil.cpp +++ b/mythtv/libs/libmythbase/mythmiscutil.cpp @@ -175,6 +175,57 @@ loadArray getLoadAvgs (void) return {-1, -1, -1}; } +bool RemoteGetLoad(loadArray& load) +{ + QStringList strlist(QString("QUERY_LOAD")); + + if (gCoreContext->SendReceiveStringList(strlist) && strlist.size() >= 3) + { + load[0] = strlist[0].toDouble(); + load[1] = strlist[1].toDouble(); + load[2] = strlist[2].toDouble(); + return true; + } + + return false; +} + +bool RemoteGetUptime(std::chrono::seconds &uptime) +{ + QStringList strlist(QString("QUERY_UPTIME")); + + if (!gCoreContext->SendReceiveStringList(strlist) || strlist.isEmpty()) + return false; + + if (strlist[0].isEmpty() || !strlist[0].at(0).isNumber()) + return false; + + if (sizeof(std::chrono::seconds::rep) == sizeof(long long)) + uptime = std::chrono::seconds(strlist[0].toLongLong()); + else if (sizeof(std::chrono::seconds::rep) == sizeof(long)) + uptime = std::chrono::seconds(strlist[0].toLong()); + else if (sizeof(std::chrono::seconds::rep) == sizeof(int)) + uptime = std::chrono::seconds(strlist[0].toInt()); + + return true; +} + +bool RemoteGetMemStats(int &totalMB, int &freeMB, int &totalVM, int &freeVM) +{ + QStringList strlist(QString("QUERY_MEMSTATS")); + + if (gCoreContext->SendReceiveStringList(strlist) && strlist.size() >= 4) + { + totalMB = strlist[0].toInt(); + freeMB = strlist[1].toInt(); + totalVM = strlist[2].toInt(); + freeVM = strlist[3].toInt(); + return true; + } + + return false; +} + /** * \brief Can we ping host within timeout seconds? * diff --git a/mythtv/libs/libmythbase/mythmiscutil.h b/mythtv/libs/libmythbase/mythmiscutil.h index bf347b720fd..cd6bd11ad0d 100644 --- a/mythtv/libs/libmythbase/mythmiscutil.h +++ b/mythtv/libs/libmythbase/mythmiscutil.h @@ -22,6 +22,11 @@ MBASE_PUBLIC bool getMemStats( using loadArray = std::array; MBASE_PUBLIC loadArray getLoadAvgs(void); +MBASE_PUBLIC bool RemoteGetLoad(loadArray &load); +MBASE_PUBLIC bool RemoteGetUptime(std::chrono::seconds &uptime); +MBASE_PUBLIC +bool RemoteGetMemStats(int &totalMB, int &freeMB, int &totalVM, int &freeVM); + MBASE_PUBLIC bool ping(const QString &host, std::chrono::milliseconds timeout); MBASE_PUBLIC bool telnet(const QString &host, int port); diff --git a/mythtv/libs/libmythbase/remoteutil.cpp b/mythtv/libs/libmythbase/remoteutil.cpp index fc1867c3e70..b6af8484da2 100644 --- a/mythtv/libs/libmythbase/remoteutil.cpp +++ b/mythtv/libs/libmythbase/remoteutil.cpp @@ -39,57 +39,6 @@ std::vector *RemoteGetRecordedList(int sort) return info; } -bool RemoteGetLoad(system_load_array& load) -{ - QStringList strlist(QString("QUERY_LOAD")); - - if (gCoreContext->SendReceiveStringList(strlist) && strlist.size() >= 3) - { - load[0] = strlist[0].toDouble(); - load[1] = strlist[1].toDouble(); - load[2] = strlist[2].toDouble(); - return true; - } - - return false; -} - -bool RemoteGetUptime(std::chrono::seconds &uptime) -{ - QStringList strlist(QString("QUERY_UPTIME")); - - if (!gCoreContext->SendReceiveStringList(strlist) || strlist.isEmpty()) - return false; - - if (strlist[0].isEmpty() || !strlist[0].at(0).isNumber()) - return false; - - if (sizeof(std::chrono::seconds::rep) == sizeof(long long)) - uptime = std::chrono::seconds(strlist[0].toLongLong()); - else if (sizeof(std::chrono::seconds::rep) == sizeof(long)) - uptime = std::chrono::seconds(strlist[0].toLong()); - else if (sizeof(std::chrono::seconds::rep) == sizeof(int)) - uptime = std::chrono::seconds(strlist[0].toInt()); - - return true; -} - -bool RemoteGetMemStats(int &totalMB, int &freeMB, int &totalVM, int &freeVM) -{ - QStringList strlist(QString("QUERY_MEMSTATS")); - - if (gCoreContext->SendReceiveStringList(strlist) && strlist.size() >= 4) - { - totalMB = strlist[0].toInt(); - freeMB = strlist[1].toInt(); - totalVM = strlist[2].toInt(); - freeVM = strlist[3].toInt(); - return true; - } - - return false; -} - bool RemoteCheckFile(ProgramInfo *pginfo, bool checkSlaves) { QStringList strlist("QUERY_CHECKFILE"); diff --git a/mythtv/libs/libmythbase/remoteutil.h b/mythtv/libs/libmythbase/remoteutil.h index 3a081acdaa6..572f54334fd 100644 --- a/mythtv/libs/libmythbase/remoteutil.h +++ b/mythtv/libs/libmythbase/remoteutil.h @@ -15,13 +15,7 @@ class ProgramInfo; class MythEvent; -using system_load_array = std::array; - MBASE_PUBLIC std::vector *RemoteGetRecordedList(int sort); -MBASE_PUBLIC bool RemoteGetLoad(system_load_array &load); -MBASE_PUBLIC bool RemoteGetUptime(std::chrono::seconds &uptime); -MBASE_PUBLIC -bool RemoteGetMemStats(int &totalMB, int &freeMB, int &totalVM, int &freeVM); MBASE_PUBLIC bool RemoteCheckFile( ProgramInfo *pginfo, bool checkSlaves = true); MBASE_PUBLIC bool RemoteDeleteRecording( uint recordingID, bool forceMetadataDelete, diff --git a/mythtv/programs/mythfrontend/statusbox.cpp b/mythtv/programs/mythfrontend/statusbox.cpp index d50abe13460..dcc2f492769 100644 --- a/mythtv/programs/mythfrontend/statusbox.cpp +++ b/mythtv/programs/mythfrontend/statusbox.cpp @@ -1314,12 +1314,12 @@ void StatusBox::doMachineStatus() } // weighted average loads - system_load_array floads; + loadArray floads; if (RemoteGetLoad(floads)) { auto UpdateRemoteLoad = [](StatusBoxItem* Item) { - system_load_array loads = { 0.0, 0.0, 0.0 }; + loadArray loads = { 0.0, 0.0, 0.0 }; RemoteGetLoad(loads); Item->SetText(QString(" %1: %2 %3 %4").arg(tr("Load")).arg(loads[0], 1, 'f', 2) .arg(loads[1], 1, 'f', 2).arg(loads[2], 1, 'f', 2)); From d6ccbbf2789cd2b39a0be931d7eb0b833d5dff21 Mon Sep 17 00:00:00 2001 From: Scott Theisen Date: Thu, 3 Jul 2025 16:10:15 -0400 Subject: [PATCH 03/13] move RemoteGetFileList() to StorageGroup It uses functions from StorageGroup, returns information about StorageGroups, and its users already include storagegroup.h --- mythtv/libs/libmythbase/remoteutil.cpp | 52 ---------------------- mythtv/libs/libmythbase/remoteutil.h | 2 - mythtv/libs/libmythbase/storagegroup.cpp | 53 +++++++++++++++++++++++ mythtv/libs/libmythbase/storagegroup.h | 5 +++ mythtv/libs/libmythmetadata/dirscan.cpp | 3 +- mythtv/programs/mythfrontend/videodlg.cpp | 5 +-- 6 files changed, 61 insertions(+), 59 deletions(-) diff --git a/mythtv/libs/libmythbase/remoteutil.cpp b/mythtv/libs/libmythbase/remoteutil.cpp index b6af8484da2..8fecc9e0828 100644 --- a/mythtv/libs/libmythbase/remoteutil.cpp +++ b/mythtv/libs/libmythbase/remoteutil.cpp @@ -375,58 +375,6 @@ int RemoteGetRecordingMask(void) return mask; } -bool RemoteGetFileList(const QString& host, const QString& path, QStringList* list, - QString sgroup, bool fileNamesOnly) -{ - - // Make sure the list is empty when we get started - list->clear(); - - if (sgroup.isEmpty()) - sgroup = "Videos"; - - *list << "QUERY_SG_GETFILELIST"; - *list << host; - *list << StorageGroup::GetGroupToUse(host, sgroup); - *list << path; - *list << QString::number(static_cast(fileNamesOnly)); - - bool ok = false; - - if (gCoreContext->IsMasterBackend()) - { - // since the master backend cannot connect back around to - // itself, and the libraries do not have access to the list - // of connected slave backends to query an existing connection - // start up a new temporary connection directly to the slave - // backend to query the file list - QString ann = QString("ANN Playback %1 0") - .arg(gCoreContext->GetHostName()); - QString addr = gCoreContext->GetBackendServerIP(host); - int port = gCoreContext->GetBackendServerPort(host); - bool mismatch = false; - - MythSocket *sock = gCoreContext->ConnectCommandSocket( - addr, port, ann, &mismatch); - if (sock) - { - ok = sock->SendReceiveStringList(*list); - sock->DecrRef(); - } - else - { - list->clear(); - } - } - else - { - ok = gCoreContext->SendReceiveStringList(*list); - } - -// Should the SLAVE UNREACH test be here ? - return ok; -} - /** * Get recorder for a programme. * diff --git a/mythtv/libs/libmythbase/remoteutil.h b/mythtv/libs/libmythbase/remoteutil.h index 572f54334fd..e24793be386 100644 --- a/mythtv/libs/libmythbase/remoteutil.h +++ b/mythtv/libs/libmythbase/remoteutil.h @@ -42,8 +42,6 @@ MBASE_PUBLIC int RemoteGetRecordingStatus(const ProgramInfo *pginfo, int overrec int underrecsecs); MBASE_PUBLIC std::vector *RemoteGetCurrentlyRecordingList(void); -MBASE_PUBLIC bool RemoteGetFileList(const QString& host, const QString& path, QStringList* list, - QString sgroup, bool fileNamesOnly = false); MBASE_PUBLIC bool RemoteGetActiveBackends(QStringList *list); #endif // REMOTEUTIL_H_ diff --git a/mythtv/libs/libmythbase/storagegroup.cpp b/mythtv/libs/libmythbase/storagegroup.cpp index 081e8695172..d9faa1649f4 100644 --- a/mythtv/libs/libmythbase/storagegroup.cpp +++ b/mythtv/libs/libmythbase/storagegroup.cpp @@ -8,6 +8,7 @@ #include "mythlogging.h" #include "filesysteminfo.h" #include "mythdirs.h" +#include "mythsocket.h" #define LOC QString("SG(%1): ").arg(m_groupname) @@ -884,4 +885,56 @@ QString StorageGroup::generate_file_url(const QString &storage_group, } +bool StorageGroup::remoteGetFileList(const QString& host, const QString& path, QStringList* list, + QString sgroup, bool fileNamesOnly) +{ + + // Make sure the list is empty when we get started + list->clear(); + + if (sgroup.isEmpty()) + sgroup = "Videos"; + + *list << "QUERY_SG_GETFILELIST"; + *list << host; + *list << StorageGroup::GetGroupToUse(host, sgroup); + *list << path; + *list << QString::number(static_cast(fileNamesOnly)); + + bool ok = false; + + if (gCoreContext->IsMasterBackend()) + { + // since the master backend cannot connect back around to + // itself, and the libraries do not have access to the list + // of connected slave backends to query an existing connection + // start up a new temporary connection directly to the slave + // backend to query the file list + QString ann = QString("ANN Playback %1 0") + .arg(gCoreContext->GetHostName()); + QString addr = gCoreContext->GetBackendServerIP(host); + int port = gCoreContext->GetBackendServerPort(host); + bool mismatch = false; + + MythSocket *sock = gCoreContext->ConnectCommandSocket( + addr, port, ann, &mismatch); + if (sock) + { + ok = sock->SendReceiveStringList(*list); + sock->DecrRef(); + } + else + { + list->clear(); + } + } + else + { + ok = gCoreContext->SendReceiveStringList(*list); + } + + // Should the SLAVE UNREACH test be here ? + return ok; +} + /* vim: set expandtab tabstop=4 shiftwidth=4: */ diff --git a/mythtv/libs/libmythbase/storagegroup.h b/mythtv/libs/libmythbase/storagegroup.h index dc8a9522182..60a54eabfbd 100644 --- a/mythtv/libs/libmythbase/storagegroup.h +++ b/mythtv/libs/libmythbase/storagegroup.h @@ -56,6 +56,11 @@ class MBASE_PUBLIC StorageGroup const QString &host, const QString &path); + static bool remoteGetFileList(const QString& host, + const QString& path, + QStringList* list, + QString sgroup, + bool fileNamesOnly = false); private: static void StaticInit(void); static bool m_staticInitDone; diff --git a/mythtv/libs/libmythmetadata/dirscan.cpp b/mythtv/libs/libmythmetadata/dirscan.cpp index 405f4168f0d..5d0839a054f 100644 --- a/mythtv/libs/libmythmetadata/dirscan.cpp +++ b/mythtv/libs/libmythmetadata/dirscan.cpp @@ -5,7 +5,6 @@ #include "libmythbase/mythcorecontext.h" #include "libmythbase/mythlogging.h" -#include "libmythbase/remoteutil.h" #include "libmythbase/storagegroup.h" #include "dbaccess.h" @@ -136,7 +135,7 @@ namespace } else { - ok = RemoteGetFileList(host, start_path, &list, "Videos"); + ok = StorageGroup::remoteGetFileList(host, start_path, &list, "Videos"); } if (!ok || (!list.isEmpty() && list.at(0).startsWith("SLAVE UNREACHABLE"))) diff --git a/mythtv/programs/mythfrontend/videodlg.cpp b/mythtv/programs/mythfrontend/videodlg.cpp index b50d88a84f3..b6159592c54 100644 --- a/mythtv/programs/mythfrontend/videodlg.cpp +++ b/mythtv/programs/mythfrontend/videodlg.cpp @@ -21,7 +21,6 @@ #include "libmythbase/mythrandom.h" #include "libmythbase/mythsystemlegacy.h" #include "libmythbase/remotefile.h" -#include "libmythbase/remoteutil.h" #include "libmythbase/storagegroup.h" #include "libmythmetadata/dbaccess.h" #include "libmythmetadata/dirscan.h" @@ -170,7 +169,7 @@ namespace { QStringList hostFiles; - RemoteGetFileList(host, "", &hostFiles, sgroup, true); + StorageGroup::remoteGetFileList(host, "", &hostFiles, sgroup, true); const QString hntm("%2.%3"); for (const auto & ext : image_exts) @@ -1578,7 +1577,7 @@ QString VideoDialog::GetCoverImage(MythGenericTree *node) path = path + "/" + subdir; QStringList tmpList; - bool ok = RemoteGetFileList(host, path, &tmpList, "Videos"); + bool ok = StorageGroup::remoteGetFileList(host, path, &tmpList, "Videos"); if (ok) { From 6d2457b7bd423b6356f7668de1379dae84488b01 Mon Sep 17 00:00:00 2001 From: Scott Theisen Date: Thu, 3 Jul 2025 16:44:31 -0400 Subject: [PATCH 04/13] move RemoteGetRecordingMask() to libmythtv/tvremoteutil.* It is more similar to the functions already in libmythtv/tvremoteutil.* and its only user already includes libmythtv/tvremoteutil.h. --- mythtv/libs/libmythbase/remoteutil.cpp | 37 ------------------- mythtv/libs/libmythbase/remoteutil.h | 1 - mythtv/libs/libmythtv/tvremoteutil.cpp | 37 +++++++++++++++++++ mythtv/libs/libmythtv/tvremoteutil.h | 2 + mythtv/programs/mythfrontend/mythfrontend.cpp | 1 - 5 files changed, 39 insertions(+), 39 deletions(-) diff --git a/mythtv/libs/libmythbase/remoteutil.cpp b/mythtv/libs/libmythbase/remoteutil.cpp index 8fecc9e0828..7613596a19b 100644 --- a/mythtv/libs/libmythbase/remoteutil.cpp +++ b/mythtv/libs/libmythbase/remoteutil.cpp @@ -338,43 +338,6 @@ QStringList RemoteRecordings(void) return strlist; } -int RemoteGetRecordingMask(void) -{ - int mask = 0; - - QString cmd = "QUERY_ISRECORDING"; - - QStringList strlist( cmd ); - - if (!gCoreContext->SendReceiveStringList(strlist) || strlist.isEmpty()) - return mask; - - int recCount = strlist[0].toInt(); - - for (int i = 0, j = 0; j < recCount; i++) - { - cmd = QString("QUERY_RECORDER %1").arg(i + 1); - - strlist = QStringList( cmd ); - strlist << "IS_RECORDING"; - - if (gCoreContext->SendReceiveStringList(strlist) && !strlist.isEmpty()) - { - if (strlist[0].toInt()) - { - mask |= 1<SendReceiveStringList(strlist) || strlist.isEmpty()) + return mask; + + int recCount = strlist[0].toInt(); + + for (int i = 0, j = 0; j < recCount; i++) + { + cmd = QString("QUERY_RECORDER %1").arg(i + 1); + + strlist = QStringList( cmd ); + strlist << "IS_RECORDING"; + + if (gCoreContext->SendReceiveStringList(strlist) && !strlist.isEmpty()) + { + if (strlist[0].toInt()) + { + mask |= 1< *tunerList = nullptr, bool list_inactive = false); +MTV_PUBLIC int RemoteGetRecordingMask(void); + #endif // TV_REMOTE_UTIL_H /* vim: set expandtab tabstop=4 shiftwidth=4: */ diff --git a/mythtv/programs/mythfrontend/mythfrontend.cpp b/mythtv/programs/mythfrontend/mythfrontend.cpp index 84960931f0d..3ffe76b19a6 100644 --- a/mythtv/programs/mythfrontend/mythfrontend.cpp +++ b/mythtv/programs/mythfrontend/mythfrontend.cpp @@ -62,7 +62,6 @@ #include "libmythbase/mythversion.h" #include "libmythbase/programinfo.h" #include "libmythbase/referencecounter.h" -#include "libmythbase/remoteutil.h" #include "libmythbase/signalhandling.h" #include "libmythmetadata/cleanup.h" #include "libmythmetadata/globals.h" From f216bc80662ee70d8953f211d0e516595c98f47c Mon Sep 17 00:00:00 2001 From: Scott Theisen Date: Thu, 3 Jul 2025 16:47:32 -0400 Subject: [PATCH 05/13] remove unused RemoteRecordings() If desired it could be added back in libmythtv/tvremoteutil.*. --- mythtv/libs/libmythbase/remoteutil.cpp | 14 -------------- mythtv/libs/libmythbase/remoteutil.h | 1 - 2 files changed, 15 deletions(-) diff --git a/mythtv/libs/libmythbase/remoteutil.cpp b/mythtv/libs/libmythbase/remoteutil.cpp index 7613596a19b..b16b0424154 100644 --- a/mythtv/libs/libmythbase/remoteutil.cpp +++ b/mythtv/libs/libmythbase/remoteutil.cpp @@ -324,20 +324,6 @@ bool RemoteFillProgramInfo(ProgramInfo &pginfo, const QString &playbackhost) return false; } -QStringList RemoteRecordings(void) -{ - QStringList strlist("QUERY_ISRECORDING"); - - if (!gCoreContext->SendReceiveStringList(strlist, false, false)) - { - QStringList empty; - empty << "0" << "0"; - return empty; - } - - return strlist; -} - /** * Get recorder for a programme. * diff --git a/mythtv/libs/libmythbase/remoteutil.h b/mythtv/libs/libmythbase/remoteutil.h index 4fdaf0fb571..93a8c1fc8a2 100644 --- a/mythtv/libs/libmythbase/remoteutil.h +++ b/mythtv/libs/libmythbase/remoteutil.h @@ -34,7 +34,6 @@ MBASE_PUBLIC QDateTime RemoteGetPreviewIfModified( const ProgramInfo &pginfo, const QString &cachefile); MBASE_PUBLIC bool RemoteFillProgramInfo( ProgramInfo &pginfo, const QString &playbackhostname); -MBASE_PUBLIC QStringList RemoteRecordings(void); MBASE_PUBLIC int RemoteCheckForRecording(const ProgramInfo *pginfo); MBASE_PUBLIC int RemoteGetRecordingStatus(const ProgramInfo *pginfo, int overrecsecs, From f339d54feb777ed16cc38155102351bbe17afb81 Mon Sep 17 00:00:00 2001 From: Scott Theisen Date: Thu, 3 Jul 2025 19:13:09 -0400 Subject: [PATCH 06/13] move RemoteGetActiveBackends() to libmythmetadata/videoscan.* It is only used in relation to VideoScannerThread::SetHosts(), so move it there. The only other user already includes libmythmetadata/videoscan.h. --- mythtv/libs/libmythbase/remoteutil.cpp | 15 --------------- mythtv/libs/libmythbase/remoteutil.h | 2 -- mythtv/libs/libmythmetadata/metadatafactory.cpp | 1 - mythtv/libs/libmythmetadata/videoscan.cpp | 16 ++++++++++++++-- mythtv/libs/libmythmetadata/videoscan.h | 2 ++ 5 files changed, 16 insertions(+), 20 deletions(-) diff --git a/mythtv/libs/libmythbase/remoteutil.cpp b/mythtv/libs/libmythbase/remoteutil.cpp index b16b0424154..c64419700dc 100644 --- a/mythtv/libs/libmythbase/remoteutil.cpp +++ b/mythtv/libs/libmythbase/remoteutil.cpp @@ -416,19 +416,4 @@ std::vector *RemoteGetCurrentlyRecordingList(void) return reclist; } -/** - * \brief return list of backends currently connected to the master - */ -bool RemoteGetActiveBackends(QStringList *list) -{ - list->clear(); - *list << "QUERY_ACTIVE_BACKENDS"; - - if (!gCoreContext->SendReceiveStringList(*list)) - return false; - - list->removeFirst(); - return true; -} - /* vim: set expandtab tabstop=4 shiftwidth=4: */ diff --git a/mythtv/libs/libmythbase/remoteutil.h b/mythtv/libs/libmythbase/remoteutil.h index 93a8c1fc8a2..e0668d044b6 100644 --- a/mythtv/libs/libmythbase/remoteutil.h +++ b/mythtv/libs/libmythbase/remoteutil.h @@ -40,8 +40,6 @@ MBASE_PUBLIC int RemoteGetRecordingStatus(const ProgramInfo *pginfo, int overrec int underrecsecs); MBASE_PUBLIC std::vector *RemoteGetCurrentlyRecordingList(void); -MBASE_PUBLIC bool RemoteGetActiveBackends(QStringList *list); - #endif // REMOTEUTIL_H_ /* vim: set expandtab tabstop=4 shiftwidth=4: */ diff --git a/mythtv/libs/libmythmetadata/metadatafactory.cpp b/mythtv/libs/libmythmetadata/metadatafactory.cpp index ba4921a8548..e262669d2f7 100644 --- a/mythtv/libs/libmythmetadata/metadatafactory.cpp +++ b/mythtv/libs/libmythmetadata/metadatafactory.cpp @@ -15,7 +15,6 @@ #include "libmythbase/mythcorecontext.h" #include "libmythbase/mythlogging.h" #include "libmythbase/programinfo.h" -#include "libmythbase/remoteutil.h" #include "libmythbase/storagegroup.h" #include "libmythtv/recordingrule.h" diff --git a/mythtv/libs/libmythmetadata/videoscan.cpp b/mythtv/libs/libmythmetadata/videoscan.cpp index 119e85269d6..29b0e618cb7 100644 --- a/mythtv/libs/libmythmetadata/videoscan.cpp +++ b/mythtv/libs/libmythmetadata/videoscan.cpp @@ -11,7 +11,6 @@ #include "libmythbase/mythdate.h" #include "libmythbase/mythevent.h" #include "libmythbase/mythlogging.h" -#include "libmythbase/remoteutil.h" #include "libmythui/mythdialogbox.h" #include "libmythui/mythmainwindow.h" #include "libmythui/mythprogressdialog.h" @@ -482,4 +481,17 @@ void VideoScanner::finishedScan() emit finished(m_scanThread->getDataChanged()); } -//////////////////////////////////////////////////////////////////////// +/** + * \brief return list of backends currently connected to the master + */ +bool RemoteGetActiveBackends(QStringList *list) +{ + list->clear(); + *list << "QUERY_ACTIVE_BACKENDS"; + + if (!gCoreContext->SendReceiveStringList(*list)) + return false; + + list->removeFirst(); + return true; +} diff --git a/mythtv/libs/libmythmetadata/videoscan.h b/mythtv/libs/libmythmetadata/videoscan.h index 22819c26add..433c0cc7dd6 100644 --- a/mythtv/libs/libmythmetadata/videoscan.h +++ b/mythtv/libs/libmythmetadata/videoscan.h @@ -115,4 +115,6 @@ class META_PUBLIC VideoScannerThread : public MThread bool m_dbDataChanged {false}; }; +META_PUBLIC bool RemoteGetActiveBackends(QStringList *list); + #endif From 6dd6b25bd7b9c9d3c4be3c14ee07f272cc0506f0 Mon Sep 17 00:00:00 2001 From: Scott Theisen Date: Thu, 3 Jul 2025 21:01:16 -0400 Subject: [PATCH 07/13] Rename libmythbase/remoteutil.* to programinforemoteutil.* since the remaining functions all use ProgramInfo in some way. --- mythplugins/mytharchive/mytharchive/exportnative.cpp | 1 - .../mytharchive/mytharchive/recordingselector.cpp | 2 +- mythplugins/mythgame/mythgame/gamescan.cpp | 1 - .../mythfillnetvision/mythfillnetvision.cpp | 1 - mythtv/libs/libmythbase/CMakeLists.txt | 4 ++-- mythtv/libs/libmythbase/libmythbase.pro | 6 +++--- mythtv/libs/libmythbase/programinfo.cpp | 2 +- .../{remoteutil.cpp => programinforemoteutil.cpp} | 7 +------ .../{remoteutil.h => programinforemoteutil.h} | 10 +++------- mythtv/libs/libmythbase/programinfoupdater.cpp | 1 - mythtv/libs/libmythmetadata/videometadata.cpp | 1 - mythtv/libs/libmythtv/mythsystemevent.cpp | 1 - mythtv/libs/libmythtv/previewgenerator.cpp | 2 -- mythtv/libs/libmythtv/previewgeneratorqueue.cpp | 2 +- mythtv/libs/libmythtv/tv_play.cpp | 2 +- mythtv/libs/libmythtv/tv_rec.cpp | 1 - mythtv/libs/libmythui/rawsettingseditor.cpp | 1 - mythtv/programs/mythbackend/autoexpire.cpp | 1 - mythtv/programs/mythbackend/mainserver.h | 1 + mythtv/programs/mythbackend/mythbackend.cpp | 1 - .../programs/mythbackend/mythbackend_main_helpers.cpp | 1 - mythtv/programs/mythbackend/scheduler.cpp | 1 - mythtv/programs/mythbackend/scheduler.h | 1 - mythtv/programs/mythcommflag/mythcommflag.cpp | 1 - mythtv/programs/mythfilldatabase/mythfilldatabase.cpp | 1 - mythtv/programs/mythfrontend/editvideometadata.cpp | 1 - mythtv/programs/mythfrontend/guidegrid.cpp | 1 - mythtv/programs/mythfrontend/networkcontrol.cpp | 1 - mythtv/programs/mythfrontend/playbackboxhelper.cpp | 2 +- mythtv/programs/mythfrontend/programinfocache.cpp | 2 +- mythtv/programs/mythfrontend/programrecpriority.cpp | 2 +- mythtv/programs/mythfrontend/schedulecommon.cpp | 2 +- mythtv/programs/mythfrontend/statusbox.cpp | 2 +- mythtv/programs/mythfrontend/videoplayercommand.cpp | 1 - mythtv/programs/mythfrontend/viewscheduled.cpp | 1 - mythtv/programs/mythfrontend/viewschedulediff.cpp | 1 - mythtv/programs/mythmetadatalookup/lookup.cpp | 2 +- mythtv/programs/mythshutdown/mythshutdown.cpp | 1 - mythtv/programs/mythtv-setup/exitprompt.cpp | 1 - mythtv/programs/mythtv-setup/mythtv-setup.cpp | 1 - mythtv/programs/mythutil/backendutils.cpp | 1 - mythtv/programs/mythutil/recordingutils.cpp | 2 +- mythtv/programs/mythwelcome/welcomedialog.cpp | 1 - 43 files changed, 21 insertions(+), 57 deletions(-) rename mythtv/libs/libmythbase/{remoteutil.cpp => programinforemoteutil.cpp} (98%) rename mythtv/libs/libmythbase/{remoteutil.h => programinforemoteutil.h} (91%) diff --git a/mythplugins/mytharchive/mytharchive/exportnative.cpp b/mythplugins/mytharchive/mytharchive/exportnative.cpp index 51253d46288..cae8c1cfe5d 100644 --- a/mythplugins/mytharchive/mytharchive/exportnative.cpp +++ b/mythplugins/mytharchive/mytharchive/exportnative.cpp @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include diff --git a/mythplugins/mytharchive/mytharchive/recordingselector.cpp b/mythplugins/mytharchive/mytharchive/recordingselector.cpp index cf2635933f9..17e30751d5c 100644 --- a/mythplugins/mytharchive/mytharchive/recordingselector.cpp +++ b/mythplugins/mytharchive/mytharchive/recordingselector.cpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/mythplugins/mythgame/mythgame/gamescan.cpp b/mythplugins/mythgame/mythgame/gamescan.cpp index 15652aa2a10..2804dec94ff 100644 --- a/mythplugins/mythgame/mythgame/gamescan.cpp +++ b/mythplugins/mythgame/mythgame/gamescan.cpp @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include diff --git a/mythplugins/mythnetvision/mythfillnetvision/mythfillnetvision.cpp b/mythplugins/mythnetvision/mythfillnetvision/mythfillnetvision.cpp index 5419974f3e1..def051bb673 100644 --- a/mythplugins/mythnetvision/mythfillnetvision/mythfillnetvision.cpp +++ b/mythplugins/mythnetvision/mythfillnetvision/mythfillnetvision.cpp @@ -21,7 +21,6 @@ #include #include #include -#include #include GrabberDownloadThread *gdt = nullptr; diff --git a/mythtv/libs/libmythbase/CMakeLists.txt b/mythtv/libs/libmythbase/CMakeLists.txt index cbc5a7f07c0..f56db93b69e 100644 --- a/mythtv/libs/libmythbase/CMakeLists.txt +++ b/mythtv/libs/libmythbase/CMakeLists.txt @@ -62,6 +62,7 @@ set(LIBMYTHBASE_HEADERS netgrabbermanager.h netutils.h programinfo.h + programinforemoteutil.h programtypes.h programtypeflags.h recordingstatus.h @@ -69,7 +70,6 @@ set(LIBMYTHBASE_HEADERS referencecounter.h referencecounterlist.h remotefile.h - remoteutil.h rssparse.h rssmanager.h serverpool.h @@ -226,13 +226,13 @@ add_library( netutils.cpp portchecker.cpp programinfo.cpp + programinforemoteutil.cpp programinfoupdater.cpp programtypes.cpp recordingstatus.cpp recordingtypes.cpp referencecounter.cpp remotefile.cpp - remoteutil.cpp rssparse.cpp rssmanager.cpp serverpool.cpp diff --git a/mythtv/libs/libmythbase/libmythbase.pro b/mythtv/libs/libmythbase/libmythbase.pro index 0546d7dfa38..954a7d46f59 100644 --- a/mythtv/libs/libmythbase/libmythbase.pro +++ b/mythtv/libs/libmythbase/libmythbase.pro @@ -44,12 +44,12 @@ HEADERS += mythappname.h HEADERS += netgrabbermanager.h HEADERS += netutils.h HEADERS += programinfo.h +HEADERS += programinforemoteutil.h HEADERS += programinfoupdater.h HEADERS += programtypes.h HEADERS += programtypeflags.h HEADERS += recordingstatus.h HEADERS += recordingtypes.h -HEADERS += remoteutil.h HEADERS += rssmanager.h HEADERS += rssparse.h HEADERS += unziputil.h @@ -83,11 +83,11 @@ SOURCES += mythversion.cpp SOURCES += netgrabbermanager.cpp SOURCES += netutils.cpp SOURCES += programinfo.cpp +SOURCES += programinforemoteutil.cpp SOURCES += programinfoupdater.cpp SOURCES += programtypes.cpp SOURCES += recordingstatus.cpp SOURCES += recordingtypes.cpp -SOURCES += remoteutil.cpp SOURCES += rssmanager.cpp SOURCES += rssparse.cpp SOURCES += unziputil.cpp @@ -201,11 +201,11 @@ inc.files += mythrandom.h inc.files += netgrabbermanager.h inc.files += netutils.h inc.files += programinfo.h +inc.files += programinforemoteutil.h inc.files += programtypes.h inc.files += programtypeflags.h inc.files += recordingstatus.h inc.files += recordingtypes.h -inc.files += remoteutil.h inc.files += rssmanager.h inc.files += rssparse.h inc.files += stringutil.h diff --git a/mythtv/libs/libmythbase/programinfo.cpp b/mythtv/libs/libmythbase/programinfo.cpp index ec4fa9f51b9..cbc2172e51f 100644 --- a/mythtv/libs/libmythbase/programinfo.cpp +++ b/mythtv/libs/libmythbase/programinfo.cpp @@ -28,8 +28,8 @@ #include "libmythbase/stringutil.h" #include "programinfo.h" +#include "programinforemoteutil.h" #include "programinfoupdater.h" -#include "remoteutil.h" #define LOC QString("ProgramInfo(%1): ").arg(GetBasename()) diff --git a/mythtv/libs/libmythbase/remoteutil.cpp b/mythtv/libs/libmythbase/programinforemoteutil.cpp similarity index 98% rename from mythtv/libs/libmythbase/remoteutil.cpp rename to mythtv/libs/libmythbase/programinforemoteutil.cpp index c64419700dc..1451ffdbe07 100644 --- a/mythtv/libs/libmythbase/remoteutil.cpp +++ b/mythtv/libs/libmythbase/programinforemoteutil.cpp @@ -1,18 +1,13 @@ -#include "remoteutil.h" +#include "programinforemoteutil.h" #include #include #include #include -#include -#include "libmythbase/compat.h" #include "libmythbase/mythcorecontext.h" -#include "libmythbase/mythevent.h" #include "libmythbase/mythlogging.h" -#include "libmythbase/mythsocket.h" -#include "libmythbase/storagegroup.h" #include "programinfo.h" diff --git a/mythtv/libs/libmythbase/remoteutil.h b/mythtv/libs/libmythbase/programinforemoteutil.h similarity index 91% rename from mythtv/libs/libmythbase/remoteutil.h rename to mythtv/libs/libmythbase/programinforemoteutil.h index e0668d044b6..f257efb58e4 100644 --- a/mythtv/libs/libmythbase/remoteutil.h +++ b/mythtv/libs/libmythbase/programinforemoteutil.h @@ -1,19 +1,15 @@ -#ifndef REMOTEUTIL_H_ -#define REMOTEUTIL_H_ +#ifndef PROGRAMINFO_REMOTEUTIL_H +#define PROGRAMINFO_REMOTEUTIL_H -#include #include #include #include #include -#include "libmythbase/mythchrono.h" - #include "mythbaseexp.h" class ProgramInfo; -class MythEvent; MBASE_PUBLIC std::vector *RemoteGetRecordedList(int sort); MBASE_PUBLIC bool RemoteCheckFile( @@ -40,6 +36,6 @@ MBASE_PUBLIC int RemoteGetRecordingStatus(const ProgramInfo *pginfo, int overrec int underrecsecs); MBASE_PUBLIC std::vector *RemoteGetCurrentlyRecordingList(void); -#endif // REMOTEUTIL_H_ +#endif // PROGRAMINFO_REMOTEUTIL_H /* vim: set expandtab tabstop=4 shiftwidth=4: */ diff --git a/mythtv/libs/libmythbase/programinfoupdater.cpp b/mythtv/libs/libmythbase/programinfoupdater.cpp index a4a1ac0edb2..41663d45d68 100644 --- a/mythtv/libs/libmythbase/programinfoupdater.cpp +++ b/mythtv/libs/libmythbase/programinfoupdater.cpp @@ -6,7 +6,6 @@ #include "libmythbase/mythcorecontext.h" #include "programinfoupdater.h" -#include "remoteutil.h" void ProgramInfoUpdater::insert( uint recordedid, PIAction action, uint64_t filesize) diff --git a/mythtv/libs/libmythmetadata/videometadata.cpp b/mythtv/libs/libmythmetadata/videometadata.cpp index 96f0ff44d7d..2d283650c1d 100644 --- a/mythtv/libs/libmythmetadata/videometadata.cpp +++ b/mythtv/libs/libmythmetadata/videometadata.cpp @@ -13,7 +13,6 @@ #include "libmythbase/mythmiscutil.h"// for FileHash #include "libmythbase/mythsorthelper.h" #include "libmythbase/remotefile.h" -#include "libmythbase/remoteutil.h" #include "libmythbase/storagegroup.h" #include "libmythbase/stringutil.h" #include "libmythbase/ternarycompare.h" diff --git a/mythtv/libs/libmythtv/mythsystemevent.cpp b/mythtv/libs/libmythtv/mythsystemevent.cpp index d8223e0b338..18da30a8512 100644 --- a/mythtv/libs/libmythtv/mythsystemevent.cpp +++ b/mythtv/libs/libmythtv/mythsystemevent.cpp @@ -10,7 +10,6 @@ #include "libmythbase/mythlogging.h" #include "libmythbase/mythsystemlegacy.h" #include "libmythbase/programinfo.h" -#include "libmythbase/remoteutil.h" #include "cardutil.h" #include "mythsystemevent.h" diff --git a/mythtv/libs/libmythtv/previewgenerator.cpp b/mythtv/libs/libmythtv/previewgenerator.cpp index 68291fcd180..7b87f53e6a2 100644 --- a/mythtv/libs/libmythtv/previewgenerator.cpp +++ b/mythtv/libs/libmythtv/previewgenerator.cpp @@ -28,8 +28,6 @@ #include "libmythbase/mythrandom.h" #include "libmythbase/mythsocket.h" #include "libmythbase/mythsystemlegacy.h" -#include "libmythbase/remotefile.h" -#include "libmythbase/remoteutil.h" #include "libmythbase/storagegroup.h" #include "io/mythmediabuffer.h" diff --git a/mythtv/libs/libmythtv/previewgeneratorqueue.cpp b/mythtv/libs/libmythtv/previewgeneratorqueue.cpp index aa6728ec72b..c0f51602688 100644 --- a/mythtv/libs/libmythtv/previewgeneratorqueue.cpp +++ b/mythtv/libs/libmythtv/previewgeneratorqueue.cpp @@ -13,7 +13,7 @@ #include "libmythbase/mythcorecontext.h" #include "libmythbase/mythdirs.h" #include "libmythbase/mythlogging.h" -#include "libmythbase/remoteutil.h" +#include "libmythbase/programinforemoteutil.h" // libmythtv #include "previewgenerator.h" diff --git a/mythtv/libs/libmythtv/tv_play.cpp b/mythtv/libs/libmythtv/tv_play.cpp index d3efdf576ea..94dee65e955 100644 --- a/mythtv/libs/libmythtv/tv_play.cpp +++ b/mythtv/libs/libmythtv/tv_play.cpp @@ -35,8 +35,8 @@ #include "libmythbase/mythmedia.h" #include "libmythbase/mythmiscutil.h" #include "libmythbase/programinfo.h" +#include "libmythbase/programinforemoteutil.h" #include "libmythbase/programtypes.h" -#include "libmythbase/remoteutil.h" #include "libmythbase/signalhandling.h" #include "libmythbase/stringutil.h" diff --git a/mythtv/libs/libmythtv/tv_rec.cpp b/mythtv/libs/libmythtv/tv_rec.cpp index 15b4d66b32c..149c24df921 100644 --- a/mythtv/libs/libmythtv/tv_rec.cpp +++ b/mythtv/libs/libmythtv/tv_rec.cpp @@ -17,7 +17,6 @@ #include "libmythbase/mythlogging.h" #include "libmythbase/mythrandom.h" #include "libmythbase/programinfo.h" -#include "libmythbase/remoteutil.h" #include "libmythbase/storagegroup.h" #include "cardutil.h" diff --git a/mythtv/libs/libmythui/rawsettingseditor.cpp b/mythtv/libs/libmythui/rawsettingseditor.cpp index 98411e6c625..44b591e84fe 100644 --- a/mythtv/libs/libmythui/rawsettingseditor.cpp +++ b/mythtv/libs/libmythui/rawsettingseditor.cpp @@ -1,7 +1,6 @@ #include "libmythbase/mythcorecontext.h" #include "libmythbase/mythlogging.h" -#include "libmythbase/remoteutil.h" #include "libmythui/mythuibutton.h" #include "libmythui/mythuibuttonlist.h" #include "libmythui/mythuishape.h" diff --git a/mythtv/programs/mythbackend/autoexpire.cpp b/mythtv/programs/mythbackend/autoexpire.cpp index b04a9d9aafc..bce40fb79d9 100644 --- a/mythtv/programs/mythbackend/autoexpire.cpp +++ b/mythtv/programs/mythbackend/autoexpire.cpp @@ -30,7 +30,6 @@ #include "libmythbase/mythdb.h" #include "libmythbase/mythlogging.h" #include "libmythbase/programinfo.h" -#include "libmythbase/remoteutil.h" #include "libmythbase/storagegroup.h" #include "libmythprotoserver/requesthandler/fileserverutil.h" #include "libmythtv/remoteencoder.h" diff --git a/mythtv/programs/mythbackend/mainserver.h b/mythtv/programs/mythbackend/mainserver.h index 0776ee8d40b..221d63935f5 100644 --- a/mythtv/programs/mythbackend/mainserver.h +++ b/mythtv/programs/mythbackend/mainserver.h @@ -35,6 +35,7 @@ #endif class QUrl; +class MythEvent; class MythServer; class QTimer; class MetadataFactory; diff --git a/mythtv/programs/mythbackend/mythbackend.cpp b/mythtv/programs/mythbackend/mythbackend.cpp index 1e0fd416560..3777d5f7461 100644 --- a/mythtv/programs/mythbackend/mythbackend.cpp +++ b/mythtv/programs/mythbackend/mythbackend.cpp @@ -37,7 +37,6 @@ #include "libmythbase/mythtranslation.h" #include "libmythbase/mythversion.h" #include "libmythbase/programinfo.h" -#include "libmythbase/remoteutil.h" #include "libmythbase/storagegroup.h" #include "libmythtv/dbcheck.h" #include "libmythtv/jobqueue.h" diff --git a/mythtv/programs/mythbackend/mythbackend_main_helpers.cpp b/mythtv/programs/mythbackend/mythbackend_main_helpers.cpp index a481db77f0f..7a4747c1a0a 100644 --- a/mythtv/programs/mythbackend/mythbackend_main_helpers.cpp +++ b/mythtv/programs/mythbackend/mythbackend_main_helpers.cpp @@ -35,7 +35,6 @@ static inline void be_sd_notify(const char */*str*/) {}; #include "libmythbase/mythtranslation.h" #include "libmythbase/mythversion.h" #include "libmythbase/programinfo.h" -#include "libmythbase/remoteutil.h" #include "libmythbase/storagegroup.h" #include "libmythtv/dbcheck.h" #include "libmythtv/eitcache.h" diff --git a/mythtv/programs/mythbackend/scheduler.cpp b/mythtv/programs/mythbackend/scheduler.cpp index 22008e12548..179a60bfff4 100644 --- a/mythtv/programs/mythbackend/scheduler.cpp +++ b/mythtv/programs/mythbackend/scheduler.cpp @@ -36,7 +36,6 @@ #include "libmythbase/mythmiscutil.h" #include "libmythbase/mythsorthelper.h" #include "libmythbase/mythsystemlegacy.h" -#include "libmythbase/remoteutil.h" #include "libmythbase/storagegroup.h" #include "libmythtv/cardutil.h" #include "libmythtv/jobqueue.h" diff --git a/mythtv/programs/mythbackend/scheduler.h b/mythtv/programs/mythbackend/scheduler.h index d4dc439212e..f5516db4350 100644 --- a/mythtv/programs/mythbackend/scheduler.h +++ b/mythtv/programs/mythbackend/scheduler.h @@ -18,7 +18,6 @@ #include "libmythbase/mthread.h" #include "libmythbase/mythdeque.h" #include "libmythbase/mythscheduler.h" -#include "libmythbase/remoteutil.h" #include "libmythtv/recordinginfo.h" #include "libmythtv/scheduledrecording.h" diff --git a/mythtv/programs/mythcommflag/mythcommflag.cpp b/mythtv/programs/mythcommflag/mythcommflag.cpp index 43f49d012d2..fcf6c0b74d5 100644 --- a/mythtv/programs/mythcommflag/mythcommflag.cpp +++ b/mythtv/programs/mythcommflag/mythcommflag.cpp @@ -36,7 +36,6 @@ #include "libmythbase/mythversion.h" #include "libmythbase/programinfo.h" #include "libmythbase/remotefile.h" -#include "libmythbase/remoteutil.h" #include "libmythtv/io/mythmediabuffer.h" #include "libmythtv/jobqueue.h" #include "libmythtv/mythcommflagplayer.h" diff --git a/mythtv/programs/mythfilldatabase/mythfilldatabase.cpp b/mythtv/programs/mythfilldatabase/mythfilldatabase.cpp index db95e43b253..6460756181d 100644 --- a/mythtv/programs/mythfilldatabase/mythfilldatabase.cpp +++ b/mythtv/programs/mythfilldatabase/mythfilldatabase.cpp @@ -21,7 +21,6 @@ #include "libmythbase/mythmiscutil.h" #include "libmythbase/mythtranslation.h" #include "libmythbase/mythversion.h" -#include "libmythbase/remoteutil.h" #include "libmythtv/dbcheck.h" #include "libmythtv/mythsystemevent.h" #include "libmythtv/scheduledrecording.h" diff --git a/mythtv/programs/mythfrontend/editvideometadata.cpp b/mythtv/programs/mythfrontend/editvideometadata.cpp index 5e76609e68b..ef2af6c1265 100644 --- a/mythtv/programs/mythfrontend/editvideometadata.cpp +++ b/mythtv/programs/mythfrontend/editvideometadata.cpp @@ -9,7 +9,6 @@ #include "libmythbase/mythcorecontext.h" #include "libmythbase/mythdirs.h" #include "libmythbase/mythlogging.h" -#include "libmythbase/remoteutil.h" #include "libmythbase/storagegroup.h" #include "libmythbase/stringutil.h" #include "libmythmetadata/dbaccess.h" diff --git a/mythtv/programs/mythfrontend/guidegrid.cpp b/mythtv/programs/mythfrontend/guidegrid.cpp index 1a1ee7572d5..7d640faafe0 100644 --- a/mythtv/programs/mythfrontend/guidegrid.cpp +++ b/mythtv/programs/mythfrontend/guidegrid.cpp @@ -19,7 +19,6 @@ #include "libmythbase/programinfo.h" #include "libmythbase/programtypes.h" // for RecStatus, etc #include "libmythbase/recordingtypes.h" // for toString, etc -#include "libmythbase/remoteutil.h" #include "libmythtv/cardutil.h" #include "libmythtv/channelinfo.h" #include "libmythtv/channelutil.h" diff --git a/mythtv/programs/mythfrontend/networkcontrol.cpp b/mythtv/programs/mythfrontend/networkcontrol.cpp index c62f0ac0b49..873f6172a38 100644 --- a/mythtv/programs/mythfrontend/networkcontrol.cpp +++ b/mythtv/programs/mythfrontend/networkcontrol.cpp @@ -24,7 +24,6 @@ #include "libmythbase/mythmiscutil.h" #include "libmythbase/mythversion.h" #include "libmythbase/programinfo.h" -#include "libmythbase/remoteutil.h" #include "libmythtv/mythsystemevent.h" #include "libmythtv/previewgenerator.h" #include "libmythui/mythmainwindow.h" diff --git a/mythtv/programs/mythfrontend/playbackboxhelper.cpp b/mythtv/programs/mythfrontend/playbackboxhelper.cpp index 2f1aaf33ba8..e2f9d926cd7 100644 --- a/mythtv/programs/mythfrontend/playbackboxhelper.cpp +++ b/mythtv/programs/mythfrontend/playbackboxhelper.cpp @@ -17,7 +17,7 @@ #include "libmythbase/mythlogging.h" #include "libmythbase/mythrandom.h" #include "libmythbase/programinfo.h" -#include "libmythbase/remoteutil.h" +#include "libmythbase/programinforemoteutil.h" #include "libmythbase/storagegroup.h" #include "libmythtv/metadataimagehelper.h" #include "libmythtv/previewgeneratorqueue.h" diff --git a/mythtv/programs/mythfrontend/programinfocache.cpp b/mythtv/programs/mythfrontend/programinfocache.cpp index ebecf0d0e78..6c653d231f2 100644 --- a/mythtv/programs/mythfrontend/programinfocache.cpp +++ b/mythtv/programs/mythfrontend/programinfocache.cpp @@ -18,7 +18,7 @@ #include "libmythbase/mythevent.h" #include "libmythbase/mythlogging.h" #include "libmythbase/programinfo.h" -#include "libmythbase/remoteutil.h" +#include "libmythbase/programinforemoteutil.h" // MythFrontend #include "programinfocache.h" diff --git a/mythtv/programs/mythfrontend/programrecpriority.cpp b/mythtv/programs/mythfrontend/programrecpriority.cpp index c946f668a0a..594f0c158b8 100644 --- a/mythtv/programs/mythfrontend/programrecpriority.cpp +++ b/mythtv/programs/mythfrontend/programrecpriority.cpp @@ -8,7 +8,7 @@ #include "libmythbase/mythdb.h" #include "libmythbase/mythcorecontext.h" #include "libmythbase/mythlogging.h" -#include "libmythbase/remoteutil.h" +#include "libmythbase/programinforemoteutil.h" #include "libmythbase/stringutil.h" #include "libmythbase/ternarycompare.h" #include "libmythtv/recordingrule.h" diff --git a/mythtv/programs/mythfrontend/schedulecommon.cpp b/mythtv/programs/mythfrontend/schedulecommon.cpp index 4f9b274c891..24ba9eb9891 100644 --- a/mythtv/programs/mythfrontend/schedulecommon.cpp +++ b/mythtv/programs/mythfrontend/schedulecommon.cpp @@ -5,7 +5,7 @@ #include "libmythbase/mythcorecontext.h" #include "libmythbase/mythlogging.h" #include "libmythbase/programinfo.h" -#include "libmythbase/remoteutil.h" +#include "libmythbase/programinforemoteutil.h" #include "libmythtv/channelutil.h" #include "libmythtv/recordinginfo.h" #include "libmythtv/tvremoteutil.h" diff --git a/mythtv/programs/mythfrontend/statusbox.cpp b/mythtv/programs/mythfrontend/statusbox.cpp index dcc2f492769..955751f71e2 100644 --- a/mythtv/programs/mythfrontend/statusbox.cpp +++ b/mythtv/programs/mythfrontend/statusbox.cpp @@ -11,7 +11,7 @@ #include "libmythbase/mythlogging.h" #include "libmythbase/mythmiscutil.h" #include "libmythbase/mythversion.h" -#include "libmythbase/remoteutil.h" +#include "libmythbase/programinforemoteutil.h" #include "libmythbase/stringutil.h" #include "libmythtv/cardutil.h" #include "libmythtv/decoders/mythcodeccontext.h" diff --git a/mythtv/programs/mythfrontend/videoplayercommand.cpp b/mythtv/programs/mythfrontend/videoplayercommand.cpp index a3c4d43abaa..5ebecc3760f 100644 --- a/mythtv/programs/mythfrontend/videoplayercommand.cpp +++ b/mythtv/programs/mythfrontend/videoplayercommand.cpp @@ -6,7 +6,6 @@ #include "libmythbase/mythcorecontext.h" #include "libmythbase/mythmiscutil.h" #include "libmythbase/mythsystemlegacy.h" -#include "libmythbase/remoteutil.h" #include "libmythbase/storagegroup.h" #include "libmythmetadata/dbaccess.h" #include "libmythmetadata/videometadata.h" diff --git a/mythtv/programs/mythfrontend/viewscheduled.cpp b/mythtv/programs/mythfrontend/viewscheduled.cpp index f9509d65905..4e400ccc336 100644 --- a/mythtv/programs/mythfrontend/viewscheduled.cpp +++ b/mythtv/programs/mythfrontend/viewscheduled.cpp @@ -9,7 +9,6 @@ #include "libmythbase/mythlogging.h" #include "libmythbase/programtypes.h" // for RecStatus, etc #include "libmythbase/recordingtypes.h" // for toString -#include "libmythbase/remoteutil.h" #include "libmythtv/recordinginfo.h" #include "libmythtv/recordingrule.h" #include "libmythtv/tv_actions.h" // for ACTION_CHANNELSEARCH diff --git a/mythtv/programs/mythfrontend/viewschedulediff.cpp b/mythtv/programs/mythfrontend/viewschedulediff.cpp index 01ae407701d..ab1bd62b34d 100644 --- a/mythtv/programs/mythfrontend/viewschedulediff.cpp +++ b/mythtv/programs/mythfrontend/viewschedulediff.cpp @@ -1,7 +1,6 @@ // MythTV #include "libmythbase/mythcorecontext.h" #include "libmythbase/mythlogging.h" -#include "libmythbase/remoteutil.h" #include "libmythtv/channelutil.h" #include "libmythtv/recordinginfo.h" #include "libmythtv/scheduledrecording.h" diff --git a/mythtv/programs/mythmetadatalookup/lookup.cpp b/mythtv/programs/mythmetadatalookup/lookup.cpp index 1c2f996c8a6..3ad9156b86e 100644 --- a/mythtv/programs/mythmetadatalookup/lookup.cpp +++ b/mythtv/programs/mythmetadatalookup/lookup.cpp @@ -8,7 +8,7 @@ #include "libmythbase/mythcorecontext.h" #include "libmythbase/mythlogging.h" #include "libmythbase/programinfo.h" -#include "libmythbase/remoteutil.h" +#include "libmythbase/programinforemoteutil.h" #include "libmythtv/jobqueue.h" #include "libmythtv/metadataimagehelper.h" #include "libmythtv/recordingrule.h" diff --git a/mythtv/programs/mythshutdown/mythshutdown.cpp b/mythtv/programs/mythshutdown/mythshutdown.cpp index 586bcf72632..c58e679a476 100644 --- a/mythtv/programs/mythshutdown/mythshutdown.cpp +++ b/mythtv/programs/mythshutdown/mythshutdown.cpp @@ -22,7 +22,6 @@ #include "libmythbase/mythsystemlegacy.h" #include "libmythbase/mythversion.h" #include "libmythbase/programinfo.h" -#include "libmythbase/remoteutil.h" #include "libmythtv/jobqueue.h" #include "libmythtv/tv.h" #include "libmythtv/tvremoteutil.h" diff --git a/mythtv/programs/mythtv-setup/exitprompt.cpp b/mythtv/programs/mythtv-setup/exitprompt.cpp index 0bc0f9df42e..5392db86f3c 100644 --- a/mythtv/programs/mythtv-setup/exitprompt.cpp +++ b/mythtv/programs/mythtv-setup/exitprompt.cpp @@ -6,7 +6,6 @@ #include "libmythbase/mythcorecontext.h" #include "libmythbase/mythlogging.h" #include "libmythbase/mythsystemlegacy.h" -#include "libmythbase/remoteutil.h" #include "libmythui/mythdialogbox.h" #include "libmythui/mythmainwindow.h" #include "libmythui/mythscreenstack.h" diff --git a/mythtv/programs/mythtv-setup/mythtv-setup.cpp b/mythtv/programs/mythtv-setup/mythtv-setup.cpp index 98f8edda591..55d6c3a2f8a 100644 --- a/mythtv/programs/mythtv-setup/mythtv-setup.cpp +++ b/mythtv/programs/mythtv-setup/mythtv-setup.cpp @@ -27,7 +27,6 @@ #include "libmythbase/mythmiscutil.h" #include "libmythbase/mythtranslation.h" #include "libmythbase/mythversion.h" -#include "libmythbase/remoteutil.h" #include "libmythtv/cardutil.h" #include "libmythtv/channelscan/channelimporter.h" #include "libmythtv/channelscan/channelscanner_cli.h" diff --git a/mythtv/programs/mythutil/backendutils.cpp b/mythtv/programs/mythutil/backendutils.cpp index f3538e95d5e..5598bcca9ad 100644 --- a/mythtv/programs/mythutil/backendutils.cpp +++ b/mythtv/programs/mythutil/backendutils.cpp @@ -8,7 +8,6 @@ using std::endl; #include "libmythbase/exitcodes.h" #include "libmythbase/mythcorecontext.h" #include "libmythbase/mythlogging.h" -#include "libmythbase/remoteutil.h" #include "libmythmetadata/videometadata.h" #include "libmythtv/scheduledrecording.h" diff --git a/mythtv/programs/mythutil/recordingutils.cpp b/mythtv/programs/mythutil/recordingutils.cpp index 4da66f324b8..3ecdb83d225 100644 --- a/mythtv/programs/mythutil/recordingutils.cpp +++ b/mythtv/programs/mythutil/recordingutils.cpp @@ -12,8 +12,8 @@ #include "libmythbase/exitcodes.h" #include "libmythbase/mythdirs.h" #include "libmythbase/mythsystem.h" +#include "libmythbase/programinforemoteutil.h" #include "libmythbase/remotefile.h" -#include "libmythbase/remoteutil.h" #include "libmythbase/stringutil.h" // Local includes diff --git a/mythtv/programs/mythwelcome/welcomedialog.cpp b/mythtv/programs/mythwelcome/welcomedialog.cpp index b67f7bb3955..5bae3d7860d 100644 --- a/mythtv/programs/mythwelcome/welcomedialog.cpp +++ b/mythtv/programs/mythwelcome/welcomedialog.cpp @@ -19,7 +19,6 @@ #include "libmythbase/mythdirs.h" #include "libmythbase/mythlogging.h" #include "libmythbase/mythsystemlegacy.h" -#include "libmythbase/remoteutil.h" #include "libmythtv/tv.h" // mythwelcome From 58700dbb118297479b72b77ce69a0df800e035f0 Mon Sep 17 00:00:00 2001 From: Scott Theisen Date: Thu, 3 Jul 2025 21:15:28 -0400 Subject: [PATCH 08/13] move RemoteCheckFile() to programinfo.* which is its only user. This also was the only function in programinforemoteutil.h that was used by programinfo.cpp. --- mythtv/libs/libmythbase/programinfo.cpp | 20 ++++++++++++++++++- mythtv/libs/libmythbase/programinfo.h | 2 ++ .../libmythbase/programinforemoteutil.cpp | 20 ------------------- .../libs/libmythbase/programinforemoteutil.h | 2 -- 4 files changed, 21 insertions(+), 23 deletions(-) diff --git a/mythtv/libs/libmythbase/programinfo.cpp b/mythtv/libs/libmythbase/programinfo.cpp index cbc2172e51f..bee858c6a2d 100644 --- a/mythtv/libs/libmythbase/programinfo.cpp +++ b/mythtv/libs/libmythbase/programinfo.cpp @@ -28,7 +28,6 @@ #include "libmythbase/stringutil.h" #include "programinfo.h" -#include "programinforemoteutil.h" #include "programinfoupdater.h" #define LOC QString("ProgramInfo(%1): ").arg(GetBasename()) @@ -6679,5 +6678,24 @@ QString ProgGroupBy::toString(ProgGroupBy::Type groupBy) } } +bool RemoteCheckFile(ProgramInfo *pginfo, bool checkSlaves) +{ + QStringList strlist("QUERY_CHECKFILE"); + strlist << QString::number((int)checkSlaves); + pginfo->ToStringList(strlist); + + if (!gCoreContext->SendReceiveStringList(strlist) || + (strlist.size() < 2) || !strlist[0].toInt()) + return false; + + // Only modify the pathname if the recording file is available locally on + // this host + QString localpath = strlist[1]; + QFile checkFile(localpath); + if (checkFile.exists()) + pginfo->SetPathname(localpath); + + return true; +} /* vim: set expandtab tabstop=4 shiftwidth=4: */ diff --git a/mythtv/libs/libmythbase/programinfo.h b/mythtv/libs/libmythbase/programinfo.h index 1b18c1e4eff..72ff669a45e 100644 --- a/mythtv/libs/libmythbase/programinfo.h +++ b/mythtv/libs/libmythbase/programinfo.h @@ -1001,6 +1001,8 @@ MBASE_PUBLIC ProgramInfo::CategoryType string_to_myth_category_type(const QStrin Q_DECLARE_METATYPE(ProgramInfo*) Q_DECLARE_METATYPE(ProgramInfo::CategoryType) +MBASE_PUBLIC bool RemoteCheckFile(ProgramInfo *pginfo, bool checkSlaves = true); + #endif // MYTHPROGRAM_H_ /* vim: set expandtab tabstop=4 shiftwidth=4: */ diff --git a/mythtv/libs/libmythbase/programinforemoteutil.cpp b/mythtv/libs/libmythbase/programinforemoteutil.cpp index 1451ffdbe07..ee551bf3208 100644 --- a/mythtv/libs/libmythbase/programinforemoteutil.cpp +++ b/mythtv/libs/libmythbase/programinforemoteutil.cpp @@ -34,26 +34,6 @@ std::vector *RemoteGetRecordedList(int sort) return info; } -bool RemoteCheckFile(ProgramInfo *pginfo, bool checkSlaves) -{ - QStringList strlist("QUERY_CHECKFILE"); - strlist << QString::number((int)checkSlaves); - pginfo->ToStringList(strlist); - - if (!gCoreContext->SendReceiveStringList(strlist) || - (strlist.size() < 2) || !strlist[0].toInt()) - return false; - - // Only modify the pathname if the recording file is available locally on - // this host - QString localpath = strlist[1]; - QFile checkFile(localpath); - if (checkFile.exists()) - pginfo->SetPathname(localpath); - - return true; -} - bool RemoteDeleteRecording(uint recordingID, bool forceMetadataDelete, bool forgetHistory) { diff --git a/mythtv/libs/libmythbase/programinforemoteutil.h b/mythtv/libs/libmythbase/programinforemoteutil.h index f257efb58e4..d8da434990e 100644 --- a/mythtv/libs/libmythbase/programinforemoteutil.h +++ b/mythtv/libs/libmythbase/programinforemoteutil.h @@ -12,8 +12,6 @@ class ProgramInfo; MBASE_PUBLIC std::vector *RemoteGetRecordedList(int sort); -MBASE_PUBLIC bool RemoteCheckFile( - ProgramInfo *pginfo, bool checkSlaves = true); MBASE_PUBLIC bool RemoteDeleteRecording( uint recordingID, bool forceMetadataDelete, bool forgetHistory); MBASE_PUBLIC From 0d29628a1e34bc47021ca973333259b6935c9137 Mon Sep 17 00:00:00 2001 From: Scott Theisen Date: Thu, 3 Jul 2025 22:12:16 -0400 Subject: [PATCH 09/13] programinforemoteutil: remove unused RemoteGetRecordingStatus() Also remove RemoteCheckForRecording(), which was only used by RemoteGetRecordingStatus(). --- .../libmythbase/programinforemoteutil.cpp | 51 ------------------- .../libs/libmythbase/programinforemoteutil.h | 3 -- 2 files changed, 54 deletions(-) diff --git a/mythtv/libs/libmythbase/programinforemoteutil.cpp b/mythtv/libs/libmythbase/programinforemoteutil.cpp index ee551bf3208..fbe0bc495a3 100644 --- a/mythtv/libs/libmythbase/programinforemoteutil.cpp +++ b/mythtv/libs/libmythbase/programinforemoteutil.cpp @@ -299,57 +299,6 @@ bool RemoteFillProgramInfo(ProgramInfo &pginfo, const QString &playbackhost) return false; } -/** - * Get recorder for a programme. - * - * \return recordernum if pginfo recording in progress, else 0 - */ -int RemoteCheckForRecording(const ProgramInfo *pginfo) -{ - QStringList strlist( QString("CHECK_RECORDING") ); - pginfo->ToStringList(strlist); - - if (gCoreContext->SendReceiveStringList(strlist) && !strlist.isEmpty()) - return strlist[0].toInt(); - - return 0; -} - -/** - * Get status of an individual programme (with pre-post roll?). - * - * \retval 0 Not Recording - * \retval 1 Recording - * \retval 2 Under-Record - * \retval 3 Over-Record - */ -int RemoteGetRecordingStatus( - const ProgramInfo *pginfo, int overrecsecs, int underrecsecs) -{ - QDateTime curtime = MythDate::current(); - - int retval = 0; - - if (pginfo) - { - if (curtime >= pginfo->GetScheduledStartTime().addSecs(-underrecsecs) && - curtime < pginfo->GetScheduledEndTime().addSecs(overrecsecs)) - { - if (curtime >= pginfo->GetScheduledStartTime() && - curtime < pginfo->GetScheduledEndTime()) - retval = 1; - else if (curtime < pginfo->GetScheduledStartTime() && - RemoteCheckForRecording(pginfo) > 0) - retval = 2; - else if (curtime > pginfo->GetScheduledEndTime() && - RemoteCheckForRecording(pginfo) > 0) - retval = 3; - } - } - - return retval; -} - /** * \brief return list of currently recording shows */ diff --git a/mythtv/libs/libmythbase/programinforemoteutil.h b/mythtv/libs/libmythbase/programinforemoteutil.h index d8da434990e..8adae0868eb 100644 --- a/mythtv/libs/libmythbase/programinforemoteutil.h +++ b/mythtv/libs/libmythbase/programinforemoteutil.h @@ -29,9 +29,6 @@ MBASE_PUBLIC QDateTime RemoteGetPreviewIfModified( MBASE_PUBLIC bool RemoteFillProgramInfo( ProgramInfo &pginfo, const QString &playbackhostname); -MBASE_PUBLIC int RemoteCheckForRecording(const ProgramInfo *pginfo); -MBASE_PUBLIC int RemoteGetRecordingStatus(const ProgramInfo *pginfo, int overrecsecs, - int underrecsecs); MBASE_PUBLIC std::vector *RemoteGetCurrentlyRecordingList(void); #endif // PROGRAMINFO_REMOTEUTIL_H From a6d186fbab1f996a1d75f586d078b77f446957a0 Mon Sep 17 00:00:00 2001 From: Scott Theisen Date: Fri, 4 Jul 2025 16:42:38 -0400 Subject: [PATCH 10/13] move program* and recording* from libmythbase to libmythtv since that is where related files and most of their uses are. --- .../mytharchive/mytharchive/archiveutil.cpp | 2 +- .../mytharchive/mytharchive/exportnative.cpp | 1 - .../mytharchive/mytharchive/mythburn.h | 1 + .../mytharchive/recordingselector.cpp | 4 +- .../mytharchive/mytharchive/thumbfinder.cpp | 2 +- .../mytharchive/mytharchive/thumbfinder.h | 2 +- .../mytharchivehelper/mytharchivehelper.cpp | 2 +- mythtv/libs/libmythbase/CMakeLists.txt | 13 ----- mythtv/libs/libmythbase/libmythbase.pro | 19 -------- .../libs/libmythbase/programinforemoteutil.h | 36 -------------- mythtv/libs/libmythbase/test/CMakeLists.txt | 1 - .../test_programinfo/test_programinfo.pro | 24 ---------- .../libs/libmythmetadata/metadatacommon.cpp | 2 +- .../libs/libmythmetadata/metadatafactory.cpp | 2 +- .../test_videometadata/test_videometadata.h | 2 +- .../requesthandler/fileserverhandler.cpp | 2 +- .../requesthandler/fileserverutil.cpp | 2 +- .../requesthandler/fileserverutil.h | 3 +- .../sockethandler/filetransfer.cpp | 2 +- mythtv/libs/libmythtv/CMakeLists.txt | 19 +++++++- mythtv/libs/libmythtv/channelinfo.h | 1 - mythtv/libs/libmythtv/channelsettings.cpp | 2 +- mythtv/libs/libmythtv/commbreakmap.cpp | 2 +- mythtv/libs/libmythtv/commbreakmap.h | 2 +- .../libs/libmythtv/decoders/avformatdecoder.h | 5 +- .../libs/libmythtv/decoders/decoderbase.cpp | 2 +- mythtv/libs/libmythtv/decoders/decoderbase.h | 2 +- mythtv/libs/libmythtv/deletemap.cpp | 2 +- mythtv/libs/libmythtv/deletemap.h | 2 +- mythtv/libs/libmythtv/dummydecoder.h | 3 +- mythtv/libs/libmythtv/eitfixup.cpp | 2 +- mythtv/libs/libmythtv/eithelper.cpp | 2 +- mythtv/libs/libmythtv/jobqueue.cpp | 2 +- mythtv/libs/libmythtv/libmythtv.pro | 19 ++++++++ mythtv/libs/libmythtv/livetvchain.cpp | 2 +- .../libs/libmythtv/mpeg/dishdescriptors.cpp | 1 - mythtv/libs/libmythtv/mpeg/dvbdescriptors.cpp | 2 +- mythtv/libs/libmythtv/mpeg/dvbdescriptors.h | 2 +- mythtv/libs/libmythtv/mythplayer.cpp | 2 +- mythtv/libs/libmythtv/mythplayer.h | 2 +- mythtv/libs/libmythtv/mythsystemevent.cpp | 2 +- mythtv/libs/libmythtv/mythsystemevent.h | 2 +- mythtv/libs/libmythtv/osd.h | 2 +- mythtv/libs/libmythtv/playgroup.cpp | 3 +- mythtv/libs/libmythtv/previewgenerator.h | 2 +- .../libs/libmythtv/previewgeneratorqueue.cpp | 2 +- mythtv/libs/libmythtv/programdata.h | 2 +- .../programinfo.cpp | 2 +- .../{libmythbase => libmythtv}/programinfo.h | 36 +++++++------- .../programinforemoteutil.cpp | 0 mythtv/libs/libmythtv/programinforemoteutil.h | 35 ++++++++++++++ .../programinfoupdater.cpp | 0 .../programinfoupdater.h | 8 ++-- .../programtypeflags.h | 0 .../programtypes.cpp | 0 .../{libmythbase => libmythtv}/programtypes.h | 36 +++++++------- .../libs/libmythtv/recorders/dtvrecorder.cpp | 2 +- .../libs/libmythtv/recorders/mpegrecorder.cpp | 2 +- .../libs/libmythtv/recorders/recorderbase.cpp | 2 +- .../libs/libmythtv/recorders/recorderbase.h | 3 +- mythtv/libs/libmythtv/recordingfile.h | 5 +- mythtv/libs/libmythtv/recordinginfo.cpp | 2 +- mythtv/libs/libmythtv/recordinginfo.h | 4 +- mythtv/libs/libmythtv/recordingrule.h | 6 +-- .../recordingstatus.cpp | 2 +- .../recordingstatus.h | 4 +- .../recordingtypes.cpp | 0 .../recordingtypes.h | 48 +++++++++---------- mythtv/libs/libmythtv/remoteencoder.cpp | 2 +- mythtv/libs/libmythtv/remoteencoder.h | 2 +- mythtv/libs/libmythtv/test/CMakeLists.txt | 1 + .../test/test_eitfixups/test_eitfixups.cpp | 2 +- .../test/test_programinfo/.gitignore | 0 .../test/test_programinfo/CMakeLists.txt | 4 +- .../test_programinfo/test_programinfo.cpp | 0 .../test/test_programinfo/test_programinfo.h | 4 +- .../test_programinfo/test_programinfo.pro | 46 ++++++++++++++++++ mythtv/libs/libmythtv/tv_play.cpp | 6 +-- mythtv/libs/libmythtv/tv_rec.cpp | 2 +- mythtv/libs/libmythtv/tv_rec.h | 2 +- mythtv/libs/libmythtv/tvbrowsehelper.h | 2 +- mythtv/libs/libmythtv/tvremoteutil.cpp | 2 +- mythtv/programs/mythavtest/mythavtest.cpp | 2 +- mythtv/programs/mythbackend/autoexpire.cpp | 2 +- .../mythbackend/backendhousekeeper.cpp | 6 +-- mythtv/programs/mythbackend/encoderlink.cpp | 2 +- mythtv/programs/mythbackend/encoderlink.h | 2 +- mythtv/programs/mythbackend/filetransfer.cpp | 2 +- mythtv/programs/mythbackend/httpstatus.h | 2 +- mythtv/programs/mythbackend/mainserver.cpp | 2 +- mythtv/programs/mythbackend/mythbackend.cpp | 1 - .../mythbackend/mythbackend_main_helpers.cpp | 2 +- mythtv/programs/mythbackend/playbacksock.cpp | 2 +- mythtv/programs/mythbackend/playbacksock.h | 4 +- .../mythbackend/servicesv2/v2channel.cpp | 2 +- .../mythbackend/servicesv2/v2content.cpp | 2 +- .../programs/mythbackend/servicesv2/v2dvr.cpp | 2 +- .../mythbackend/servicesv2/v2guide.cpp | 1 + .../programs/mythbackend/servicesv2/v2guide.h | 1 - .../mythbackend/servicesv2/v2recording.h | 4 +- .../mythbackend/servicesv2/v2serviceUtil.cpp | 6 +-- .../mythbackend/servicesv2/v2status.h | 2 +- .../mythbackend/servicesv2/v2video.cpp | 2 +- .../mythccextractor/mythccextractor.cpp | 2 +- .../mythcommflag/ClassicCommDetector.cpp | 2 +- .../mythcommflag/ClassicCommDetector.h | 2 +- .../programs/mythcommflag/CommDetector2.cpp | 2 +- mythtv/programs/mythcommflag/CommDetector2.h | 2 +- .../programs/mythcommflag/CommDetectorBase.h | 2 +- .../mythcommflag/CommDetectorFactory.h | 2 +- .../mythcommflag/PrePostRollFlagger.cpp | 2 +- mythtv/programs/mythcommflag/mythcommflag.cpp | 2 +- .../programs/mythfilldatabase/xmltvparser.cpp | 2 +- .../mythfrontend/channelrecpriority.h | 1 - mythtv/programs/mythfrontend/customedit.h | 2 +- mythtv/programs/mythfrontend/custompriority.h | 2 +- mythtv/programs/mythfrontend/guidegrid.cpp | 6 +-- mythtv/programs/mythfrontend/guidegrid.h | 2 +- mythtv/programs/mythfrontend/idlescreen.cpp | 2 +- mythtv/programs/mythfrontend/idlescreen.h | 2 +- .../programs/mythfrontend/manualschedule.cpp | 4 +- mythtv/programs/mythfrontend/mythfrontend.cpp | 2 +- .../programs/mythfrontend/networkcontrol.cpp | 1 - mythtv/programs/mythfrontend/playbackbox.cpp | 6 +-- .../mythfrontend/playbackboxhelper.cpp | 4 +- .../mythfrontend/playbackboxlistitem.cpp | 2 +- .../programs/mythfrontend/playbackstate.cpp | 2 +- mythtv/programs/mythfrontend/prevreclist.h | 2 +- mythtv/programs/mythfrontend/progdetails.h | 2 +- mythtv/programs/mythfrontend/progfind.cpp | 2 +- mythtv/programs/mythfrontend/progfind.h | 2 +- mythtv/programs/mythfrontend/proglist.h | 2 +- .../programs/mythfrontend/proglist_helpers.h | 2 +- .../mythfrontend/programinfocache.cpp | 4 +- .../mythfrontend/programrecpriority.cpp | 2 +- .../programs/mythfrontend/schedulecommon.cpp | 4 +- mythtv/programs/mythfrontend/schedulecommon.h | 2 +- .../programs/mythfrontend/scheduleeditor.cpp | 4 +- mythtv/programs/mythfrontend/statusbox.cpp | 2 +- mythtv/programs/mythfrontend/themechooser.cpp | 1 - .../programs/mythfrontend/viewscheduled.cpp | 4 +- mythtv/programs/mythfrontend/viewscheduled.h | 2 +- .../programs/mythfrontend/viewschedulediff.h | 2 +- mythtv/programs/mythmetadatalookup/lookup.cpp | 4 +- mythtv/programs/mythmetadatalookup/lookup.h | 2 +- .../mythpreviewgen/mythpreviewgen.cpp | 2 +- mythtv/programs/mythshutdown/mythshutdown.cpp | 2 +- mythtv/programs/mythtranscode/cutter.h | 2 +- mythtv/programs/mythtranscode/mpeg2fix.h | 2 +- .../programs/mythtranscode/mythtranscode.cpp | 2 +- mythtv/programs/mythtranscode/transcode.cpp | 2 +- mythtv/programs/mythtranscode/transcode.h | 2 +- mythtv/programs/mythutil/mythutil.h | 2 +- mythtv/programs/mythutil/recordingutils.cpp | 2 +- mythtv/programs/mythwelcome/welcomedialog.h | 2 +- 155 files changed, 341 insertions(+), 320 deletions(-) delete mode 100644 mythtv/libs/libmythbase/programinforemoteutil.h delete mode 100644 mythtv/libs/libmythbase/test/test_programinfo/test_programinfo.pro rename mythtv/libs/{libmythbase => libmythtv}/programinfo.cpp (99%) rename mythtv/libs/{libmythbase => libmythtv}/programinfo.h (97%) rename mythtv/libs/{libmythbase => libmythtv}/programinforemoteutil.cpp (100%) create mode 100644 mythtv/libs/libmythtv/programinforemoteutil.h rename mythtv/libs/{libmythbase => libmythtv}/programinfoupdater.cpp (100%) rename mythtv/libs/{libmythbase => libmythtv}/programinfoupdater.h (89%) rename mythtv/libs/{libmythbase => libmythtv}/programtypeflags.h (100%) rename mythtv/libs/{libmythbase => libmythtv}/programtypes.cpp (100%) rename mythtv/libs/{libmythbase => libmythtv}/programtypes.h (84%) rename mythtv/libs/{libmythbase => libmythtv}/recordingstatus.cpp (99%) rename mythtv/libs/{libmythbase => libmythtv}/recordingstatus.h (96%) rename mythtv/libs/{libmythbase => libmythtv}/recordingtypes.cpp (100%) rename mythtv/libs/{libmythbase => libmythtv}/recordingtypes.h (59%) rename mythtv/libs/{libmythbase => libmythtv}/test/test_programinfo/.gitignore (100%) rename mythtv/libs/{libmythbase => libmythtv}/test/test_programinfo/CMakeLists.txt (63%) rename mythtv/libs/{libmythbase => libmythtv}/test/test_programinfo/test_programinfo.cpp (100%) rename mythtv/libs/{libmythbase => libmythtv}/test/test_programinfo/test_programinfo.h (99%) create mode 100644 mythtv/libs/libmythtv/test/test_programinfo/test_programinfo.pro diff --git a/mythplugins/mytharchive/mytharchive/archiveutil.cpp b/mythplugins/mytharchive/mytharchive/archiveutil.cpp index 6a92c636af4..d9ac050750c 100644 --- a/mythplugins/mytharchive/mytharchive/archiveutil.cpp +++ b/mythplugins/mytharchive/mytharchive/archiveutil.cpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include diff --git a/mythplugins/mytharchive/mytharchive/exportnative.cpp b/mythplugins/mytharchive/mytharchive/exportnative.cpp index cae8c1cfe5d..69574a3228d 100644 --- a/mythplugins/mytharchive/mytharchive/exportnative.cpp +++ b/mythplugins/mytharchive/mytharchive/exportnative.cpp @@ -15,7 +15,6 @@ #include #include #include -#include #include #include #include diff --git a/mythplugins/mytharchive/mytharchive/mythburn.h b/mythplugins/mytharchive/mytharchive/mythburn.h index 9783ab0e804..65440611e6a 100644 --- a/mythplugins/mytharchive/mytharchive/mythburn.h +++ b/mythplugins/mytharchive/mytharchive/mythburn.h @@ -4,6 +4,7 @@ #include // mythtv +#include #include // mytharchive diff --git a/mythplugins/mytharchive/mytharchive/recordingselector.cpp b/mythplugins/mytharchive/mytharchive/recordingselector.cpp index 17e30751d5c..c1b826577f3 100644 --- a/mythplugins/mytharchive/mytharchive/recordingselector.cpp +++ b/mythplugins/mytharchive/mytharchive/recordingselector.cpp @@ -15,9 +15,9 @@ #include #include #include -#include -#include #include +#include +#include #include #include #include diff --git a/mythplugins/mytharchive/mytharchive/thumbfinder.cpp b/mythplugins/mytharchive/mytharchive/thumbfinder.cpp index 4da1fa20f7b..9420ea17a12 100644 --- a/mythplugins/mytharchive/mytharchive/thumbfinder.cpp +++ b/mythplugins/mytharchive/mytharchive/thumbfinder.cpp @@ -46,7 +46,7 @@ #include #include #include // for MythFile::copy -#include +#include #include #include #include diff --git a/mythplugins/mytharchive/mytharchive/thumbfinder.h b/mythplugins/mytharchive/mytharchive/thumbfinder.h index 6cafe991b7e..3d8701240d8 100644 --- a/mythplugins/mytharchive/mytharchive/thumbfinder.h +++ b/mythplugins/mytharchive/mytharchive/thumbfinder.h @@ -13,8 +13,8 @@ extern "C" { // mythtv #include -#include #include +#include #include // mytharchive diff --git a/mythplugins/mytharchive/mytharchivehelper/mytharchivehelper.cpp b/mythplugins/mytharchive/mytharchivehelper/mytharchivehelper.cpp index 0010ac9b897..e36df9e19dd 100644 --- a/mythplugins/mytharchive/mytharchivehelper/mytharchivehelper.cpp +++ b/mythplugins/mytharchive/mytharchivehelper/mytharchivehelper.cpp @@ -56,8 +56,8 @@ #include #include #include -#include #include +#include extern "C" { #include diff --git a/mythtv/libs/libmythbase/CMakeLists.txt b/mythtv/libs/libmythbase/CMakeLists.txt index f56db93b69e..1adb4fffa1a 100644 --- a/mythtv/libs/libmythbase/CMakeLists.txt +++ b/mythtv/libs/libmythbase/CMakeLists.txt @@ -61,12 +61,6 @@ set(LIBMYTHBASE_HEADERS mythtypes.h netgrabbermanager.h netutils.h - programinfo.h - programinforemoteutil.h - programtypes.h - programtypeflags.h - recordingstatus.h - recordingtypes.h referencecounter.h referencecounterlist.h remotefile.h @@ -93,7 +87,6 @@ set(LIBMYTHBASE_HEADERS_NOT_INSTALLED mythsystemprivate.h mythtimezone.h portchecker.h - programinfoupdater.h unzip2.h unziputil.h) @@ -225,12 +218,6 @@ add_library( netgrabbermanager.cpp netutils.cpp portchecker.cpp - programinfo.cpp - programinforemoteutil.cpp - programinfoupdater.cpp - programtypes.cpp - recordingstatus.cpp - recordingtypes.cpp referencecounter.cpp remotefile.cpp rssparse.cpp diff --git a/mythtv/libs/libmythbase/libmythbase.pro b/mythtv/libs/libmythbase/libmythbase.pro index 954a7d46f59..1f3348d25fd 100644 --- a/mythtv/libs/libmythbase/libmythbase.pro +++ b/mythtv/libs/libmythbase/libmythbase.pro @@ -43,13 +43,6 @@ HEADERS += configuration.h HEADERS += mythappname.h HEADERS += netgrabbermanager.h HEADERS += netutils.h -HEADERS += programinfo.h -HEADERS += programinforemoteutil.h -HEADERS += programinfoupdater.h -HEADERS += programtypes.h -HEADERS += programtypeflags.h -HEADERS += recordingstatus.h -HEADERS += recordingtypes.h HEADERS += rssmanager.h HEADERS += rssparse.h HEADERS += unziputil.h @@ -82,12 +75,6 @@ SOURCES += configuration.cpp SOURCES += mythversion.cpp SOURCES += netgrabbermanager.cpp SOURCES += netutils.cpp -SOURCES += programinfo.cpp -SOURCES += programinforemoteutil.cpp -SOURCES += programinfoupdater.cpp -SOURCES += programtypes.cpp -SOURCES += recordingstatus.cpp -SOURCES += recordingtypes.cpp SOURCES += rssmanager.cpp SOURCES += rssparse.cpp SOURCES += unziputil.cpp @@ -200,12 +187,6 @@ inc.files += mythsorthelper.h mythdbcheck.h inc.files += mythrandom.h inc.files += netgrabbermanager.h inc.files += netutils.h -inc.files += programinfo.h -inc.files += programinforemoteutil.h -inc.files += programtypes.h -inc.files += programtypeflags.h -inc.files += recordingstatus.h -inc.files += recordingtypes.h inc.files += rssmanager.h inc.files += rssparse.h inc.files += stringutil.h diff --git a/mythtv/libs/libmythbase/programinforemoteutil.h b/mythtv/libs/libmythbase/programinforemoteutil.h deleted file mode 100644 index 8adae0868eb..00000000000 --- a/mythtv/libs/libmythbase/programinforemoteutil.h +++ /dev/null @@ -1,36 +0,0 @@ -#ifndef PROGRAMINFO_REMOTEUTIL_H -#define PROGRAMINFO_REMOTEUTIL_H - -#include - -#include -#include -#include - -#include "mythbaseexp.h" - -class ProgramInfo; - -MBASE_PUBLIC std::vector *RemoteGetRecordedList(int sort); -MBASE_PUBLIC bool RemoteDeleteRecording( uint recordingID, bool forceMetadataDelete, - bool forgetHistory); -MBASE_PUBLIC -bool RemoteUndeleteRecording(uint recordingID); -MBASE_PUBLIC -void RemoteGetAllScheduledRecordings(std::vector &scheduledlist); -MBASE_PUBLIC -void RemoteGetAllExpiringRecordings(std::vector &expiringlist); -MBASE_PUBLIC uint RemoteGetRecordingList(std::vector &reclist, - QStringList &strList); -MBASE_PUBLIC std::vector *RemoteGetConflictList(const ProgramInfo *pginfo); -MBASE_PUBLIC QDateTime RemoteGetPreviewLastModified(const ProgramInfo *pginfo); -MBASE_PUBLIC QDateTime RemoteGetPreviewIfModified( - const ProgramInfo &pginfo, const QString &cachefile); -MBASE_PUBLIC bool RemoteFillProgramInfo( - ProgramInfo &pginfo, const QString &playbackhostname); - -MBASE_PUBLIC std::vector *RemoteGetCurrentlyRecordingList(void); - -#endif // PROGRAMINFO_REMOTEUTIL_H - -/* vim: set expandtab tabstop=4 shiftwidth=4: */ diff --git a/mythtv/libs/libmythbase/test/CMakeLists.txt b/mythtv/libs/libmythbase/test/CMakeLists.txt index 98150829212..38285d0e5a2 100644 --- a/mythtv/libs/libmythbase/test/CMakeLists.txt +++ b/mythtv/libs/libmythbase/test/CMakeLists.txt @@ -19,7 +19,6 @@ add_subdirectory(test_mythsorthelper) add_subdirectory(test_mythsystem) add_subdirectory(test_mythsystemlegacy) add_subdirectory(test_mythtimer) -add_subdirectory(test_programinfo) add_subdirectory(test_rssparse) add_subdirectory(test_template) add_subdirectory(test_theme_version) diff --git a/mythtv/libs/libmythbase/test/test_programinfo/test_programinfo.pro b/mythtv/libs/libmythbase/test/test_programinfo/test_programinfo.pro deleted file mode 100644 index 232faa9ed61..00000000000 --- a/mythtv/libs/libmythbase/test/test_programinfo/test_programinfo.pro +++ /dev/null @@ -1,24 +0,0 @@ -include ( ../../../../settings.pro ) -include ( ../../../../test.pro ) - -QT += xml sql network testlib -using_opengl: QT += opengl - -TEMPLATE = app -TARGET = test_programinfo -INCLUDEPATH += ../../.. -LIBS += -L../../../libmythbase -lmythbase-$$LIBVERSION - -QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythbase - -# Input -HEADERS += test_programinfo.h -SOURCES += test_programinfo.cpp - -QMAKE_CLEAN += $(TARGET) $(TARGETA) $(TARGETD) $(TARGET0) $(TARGET1) $(TARGET2) -QMAKE_CLEAN += ; ( cd $(OBJECTS_DIR) && rm -f *.gcov *.gcda *.gcno ) - -LIBS += $$EXTRA_LIBS $$LATE_LIBS - -# Fix runtime linking on Ubuntu 17.10. -linux:QMAKE_LFLAGS += -Wl,--disable-new-dtags diff --git a/mythtv/libs/libmythmetadata/metadatacommon.cpp b/mythtv/libs/libmythmetadata/metadatacommon.cpp index b152453c9bc..f46a7dc78e6 100644 --- a/mythtv/libs/libmythmetadata/metadatacommon.cpp +++ b/mythtv/libs/libmythmetadata/metadatacommon.cpp @@ -11,8 +11,8 @@ #include "libmythbase/mythlocale.h" #include "libmythbase/mythlogging.h" #include "libmythbase/mythmiscutil.h" -#include "libmythbase/programinfo.h" #include "libmythbase/rssparse.h" +#include "libmythtv/programinfo.h" #include "metadatacommon.h" diff --git a/mythtv/libs/libmythmetadata/metadatafactory.cpp b/mythtv/libs/libmythmetadata/metadatafactory.cpp index e262669d2f7..e243eefe49f 100644 --- a/mythtv/libs/libmythmetadata/metadatafactory.cpp +++ b/mythtv/libs/libmythmetadata/metadatafactory.cpp @@ -14,8 +14,8 @@ #include "libmythbase/compat.h" #include "libmythbase/mythcorecontext.h" #include "libmythbase/mythlogging.h" -#include "libmythbase/programinfo.h" #include "libmythbase/storagegroup.h" +#include "libmythtv/programinfo.h" #include "libmythtv/recordingrule.h" // libmythmetadata diff --git a/mythtv/libs/libmythmetadata/test/test_videometadata/test_videometadata.h b/mythtv/libs/libmythmetadata/test/test_videometadata/test_videometadata.h index 3f510fc96ea..7e0cd77d81f 100644 --- a/mythtv/libs/libmythmetadata/test/test_videometadata/test_videometadata.h +++ b/mythtv/libs/libmythmetadata/test/test_videometadata/test_videometadata.h @@ -20,9 +20,9 @@ #include -#include "libmythbase/programinfo.h" #include "libmythmetadata/metadatafactory.h" #include "libmythmetadata/videometadata.h" +#include "libmythtv/programinfo.h" #include "libmythtv/recordinginfo.h" class Testvideometadata: public QObject diff --git a/mythtv/libs/libmythprotoserver/requesthandler/fileserverhandler.cpp b/mythtv/libs/libmythprotoserver/requesthandler/fileserverhandler.cpp index c1e05b7dd49..200a733d302 100644 --- a/mythtv/libs/libmythprotoserver/requesthandler/fileserverhandler.cpp +++ b/mythtv/libs/libmythprotoserver/requesthandler/fileserverhandler.cpp @@ -14,9 +14,9 @@ #include "libmythbase/mythlogging.h" #include "libmythbase/mythmiscutil.h" #include "libmythbase/mythsocket.h" -#include "libmythbase/programinfo.h" #include "libmythbase/storagegroup.h" #include "libmythtv/io/mythmediabuffer.h" +#include "libmythtv/programinfo.h" #include "libmythtv/recordinginfo.h" #include "sockethandler/filetransfer.h" diff --git a/mythtv/libs/libmythprotoserver/requesthandler/fileserverutil.cpp b/mythtv/libs/libmythprotoserver/requesthandler/fileserverutil.cpp index 5f99fa28a7b..4cc427999ec 100644 --- a/mythtv/libs/libmythprotoserver/requesthandler/fileserverutil.cpp +++ b/mythtv/libs/libmythprotoserver/requesthandler/fileserverutil.cpp @@ -13,7 +13,7 @@ #include #include -#include "libmythbase/programinfo.h" +#include "libmythtv/programinfo.h" #include "requesthandler/fileserverutil.h" diff --git a/mythtv/libs/libmythprotoserver/requesthandler/fileserverutil.h b/mythtv/libs/libmythprotoserver/requesthandler/fileserverutil.h index 5fb8b24d226..af96e1c1e5c 100644 --- a/mythtv/libs/libmythprotoserver/requesthandler/fileserverutil.h +++ b/mythtv/libs/libmythprotoserver/requesthandler/fileserverutil.h @@ -8,8 +8,9 @@ #include #include -#include "libmythbase/programinfo.h" #include "libmythbase/referencecounter.h" +#include "libmythtv/programinfo.h" + #include "libmythprotoserver/mythprotoserverexp.h" class DeleteThread; diff --git a/mythtv/libs/libmythprotoserver/sockethandler/filetransfer.cpp b/mythtv/libs/libmythprotoserver/sockethandler/filetransfer.cpp index 61b46e5189c..42625682f76 100644 --- a/mythtv/libs/libmythprotoserver/sockethandler/filetransfer.cpp +++ b/mythtv/libs/libmythprotoserver/sockethandler/filetransfer.cpp @@ -4,8 +4,8 @@ #include "libmythbase/mythlogging.h" #include "libmythbase/mythsocket.h" -#include "libmythbase/programinfo.h" #include "libmythtv/io/mythmediabuffer.h" +#include "libmythtv/programinfo.h" #include "filetransfer.h" diff --git a/mythtv/libs/libmythtv/CMakeLists.txt b/mythtv/libs/libmythtv/CMakeLists.txt index 541301f3e11..f391fd9914c 100644 --- a/mythtv/libs/libmythtv/CMakeLists.txt +++ b/mythtv/libs/libmythtv/CMakeLists.txt @@ -33,6 +33,15 @@ set(AUDIO_HEADERS_NOT_INSTALLED # Define the library # +set(LIBMYTHTV_HEADERS + programinfo.h + programinforemoteutil.h + programtypes.h + programtypeflags.h + recordingstatus.h + recordingtypes.h + ) + add_library( mythtv # cmake-format: unsort ${AUDIO_HEADERS_NOT_INSTALLED} @@ -50,6 +59,7 @@ add_library( audio/pink.cpp audio/spdifencoder.cpp audio/volumebase.cpp + ${LIBMYTHTV_HEADERS} bitreader.h bytereader.cpp bytereader.h @@ -118,6 +128,11 @@ add_library( previewgenerator.h previewgeneratorqueue.cpp previewgeneratorqueue.h + programinfo.cpp + programinforemoteutil.cpp + programinfoupdater.cpp + programinfoupdater.h + programtypes.cpp recordingfile.cpp recordingfile.h recordinginfo.cpp @@ -126,6 +141,8 @@ add_library( recordingprofile.h recordingrule.cpp recordingrule.h + recordingstatus.cpp + recordingtypes.cpp remoteencoder.cpp remoteencoder.h restoredata.cpp @@ -451,7 +468,7 @@ set(HEADERS_TO_INSTALL2 install(TARGETS mythtv LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) -install(FILES ${HEADERS_TO_INSTALL1} +install(FILES ${HEADERS_TO_INSTALL1} ${LIBMYTHTV_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mythtv/libmythtv) install( diff --git a/mythtv/libs/libmythtv/channelinfo.h b/mythtv/libs/libmythtv/channelinfo.h index 1383dce61bb..846a8ca0fd9 100644 --- a/mythtv/libs/libmythtv/channelinfo.h +++ b/mythtv/libs/libmythtv/channelinfo.h @@ -14,7 +14,6 @@ // MythTV headers #include "libmythbase/mythtypes.h" -#include "libmythbase/programtypes.h" #include "libmythtv/mythtvexp.h" enum ChannelVisibleType : std::int8_t diff --git a/mythtv/libs/libmythtv/channelsettings.cpp b/mythtv/libs/libmythtv/channelsettings.cpp index 5eccfad4fe4..8e8d0455804 100644 --- a/mythtv/libs/libmythtv/channelsettings.cpp +++ b/mythtv/libs/libmythtv/channelsettings.cpp @@ -9,12 +9,12 @@ // MythTV headers #include "libmythbase/mythdirs.h" #include "libmythbase/mythlogging.h" -#include "libmythbase/programinfo.h" // for COMM_DETECT*, GetPreferredSkipTypeCombinations() #include "cardutil.h" #include "channelsettings.h" #include "channelutil.h" #include "mpeg/mpegtables.h" +#include "programtypes.h" // for COMM_DETECT*, GetPreferredSkipTypeCombinations() void ChannelID::Save() { diff --git a/mythtv/libs/libmythtv/commbreakmap.cpp b/mythtv/libs/libmythtv/commbreakmap.cpp index 817e5964d6a..439411a9186 100644 --- a/mythtv/libs/libmythtv/commbreakmap.cpp +++ b/mythtv/libs/libmythtv/commbreakmap.cpp @@ -2,9 +2,9 @@ #include "libmythbase/mythcorecontext.h" #include "libmythbase/mythdate.h" #include "libmythbase/mythlogging.h" -#include "libmythbase/programinfo.h" #include "commbreakmap.h" +#include "programinfo.h" #define LOC QString("CommBreakMap: ") diff --git a/mythtv/libs/libmythtv/commbreakmap.h b/mythtv/libs/libmythtv/commbreakmap.h index da75180caa6..e3b66f74d0f 100644 --- a/mythtv/libs/libmythtv/commbreakmap.h +++ b/mythtv/libs/libmythtv/commbreakmap.h @@ -11,9 +11,9 @@ // MythTV headers #include "libmythbase/mythchrono.h" -#include "libmythbase/programtypes.h" #include "libmythtv/tv.h" #include "libmythtv/playercontext.h" +#include "libmythtv/programtypes.h" class CommBreakMap { diff --git a/mythtv/libs/libmythtv/decoders/avformatdecoder.h b/mythtv/libs/libmythtv/decoders/avformatdecoder.h index 15a1b18737e..75882943f0c 100644 --- a/mythtv/libs/libmythtv/decoders/avformatdecoder.h +++ b/mythtv/libs/libmythtv/decoders/avformatdecoder.h @@ -14,15 +14,14 @@ extern "C" { #include #include -#include "libmythtv/audio/audiooutputsettings.h" -#include "libmythbase/programinfo.h" - +#include "audio/audiooutputsettings.h" #include "captions/vbilut.h" #include "decoderbase.h" #include "io/mythavformatbuffer.h" #include "mpeg/AVCParser.h" #include "mythcodeccontext.h" #include "mythplayer.h" +#include "programinfo.h" class TeletextDecoder; class CC608Decoder; diff --git a/mythtv/libs/libmythtv/decoders/decoderbase.cpp b/mythtv/libs/libmythtv/decoders/decoderbase.cpp index 23b83c396bc..a9ab5043a04 100644 --- a/mythtv/libs/libmythtv/decoders/decoderbase.cpp +++ b/mythtv/libs/libmythtv/decoders/decoderbase.cpp @@ -4,13 +4,13 @@ #include "libmythbase/iso639.h" #include "libmythbase/mythconfig.h" #include "libmythbase/mythlogging.h" -#include "libmythbase/programinfo.h" #include "Bluray/mythbdbuffer.h" #include "DVD/mythdvdbuffer.h" #include "decoderbase.h" #include "mythcodeccontext.h" #include "mythplayer.h" +#include "programinfo.h" #define LOC QString("Dec: ") diff --git a/mythtv/libs/libmythtv/decoders/decoderbase.h b/mythtv/libs/libmythtv/decoders/decoderbase.h index ab1c2cbb701..55aec38eda3 100644 --- a/mythtv/libs/libmythtv/decoders/decoderbase.h +++ b/mythtv/libs/libmythtv/decoders/decoderbase.h @@ -6,12 +6,12 @@ #include #include "libmythbase/mythdbcon.h" -#include "libmythbase/programinfo.h" #include "libmythtv/io/mythmediabuffer.h" #include "libmythtv/mythavrational.h" #include "libmythtv/mythavutil.h" #include "libmythtv/mythcodecid.h" #include "libmythtv/mythvideoprofile.h" +#include "libmythtv/programinfo.h" #include "libmythtv/remoteencoder.h" class TeletextViewer; diff --git a/mythtv/libs/libmythtv/deletemap.cpp b/mythtv/libs/libmythtv/deletemap.cpp index b6b7a9f4ba5..0a1ec4bdb9a 100644 --- a/mythtv/libs/libmythtv/deletemap.cpp +++ b/mythtv/libs/libmythtv/deletemap.cpp @@ -8,11 +8,11 @@ #include "libmythbase/mythdate.h" #include "libmythbase/mythlogging.h" #include "libmythbase/mythtypes.h" // for InfoMap -#include "libmythbase/programinfo.h" #include "libmythui/mythuiactions.h" // for ACTION_DOWN, ACTION_UP #include "mythplayer.h" #include "osd.h" #include "playercontext.h" // for PlayerContext +#include "programinfo.h" #include "tv_actions.h" // for ACTION_CLEARMAP, etc #define LOC QString("DelMap: ") diff --git a/mythtv/libs/libmythtv/deletemap.h b/mythtv/libs/libmythtv/deletemap.h index a7d823f6a09..bb73bdb1f02 100644 --- a/mythtv/libs/libmythtv/deletemap.h +++ b/mythtv/libs/libmythtv/deletemap.h @@ -8,8 +8,8 @@ #include // MythTV headers -#include "libmythbase/programtypes.h" // for frm_dir_map_t, MarkTypes #include "libmythtv/mythtvexp.h" +#include "libmythtv/programtypes.h" // for frm_dir_map_t, MarkTypes class OSD; class PlayerContext; diff --git a/mythtv/libs/libmythtv/dummydecoder.h b/mythtv/libs/libmythtv/dummydecoder.h index 6ba646c752b..de79e175fea 100644 --- a/mythtv/libs/libmythtv/dummydecoder.h +++ b/mythtv/libs/libmythtv/dummydecoder.h @@ -1,10 +1,9 @@ #ifndef DUMMYDECODER_H_ #define DUMMYDECODER_H_ -#include "libmythbase/programinfo.h" - #include "decoders/decoderbase.h" #include "mythframe.h" +#include "programinfo.h" class DummyDecoder : public DecoderBase { diff --git a/mythtv/libs/libmythtv/eitfixup.cpp b/mythtv/libs/libmythtv/eitfixup.cpp index 84f2447fa80..d6cb398443a 100644 --- a/mythtv/libs/libmythtv/eitfixup.cpp +++ b/mythtv/libs/libmythtv/eitfixup.cpp @@ -7,11 +7,11 @@ // MythTV headers #include "libmythbase/mythlogging.h" -#include "libmythbase/programinfo.h" // for CategoryType, subtitle types and audio and video properties #include "channelutil.h" // for GetDefaultAuthority() #include "eitfixup.h" #include "mpeg/dishdescriptors.h" // for dish_theme_type_to_string +#include "programinfo.h" // for CategoryType, subtitle types and audio and video properties /*------------------------------------------------------------------------ * Event Fix Up Scripts - Turned on by entry in dtv_privatetype table diff --git a/mythtv/libs/libmythtv/eithelper.cpp b/mythtv/libs/libmythtv/eithelper.cpp index efbfd8cb577..50cd2ba0e87 100644 --- a/mythtv/libs/libmythtv/eithelper.cpp +++ b/mythtv/libs/libmythtv/eithelper.cpp @@ -8,7 +8,6 @@ #include "libmythbase/mythdate.h" #include "libmythbase/mythdb.h" #include "libmythbase/mythlogging.h" -#include "libmythbase/programinfo.h" // for subtitle types and audio and video properties #include "channelutil.h" #include "eitcache.h" @@ -20,6 +19,7 @@ #include "mpeg/premieredescriptors.h" #include "mpeg/premieretables.h" #include "programdata.h" +#include "programinfo.h" // for subtitle types and audio and video properties #include "scheduledrecording.h" // for ScheduledRecording const uint EITHelper::kMaxQueueSize = 10000; diff --git a/mythtv/libs/libmythtv/jobqueue.cpp b/mythtv/libs/libmythtv/jobqueue.cpp index 6c0b2f1fbc2..a09524d320d 100644 --- a/mythtv/libs/libmythtv/jobqueue.cpp +++ b/mythtv/libs/libmythtv/jobqueue.cpp @@ -25,10 +25,10 @@ #include "libmythbase/mythlogging.h" #include "libmythbase/mythmiscutil.h" #include "libmythbase/mythsystemlegacy.h" -#include "libmythbase/programinfo.h" #include "jobqueue.h" #include "previewgenerator.h" +#include "programinfo.h" #include "recordinginfo.h" #include "recordingprofile.h" diff --git a/mythtv/libs/libmythtv/libmythtv.pro b/mythtv/libs/libmythtv/libmythtv.pro index 1e90cb8a29a..736e1f0d416 100644 --- a/mythtv/libs/libmythtv/libmythtv.pro +++ b/mythtv/libs/libmythtv/libmythtv.pro @@ -123,7 +123,14 @@ HEADERS += mythaverror.h HEADERS += mythavframe.h HEADERS += mythavrational.h HEADERS += mythavutil.h +HEADERS += programinfo.h +HEADERS += programinforemoteutil.h +HEADERS += programinfoupdater.h +HEADERS += programtypes.h +HEADERS += programtypeflags.h HEADERS += recordingfile.h +HEADERS += recordingstatus.h +HEADERS += recordingtypes.h HEADERS += driveroption.h HEADERS += mythhdrvideometadata.h HEADERS += mythhdrtracker.h @@ -167,7 +174,13 @@ SOURCES += mythframe.cpp SOURCES += mythavbufferref.cpp SOURCES += mythaverror.cpp SOURCES += mythavutil.cpp +SOURCES += programinfo.cpp +SOURCES += programinforemoteutil.cpp +SOURCES += programinfoupdater.cpp +SOURCES += programtypes.cpp SOURCES += recordingfile.cpp +SOURCES += recordingstatus.cpp +SOURCES += recordingtypes.cpp SOURCES += mythhdrvideometadata.cpp SOURCES += mythhdrtracker.cpp @@ -342,6 +355,12 @@ inc.files += mythtvexp.h metadataimagehelper.h inc.files += mythavutil.h mythframe.h inc.files += mythaverror.h inc.files += mythavframe.h +inc.files += programinfo.h +inc.files += programinforemoteutil.h +inc.files += programtypes.h +inc.files += programtypeflags.h +inc.files += recordingstatus.h +inc.files += recordingtypes.h INSTALLS += inc diff --git a/mythtv/libs/libmythtv/livetvchain.cpp b/mythtv/libs/libmythtv/livetvchain.cpp index 3706a318bcd..ab7ad5107e5 100644 --- a/mythtv/libs/libmythtv/livetvchain.cpp +++ b/mythtv/libs/libmythtv/livetvchain.cpp @@ -4,10 +4,10 @@ #include "libmythbase/mythdb.h" #include "libmythbase/mythlogging.h" #include "libmythbase/mythsocket.h" -#include "libmythbase/programinfo.h" #include "livetvchain.h" #include "cardutil.h" +#include "programinfo.h" #define LOC QString("LiveTVChain(%1): ").arg(m_id) diff --git a/mythtv/libs/libmythtv/mpeg/dishdescriptors.cpp b/mythtv/libs/libmythtv/mpeg/dishdescriptors.cpp index 0a1ea821c65..fe4421d77c5 100644 --- a/mythtv/libs/libmythtv/mpeg/dishdescriptors.cpp +++ b/mythtv/libs/libmythtv/mpeg/dishdescriptors.cpp @@ -6,7 +6,6 @@ // MythTV headers #include "dishdescriptors.h" #include "atsc_huffman.h" -#include "libmythbase/programinfo.h" // for subtitle types and audio and video properties #include "dvbtables.h" QString DishEventNameDescriptor::Name(uint compression_type) const diff --git a/mythtv/libs/libmythtv/mpeg/dvbdescriptors.cpp b/mythtv/libs/libmythtv/mpeg/dvbdescriptors.cpp index 2825b0f36a3..5a9bb984aaa 100644 --- a/mythtv/libs/libmythtv/mpeg/dvbdescriptors.cpp +++ b/mythtv/libs/libmythtv/mpeg/dvbdescriptors.cpp @@ -15,7 +15,7 @@ #include "iso6937tables.h" #include "freesat_huffman.h" #include "libmythbase/mythlogging.h" -#include "libmythbase/programinfo.h" +#include "libmythtv/programinfo.h" // Decode a text string according to // Draft ETSI EN 300 468 V1.16.1 (2019-05) diff --git a/mythtv/libs/libmythtv/mpeg/dvbdescriptors.h b/mythtv/libs/libmythtv/mpeg/dvbdescriptors.h index 20f9ddead03..113c1448aad 100644 --- a/mythtv/libs/libmythtv/mpeg/dvbdescriptors.h +++ b/mythtv/libs/libmythtv/mpeg/dvbdescriptors.h @@ -13,8 +13,8 @@ using uint = unsigned int; #include #include -#include "libmythbase/programinfo.h" // for subtitle types and audio and video properties #include "libmythtv/mythtvexp.h" // MTV_PUBLIC - Symbol Visibility +#include "libmythtv/programinfo.h" // for subtitle types and audio and video properties #include "mpegdescriptors.h" MTV_PUBLIC QDateTime dvbdate2qt(const unsigned char *buf); diff --git a/mythtv/libs/libmythtv/mythplayer.cpp b/mythtv/libs/libmythtv/mythplayer.cpp index 992279f0b48..789b246f0a9 100644 --- a/mythtv/libs/libmythtv/mythplayer.cpp +++ b/mythtv/libs/libmythtv/mythplayer.cpp @@ -24,7 +24,6 @@ #include "libmythbase/mythlogging.h" #include "libmythbase/mythmiscutil.h" #include "libmythbase/mythtimer.h" -#include "libmythbase/programinfo.h" #include "libmythui/mythmainwindow.h" #include "libmythui/mythuiactions.h" @@ -41,6 +40,7 @@ #include "mythavutil.h" #include "mythplayer.h" #include "mythvideooutnull.h" +#include "programinfo.h" #include "remoteencoder.h" #include "tv_actions.h" #include "tv_play.h" diff --git a/mythtv/libs/libmythtv/mythplayer.h b/mythtv/libs/libmythtv/mythplayer.h index 4c9e5564508..bb8cb215ce3 100644 --- a/mythtv/libs/libmythtv/mythplayer.h +++ b/mythtv/libs/libmythtv/mythplayer.h @@ -23,7 +23,6 @@ #include "libmythbase/mthread.h" #include "libmythbase/mythmiscutil.h" #include "libmythbase/mythtypes.h" -#include "libmythbase/programtypes.h" #include "libmythtv/audioplayer.h" #include "libmythtv/captions/cc608reader.h" #include "libmythtv/captions/cc708reader.h" @@ -38,6 +37,7 @@ #include "libmythtv/mythvideoout.h" #include "libmythtv/osd.h" #include "libmythtv/playercontext.h" +#include "libmythtv/programtypes.h" #include "libmythtv/tv.h" #include "libmythtv/videoouttypes.h" diff --git a/mythtv/libs/libmythtv/mythsystemevent.cpp b/mythtv/libs/libmythtv/mythsystemevent.cpp index 18da30a8512..afdaa370e4a 100644 --- a/mythtv/libs/libmythtv/mythsystemevent.cpp +++ b/mythtv/libs/libmythtv/mythsystemevent.cpp @@ -9,10 +9,10 @@ #include "libmythbase/mythcorecontext.h" #include "libmythbase/mythlogging.h" #include "libmythbase/mythsystemlegacy.h" -#include "libmythbase/programinfo.h" #include "cardutil.h" #include "mythsystemevent.h" +#include "programinfo.h" #define LOC QString("MythSystemEventHandler: ") diff --git a/mythtv/libs/libmythtv/mythsystemevent.h b/mythtv/libs/libmythtv/mythsystemevent.h index 0cfccbf1cca..ece09998ffd 100644 --- a/mythtv/libs/libmythtv/mythsystemevent.h +++ b/mythtv/libs/libmythtv/mythsystemevent.h @@ -4,8 +4,8 @@ #include #include -#include "libmythbase/programinfo.h" #include "libmythui/rawsettingseditor.h" +#include "programinfo.h" #include "recordinginfo.h" // Helper commands for formatting and sending a MythSystemEvent diff --git a/mythtv/libs/libmythtv/osd.h b/mythtv/libs/libmythtv/osd.h index 44abd0fd411..d9553e4b9cf 100644 --- a/mythtv/libs/libmythtv/osd.h +++ b/mythtv/libs/libmythtv/osd.h @@ -3,10 +3,10 @@ // MythTV #include "libmythbase/mythtypes.h" -#include "libmythbase/programtypes.h" #include "libmythtv/mythmediaoverlay.h" #include "libmythtv/mythplayerstate.h" #include "libmythui/mythscreentype.h" +#include "libmythtv/programtypes.h" // Screen names are prepended with alphanumerics to force the correct ordering // when displayed. This is slightly complicated by the default windows diff --git a/mythtv/libs/libmythtv/playgroup.cpp b/mythtv/libs/libmythtv/playgroup.cpp index f67d925d8ab..97600dbe190 100644 --- a/mythtv/libs/libmythtv/playgroup.cpp +++ b/mythtv/libs/libmythtv/playgroup.cpp @@ -4,8 +4,9 @@ // MythTV headers #include "libmythui/standardsettings.h" #include "libmythbase/mythdb.h" -#include "libmythbase/programinfo.h" + #include "playgroup.h" +#include "programinfo.h" // A parameter associated with the profile itself class PlayGroupDBStorage : public SimpleDBStorage diff --git a/mythtv/libs/libmythtv/previewgenerator.h b/mythtv/libs/libmythtv/previewgenerator.h index 498086b9d44..76ad6e2d173 100644 --- a/mythtv/libs/libmythtv/previewgenerator.h +++ b/mythtv/libs/libmythtv/previewgenerator.h @@ -12,9 +12,9 @@ #include "libmythbase/mthread.h" #include "libmythbase/mythdate.h" -#include "libmythbase/programinfo.h" #include "mythtvexp.h" +#include "programinfo.h" class PreviewGenerator; class QByteArray; diff --git a/mythtv/libs/libmythtv/previewgeneratorqueue.cpp b/mythtv/libs/libmythtv/previewgeneratorqueue.cpp index c0f51602688..5d5b963d357 100644 --- a/mythtv/libs/libmythtv/previewgeneratorqueue.cpp +++ b/mythtv/libs/libmythtv/previewgeneratorqueue.cpp @@ -13,10 +13,10 @@ #include "libmythbase/mythcorecontext.h" #include "libmythbase/mythdirs.h" #include "libmythbase/mythlogging.h" -#include "libmythbase/programinforemoteutil.h" // libmythtv #include "previewgenerator.h" +#include "programinforemoteutil.h" #define LOC QString("PreviewQueue: ") diff --git a/mythtv/libs/libmythtv/programdata.h b/mythtv/libs/libmythtv/programdata.h index c937223be1f..5095fed8cfe 100644 --- a/mythtv/libs/libmythtv/programdata.h +++ b/mythtv/libs/libmythtv/programdata.h @@ -16,7 +16,7 @@ // MythTV headers #include "mythtvexp.h" #include "listingsources.h" -#include "libmythbase/programinfo.h" +#include "programinfo.h" #include "eithelper.h" /* for FixupValue */ class MSqlQuery; diff --git a/mythtv/libs/libmythbase/programinfo.cpp b/mythtv/libs/libmythtv/programinfo.cpp similarity index 99% rename from mythtv/libs/libmythbase/programinfo.cpp rename to mythtv/libs/libmythtv/programinfo.cpp index bee858c6a2d..cb6bab04702 100644 --- a/mythtv/libs/libmythbase/programinfo.cpp +++ b/mythtv/libs/libmythtv/programinfo.cpp @@ -46,7 +46,7 @@ static constexpr uint kInvalidDateTime { UINT_MAX }; static constexpr int64_t kLastUpdateOffset { 61LL * 60 }; #define DEFINE_FLAGS_NAMES -#include "libmythbase/programtypeflags.h" +#include "programtypeflags.h" #undef DEFINE_FLAGS_NAMES const QString ProgramInfo::kFromRecordedQuery = diff --git a/mythtv/libs/libmythbase/programinfo.h b/mythtv/libs/libmythtv/programinfo.h similarity index 97% rename from mythtv/libs/libmythbase/programinfo.h rename to mythtv/libs/libmythtv/programinfo.h index 72ff669a45e..c5c6c619a4c 100644 --- a/mythtv/libs/libmythbase/programinfo.h +++ b/mythtv/libs/libmythtv/programinfo.h @@ -17,9 +17,11 @@ #include "libmythbase/mythdate.h" #include "libmythbase/mythdbcon.h" #include "libmythbase/mythtypes.h" -#include "libmythbase/programtypes.h" -#include "libmythbase/recordingstatus.h" -#include "libmythbase/recordingtypes.h" + +#include "mythtvexp.h" +#include "programtypes.h" +#include "recordingstatus.h" +#include "recordingtypes.h" /* If NUMPROGRAMLINES gets updated, then MYTH_PROTO_VERSION and MYTH_PROTO_TOKEN in mythversion.h need to be bumped, and also follow the instructions in @@ -64,7 +66,7 @@ class MSqlQuery; class ProgramInfoUpdater; class PMapDBReplacement; -class MBASE_PUBLIC ProgramInfo +class MTV_PUBLIC ProgramInfo { friend int pginfo_init_statics(void); friend class TestRecordingExtender; @@ -866,7 +868,7 @@ class MBASE_PUBLIC ProgramInfo // Class for specifying the desired grouping behavior when querying // for program data. Note that title and starttime are always used in // all cases but None and callsign is also used in the ChanNum case. -class MBASE_PUBLIC ProgGroupBy : public QObject +class MTV_PUBLIC ProgGroupBy : public QObject { Q_OBJECT @@ -881,7 +883,7 @@ class MBASE_PUBLIC ProgGroupBy : public QObject Q_ENUM(Type) }; -MBASE_PUBLIC bool LoadFromProgram( +MTV_PUBLIC bool LoadFromProgram( ProgramList &destination, const QString &where, const QString &groupBy, @@ -889,14 +891,14 @@ MBASE_PUBLIC bool LoadFromProgram( const MSqlBindings &bindings, const ProgramList &schedList); -MBASE_PUBLIC bool LoadFromProgram( +MTV_PUBLIC bool LoadFromProgram( ProgramList &destination, const QString &sql, const MSqlBindings &bindings, const ProgramList &schedList, ProgGroupBy::Type groupBy = ProgGroupBy::None); -MBASE_PUBLIC bool LoadFromProgram( +MTV_PUBLIC bool LoadFromProgram( ProgramList &destination, const QString &sql, const MSqlBindings &bindings, @@ -906,15 +908,15 @@ MBASE_PUBLIC bool LoadFromProgram( uint &count, ProgGroupBy::Type groupBy = ProgGroupBy::None); -MBASE_PUBLIC ProgramInfo* LoadProgramFromProgram( +MTV_PUBLIC ProgramInfo* LoadProgramFromProgram( uint chanid, const QDateTime &starttime); -MBASE_PUBLIC bool LoadFromOldRecorded( +MTV_PUBLIC bool LoadFromOldRecorded( ProgramList &destination, const QString &sql, const MSqlBindings &bindings); -MBASE_PUBLIC bool LoadFromOldRecorded( +MTV_PUBLIC bool LoadFromOldRecorded( ProgramList &destination, const QString &sql, const MSqlBindings &bindings, @@ -922,7 +924,7 @@ MBASE_PUBLIC bool LoadFromOldRecorded( uint limit, uint &count); -MBASE_PUBLIC bool LoadFromRecorded( +MTV_PUBLIC bool LoadFromRecorded( ProgramList &destination, bool possiblyInProgressRecordingsOnly, const QMap &inUseMap, @@ -981,12 +983,12 @@ bool LoadFromScheduler(AutoDeleteDeque &destination) // Moved from programdetails.cpp/h, used by MythWelcome/MythShutdown // could be factored out -MBASE_PUBLIC bool GetNextRecordingList(QDateTime &nextRecordingStart, +MTV_PUBLIC bool GetNextRecordingList(QDateTime &nextRecordingStart, bool *hasConflicts = nullptr, std::vector *list = nullptr); class QMutex; -class MBASE_PUBLIC PMapDBReplacement +class MTV_PUBLIC PMapDBReplacement { public: PMapDBReplacement(); @@ -995,13 +997,13 @@ class MBASE_PUBLIC PMapDBReplacement QMap map; }; -MBASE_PUBLIC QString myth_category_type_to_string(ProgramInfo::CategoryType category_type); -MBASE_PUBLIC ProgramInfo::CategoryType string_to_myth_category_type(const QString &type); +MTV_PUBLIC QString myth_category_type_to_string(ProgramInfo::CategoryType category_type); +MTV_PUBLIC ProgramInfo::CategoryType string_to_myth_category_type(const QString &type); Q_DECLARE_METATYPE(ProgramInfo*) Q_DECLARE_METATYPE(ProgramInfo::CategoryType) -MBASE_PUBLIC bool RemoteCheckFile(ProgramInfo *pginfo, bool checkSlaves = true); +MTV_PUBLIC bool RemoteCheckFile(ProgramInfo *pginfo, bool checkSlaves = true); #endif // MYTHPROGRAM_H_ diff --git a/mythtv/libs/libmythbase/programinforemoteutil.cpp b/mythtv/libs/libmythtv/programinforemoteutil.cpp similarity index 100% rename from mythtv/libs/libmythbase/programinforemoteutil.cpp rename to mythtv/libs/libmythtv/programinforemoteutil.cpp diff --git a/mythtv/libs/libmythtv/programinforemoteutil.h b/mythtv/libs/libmythtv/programinforemoteutil.h new file mode 100644 index 00000000000..640c9210e24 --- /dev/null +++ b/mythtv/libs/libmythtv/programinforemoteutil.h @@ -0,0 +1,35 @@ +#ifndef PROGRAMINFO_REMOTEUTIL_H +#define PROGRAMINFO_REMOTEUTIL_H + +#include + +#include +#include +#include + +#include "mythtvexp.h" + +class ProgramInfo; + +MTV_PUBLIC bool RemoteDeleteRecording( uint recordingID, bool forceMetadataDelete, + bool forgetHistory); +MTV_PUBLIC bool RemoteUndeleteRecording(uint recordingID); + +MTV_PUBLIC std::vector *RemoteGetRecordedList(int sort); +MTV_PUBLIC void RemoteGetAllScheduledRecordings(std::vector &scheduledlist); +MTV_PUBLIC void RemoteGetAllExpiringRecordings(std::vector &expiringlist); +MTV_PUBLIC uint RemoteGetRecordingList(std::vector &reclist, + QStringList &strList); +MTV_PUBLIC std::vector *RemoteGetConflictList(const ProgramInfo *pginfo); + +MTV_PUBLIC QDateTime RemoteGetPreviewLastModified(const ProgramInfo *pginfo); +MTV_PUBLIC QDateTime RemoteGetPreviewIfModified(const ProgramInfo &pginfo, + const QString &cachefile); + +MTV_PUBLIC bool RemoteFillProgramInfo(ProgramInfo &pginfo, const QString &playbackhostname); + +MTV_PUBLIC std::vector *RemoteGetCurrentlyRecordingList(void); + +#endif // PROGRAMINFO_REMOTEUTIL_H + +/* vim: set expandtab tabstop=4 shiftwidth=4: */ diff --git a/mythtv/libs/libmythbase/programinfoupdater.cpp b/mythtv/libs/libmythtv/programinfoupdater.cpp similarity index 100% rename from mythtv/libs/libmythbase/programinfoupdater.cpp rename to mythtv/libs/libmythtv/programinfoupdater.cpp diff --git a/mythtv/libs/libmythbase/programinfoupdater.h b/mythtv/libs/libmythtv/programinfoupdater.h similarity index 89% rename from mythtv/libs/libmythbase/programinfoupdater.h rename to mythtv/libs/libmythtv/programinfoupdater.h index 860d0a1b1b5..a356dc24761 100644 --- a/mythtv/libs/libmythbase/programinfoupdater.h +++ b/mythtv/libs/libmythtv/programinfoupdater.h @@ -13,7 +13,7 @@ #include // Myth -#include "mythbaseexp.h" +#include "mythtvexp.h" enum PIAction : std::uint8_t { kPIAdd, @@ -22,7 +22,7 @@ enum PIAction : std::uint8_t { kPIUpdateFileSize, }; -class MBASE_PUBLIC PIKeyAction +class MTV_PUBLIC PIKeyAction { public: PIKeyAction(uint recordedid, PIAction a) : @@ -37,7 +37,7 @@ class MBASE_PUBLIC PIKeyAction } }; -class MBASE_PUBLIC PIKeyData +class MTV_PUBLIC PIKeyData { public: PIKeyData(PIAction a, uint64_t f) : m_action(a), m_filesize(f) { } @@ -45,7 +45,7 @@ class MBASE_PUBLIC PIKeyData uint64_t m_filesize; }; -class MBASE_PUBLIC ProgramInfoUpdater : public QRunnable +class MTV_PUBLIC ProgramInfoUpdater : public QRunnable { public: ProgramInfoUpdater() { setAutoDelete(false); } diff --git a/mythtv/libs/libmythbase/programtypeflags.h b/mythtv/libs/libmythtv/programtypeflags.h similarity index 100% rename from mythtv/libs/libmythbase/programtypeflags.h rename to mythtv/libs/libmythtv/programtypeflags.h diff --git a/mythtv/libs/libmythbase/programtypes.cpp b/mythtv/libs/libmythtv/programtypes.cpp similarity index 100% rename from mythtv/libs/libmythbase/programtypes.cpp rename to mythtv/libs/libmythtv/programtypes.cpp diff --git a/mythtv/libs/libmythbase/programtypes.h b/mythtv/libs/libmythtv/programtypes.h similarity index 84% rename from mythtv/libs/libmythbase/programtypes.h rename to mythtv/libs/libmythtv/programtypes.h index 594d0080640..8fae1895822 100644 --- a/mythtv/libs/libmythbase/programtypes.h +++ b/mythtv/libs/libmythtv/programtypes.h @@ -21,24 +21,24 @@ #include // MythTV headers -#include "mythbaseexp.h" // for MBASE_PUBLIC +#include "mythtvexp.h" #include "recordingtypes.h" // for RecordingType class QDateTime; class QMutex; -MBASE_PUBLIC extern const QString kPlayerInUseID; -MBASE_PUBLIC extern const QString kPIPPlayerInUseID; -MBASE_PUBLIC extern const QString kPBPPlayerInUseID; -MBASE_PUBLIC extern const QString kImportRecorderInUseID; -MBASE_PUBLIC extern const QString kRecorderInUseID; -MBASE_PUBLIC extern const QString kFileTransferInUseID; -MBASE_PUBLIC extern const QString kTruncatingDeleteInUseID; -MBASE_PUBLIC extern const QString kFlaggerInUseID; -MBASE_PUBLIC extern const QString kTranscoderInUseID; -MBASE_PUBLIC extern const QString kPreviewGeneratorInUseID; -MBASE_PUBLIC extern const QString kJobQueueInUseID; -MBASE_PUBLIC extern const QString kCCExtractorInUseID; +MTV_PUBLIC extern const QString kPlayerInUseID; +MTV_PUBLIC extern const QString kPIPPlayerInUseID; +MTV_PUBLIC extern const QString kPBPPlayerInUseID; +MTV_PUBLIC extern const QString kImportRecorderInUseID; +MTV_PUBLIC extern const QString kRecorderInUseID; +MTV_PUBLIC extern const QString kFileTransferInUseID; +MTV_PUBLIC extern const QString kTruncatingDeleteInUseID; +MTV_PUBLIC extern const QString kFlaggerInUseID; +MTV_PUBLIC extern const QString kTranscoderInUseID; +MTV_PUBLIC extern const QString kPreviewGeneratorInUseID; +MTV_PUBLIC extern const QString kJobQueueInUseID; +MTV_PUBLIC extern const QString kCCExtractorInUseID; /// Frame # -> File offset map using frm_pos_map_t = QMap; @@ -76,7 +76,7 @@ enum MarkTypes : std::int16_t { MARK_UTIL_LASTPLAYPOS = 41, }; -MBASE_PUBLIC QString toString(MarkTypes type); +MTV_PUBLIC QString toString(MarkTypes type); using stringMarkMap = std::map; static stringMarkMap MarkTypeStrings = @@ -111,7 +111,7 @@ static stringMarkMap MarkTypeStrings = { "UTIL_LASTPLAYPOS", MARK_UTIL_LASTPLAYPOS } }; -MBASE_PUBLIC MarkTypes markTypeFromString(const QString & str); +MTV_PUBLIC MarkTypes markTypeFromString(const QString & str); /// Frame # -> Mark map using frm_dir_map_t = QMap; @@ -150,8 +150,8 @@ enum SkipType : std::int16_t { | COMM_DETECT_SCENE) }; -MBASE_PUBLIC QString SkipTypeToString(int flags); -MBASE_PUBLIC std::deque GetPreferredSkipTypeCombinations(void); +MTV_PUBLIC QString SkipTypeToString(int flags); +MTV_PUBLIC std::deque GetPreferredSkipTypeCombinations(void); enum TranscodingStatus : std::uint8_t { TRANSCODING_NOT_TRANSCODED = 0, @@ -180,7 +180,7 @@ enum AvailableStatusType : std::uint8_t { asZeroByte, asDeleted }; // note stored in uint8_t in ProgramInfo -MBASE_PUBLIC QString toString(AvailableStatusType status); +MTV_PUBLIC QString toString(AvailableStatusType status); enum WatchListStatus : std::int8_t { wlDeleted = -4, diff --git a/mythtv/libs/libmythtv/recorders/dtvrecorder.cpp b/mythtv/libs/libmythtv/recorders/dtvrecorder.cpp index 5a852f2548f..ebe0169debc 100644 --- a/mythtv/libs/libmythtv/recorders/dtvrecorder.cpp +++ b/mythtv/libs/libmythtv/recorders/dtvrecorder.cpp @@ -20,7 +20,6 @@ #include "libmythbase/mythcorecontext.h" #include "libmythbase/mythlogging.h" -#include "libmythbase/programinfo.h" #include "libmythbase/sizetliteral.h" #include "bytereader.h" @@ -33,6 +32,7 @@ #include "mpeg/mpegstreamdata.h" #include "mpeg/mpegtables.h" #include "mythsystemevent.h" +#include "programinfo.h" #include "tv_rec.h" #define LOC ((m_tvrec) ? \ diff --git a/mythtv/libs/libmythtv/recorders/mpegrecorder.cpp b/mythtv/libs/libmythtv/recorders/mpegrecorder.cpp index 12a9bb88093..08463c2309c 100644 --- a/mythtv/libs/libmythtv/recorders/mpegrecorder.cpp +++ b/mythtv/libs/libmythtv/recorders/mpegrecorder.cpp @@ -24,11 +24,11 @@ #include "libmythbase/mythcorecontext.h" #include "libmythbase/mythdate.h" #include "libmythbase/mythlogging.h" -#include "libmythbase/programinfo.h" #include "cardutil.h" #include "io/mythmediabuffer.h" #include "mpegrecorder.h" +#include "programinfo.h" #include "recordingprofile.h" #include "tv_rec.h" diff --git a/mythtv/libs/libmythtv/recorders/recorderbase.cpp b/mythtv/libs/libmythtv/recorders/recorderbase.cpp index a9fb0358434..2103aae6980 100644 --- a/mythtv/libs/libmythtv/recorders/recorderbase.cpp +++ b/mythtv/libs/libmythtv/recorders/recorderbase.cpp @@ -5,7 +5,6 @@ #include "libmythbase/mythcorecontext.h" #include "libmythbase/mythdate.h" #include "libmythbase/mythlogging.h" -#include "libmythbase/programinfo.h" #include "firewirerecorder.h" #include "recordingprofile.h" @@ -32,6 +31,7 @@ #include "ExternalChannel.h" #include "io/mythmediabuffer.h" #include "cardutil.h" +#include "programinfo.h" #include "tv_rec.h" #if CONFIG_V4L2 #include "v4l2encrecorder.h" diff --git a/mythtv/libs/libmythtv/recorders/recorderbase.h b/mythtv/libs/libmythtv/recorders/recorderbase.h index 74432319f9d..ff09a2063a6 100644 --- a/mythtv/libs/libmythtv/recorders/recorderbase.h +++ b/mythtv/libs/libmythtv/recorders/recorderbase.h @@ -13,12 +13,13 @@ #include #include "libmythbase/mythtimer.h" -#include "libmythbase/programtypes.h" // for MarkTypes, frm_pos_map_t #include "libmythtv/mythtvexp.h" #include "libmythtv/mythavrational.h" +#include "libmythtv/programtypes.h" // for MarkTypes, frm_pos_map_t #include "libmythtv/recordingfile.h" #include "libmythtv/recordingquality.h" +#include "libmythtv/recordingstatus.h" #include "libmythtv/scantype.h" extern "C" diff --git a/mythtv/libs/libmythtv/recordingfile.h b/mythtv/libs/libmythtv/recordingfile.h index b1b176eb59f..d2c2f218c85 100644 --- a/mythtv/libs/libmythtv/recordingfile.h +++ b/mythtv/libs/libmythtv/recordingfile.h @@ -1,14 +1,13 @@ #ifndef RECORDING_FILE_H #define RECORDING_FILE_H +#include + #include #include -#include "libmythbase/programinfo.h" #include "libmythtv/mythtvexp.h" -class RecordingRule; - enum AVContainer : std::uint8_t { formatUnknown = 0, diff --git a/mythtv/libs/libmythtv/recordinginfo.cpp b/mythtv/libs/libmythtv/recordinginfo.cpp index 124e57e0381..c5f9c575d9f 100644 --- a/mythtv/libs/libmythtv/recordinginfo.cpp +++ b/mythtv/libs/libmythtv/recordinginfo.cpp @@ -13,9 +13,9 @@ #include "libmythbase/mythdate.h" #include "libmythbase/mythdb.h" #include "libmythbase/mythlogging.h" -#include "libmythbase/programinfoupdater.h" #include "jobqueue.h" +#include "programinfoupdater.h" #include "recordinginfo.h" #include "recordingrule.h" #include "scheduledrecording.h" diff --git a/mythtv/libs/libmythtv/recordinginfo.h b/mythtv/libs/libmythtv/recordinginfo.h index 4bb32cab129..e990f9850b1 100644 --- a/mythtv/libs/libmythtv/recordinginfo.h +++ b/mythtv/libs/libmythtv/recordinginfo.h @@ -5,10 +5,10 @@ #include #include -#include "libmythbase/programinfo.h" -#include "libmythbase/recordingstatus.h" #include "libmythtv/mythtvexp.h" +#include "libmythtv/programinfo.h" #include "libmythtv/recordingfile.h" +#include "libmythtv/recordingstatus.h" class RecordingRule; diff --git a/mythtv/libs/libmythtv/recordingrule.h b/mythtv/libs/libmythtv/recordingrule.h index a00f9ae57c6..1a96aa7d3b3 100644 --- a/mythtv/libs/libmythtv/recordingrule.h +++ b/mythtv/libs/libmythtv/recordingrule.h @@ -9,12 +9,12 @@ #include // MythTV -#include "libmythbase/programinfo.h" -#include "libmythbase/programtypes.h" -#include "libmythbase/recordingtypes.h" #include "libmythtv/mythtvexp.h" +#include "libmythtv/programinfo.h" +#include "libmythtv/programtypes.h" #include "libmythtv/recordinginfo.h" #include "libmythtv/recordingprofile.h" +#include "libmythtv/recordingtypes.h" /** \class RecordingRule * \brief Internal representation of a recording rule, mirrors the record diff --git a/mythtv/libs/libmythbase/recordingstatus.cpp b/mythtv/libs/libmythtv/recordingstatus.cpp similarity index 99% rename from mythtv/libs/libmythbase/recordingstatus.cpp rename to mythtv/libs/libmythtv/recordingstatus.cpp index 7f1b4be2971..cb0d780002a 100644 --- a/mythtv/libs/libmythbase/recordingstatus.cpp +++ b/mythtv/libs/libmythtv/recordingstatus.cpp @@ -1,6 +1,6 @@ #include "recordingstatus.h" -#include "mythdate.h" +#include "libmythbase/mythdate.h" QString RecStatus::toUIState(RecStatus::Type recstatus) { diff --git a/mythtv/libs/libmythbase/recordingstatus.h b/mythtv/libs/libmythtv/recordingstatus.h similarity index 96% rename from mythtv/libs/libmythbase/recordingstatus.h rename to mythtv/libs/libmythtv/recordingstatus.h index d4d7278c802..b985dc7603e 100644 --- a/mythtv/libs/libmythbase/recordingstatus.h +++ b/mythtv/libs/libmythtv/recordingstatus.h @@ -4,10 +4,10 @@ #include #include -#include "mythbaseexp.h" +#include "mythtvexp.h" #include "programtypes.h" -class MBASE_PUBLIC RecStatus : public QObject +class MTV_PUBLIC RecStatus : public QObject { Q_OBJECT diff --git a/mythtv/libs/libmythbase/recordingtypes.cpp b/mythtv/libs/libmythtv/recordingtypes.cpp similarity index 100% rename from mythtv/libs/libmythbase/recordingtypes.cpp rename to mythtv/libs/libmythtv/recordingtypes.cpp diff --git a/mythtv/libs/libmythbase/recordingtypes.h b/mythtv/libs/libmythtv/recordingtypes.h similarity index 59% rename from mythtv/libs/libmythbase/recordingtypes.h rename to mythtv/libs/libmythtv/recordingtypes.h index e33a5fe863d..ed3b3e552c7 100644 --- a/mythtv/libs/libmythbase/recordingtypes.h +++ b/mythtv/libs/libmythtv/recordingtypes.h @@ -14,7 +14,7 @@ #include #include -#include "mythbaseexp.h" +#include "mythtvexp.h" enum RecordingType : std::uint8_t { @@ -31,15 +31,15 @@ enum RecordingType : std::uint8_t //kFindWeeklyRecord = 10, (Obsolete) kTemplateRecord = 11 }; // note stored in uint8_t in ProgramInfo -MBASE_PUBLIC QString toString(RecordingType rectype); -MBASE_PUBLIC QString toDescription(RecordingType rectype); -MBASE_PUBLIC QString toRawString(RecordingType rectype); -MBASE_PUBLIC QChar toQChar( RecordingType rectype); -MBASE_PUBLIC RecordingType recTypeFromString(const QString& type); +MTV_PUBLIC QString toString(RecordingType rectype); +MTV_PUBLIC QString toDescription(RecordingType rectype); +MTV_PUBLIC QString toRawString(RecordingType rectype); +MTV_PUBLIC QChar toQChar( RecordingType rectype); +MTV_PUBLIC RecordingType recTypeFromString(const QString& type); static inline QVariant toVariant(RecordingType rectype) {return QVariant::fromValue(static_cast(rectype)); } -MBASE_PUBLIC int RecTypePrecedence(RecordingType rectype); +MTV_PUBLIC int RecTypePrecedence(RecordingType rectype); enum RecordingDupInType : std::uint8_t { @@ -49,12 +49,12 @@ enum RecordingDupInType : std::uint8_t kDupsInAll = 0x0F, kDupsNewEpi = 0x10 }; // note stored in uint8_t in ProgramInfo -MBASE_PUBLIC QString toString(RecordingDupInType rectype); -MBASE_PUBLIC QString toDescription(RecordingDupInType rectype); -MBASE_PUBLIC QString toRawString(RecordingDupInType rectype); -MBASE_PUBLIC bool newEpifromDupIn(RecordingDupInType recdupin); -MBASE_PUBLIC RecordingDupInType dupInFromString(const QString& type); -MBASE_PUBLIC RecordingDupInType dupInFromStringAndBool(const QString& type, bool newEpisodesOnly); +MTV_PUBLIC QString toString(RecordingDupInType rectype); +MTV_PUBLIC QString toDescription(RecordingDupInType rectype); +MTV_PUBLIC QString toRawString(RecordingDupInType rectype); +MTV_PUBLIC bool newEpifromDupIn(RecordingDupInType recdupin); +MTV_PUBLIC RecordingDupInType dupInFromString(const QString& type); +MTV_PUBLIC RecordingDupInType dupInFromStringAndBool(const QString& type, bool newEpisodesOnly); static inline QVariant toVariant(RecordingDupInType recdupin) {return QVariant::fromValue(static_cast(recdupin)); } @@ -67,10 +67,10 @@ enum RecordingDupMethodType : std::uint8_t kDupCheckSubDesc = 0x06, kDupCheckSubThenDesc = 0x08 }; // note stored in uint8_t in ProgramInfo -MBASE_PUBLIC QString toString(RecordingDupMethodType rectype); -MBASE_PUBLIC QString toDescription(RecordingDupMethodType rectype); -MBASE_PUBLIC QString toRawString(RecordingDupMethodType rectype); -MBASE_PUBLIC RecordingDupMethodType dupMethodFromString(const QString& type); +MTV_PUBLIC QString toString(RecordingDupMethodType rectype); +MTV_PUBLIC QString toDescription(RecordingDupMethodType rectype); +MTV_PUBLIC QString toRawString(RecordingDupMethodType rectype); +MTV_PUBLIC RecordingDupMethodType dupMethodFromString(const QString& type); static inline QVariant toVariant(RecordingDupMethodType recdupmeth) {return QVariant::fromValue(static_cast(recdupmeth)); } @@ -83,9 +83,9 @@ enum RecSearchType : std::uint8_t kPeopleSearch, kManualSearch }; -MBASE_PUBLIC QString toString(RecSearchType rectype); -MBASE_PUBLIC QString toRawString(RecSearchType rectype); -MBASE_PUBLIC RecSearchType searchTypeFromString(const QString& type); +MTV_PUBLIC QString toString(RecSearchType rectype); +MTV_PUBLIC QString toRawString(RecSearchType rectype); +MTV_PUBLIC RecSearchType searchTypeFromString(const QString& type); static inline QVariant toVariant(RecSearchType recsearch) {return QVariant::fromValue(static_cast(recsearch)); } @@ -96,10 +96,10 @@ enum class AutoExtendType : uint8_t MLB, Last }; -MBASE_PUBLIC QString toString(AutoExtendType extType); -MBASE_PUBLIC QString toDescription(AutoExtendType extType); -MBASE_PUBLIC AutoExtendType autoExtendTypeFromString(const QString& type); -MBASE_PUBLIC AutoExtendType autoExtendTypeFromInt(uint8_t type); +MTV_PUBLIC QString toString(AutoExtendType extType); +MTV_PUBLIC QString toDescription(AutoExtendType extType); +MTV_PUBLIC AutoExtendType autoExtendTypeFromString(const QString& type); +MTV_PUBLIC AutoExtendType autoExtendTypeFromInt(uint8_t type); static inline QVariant toVariant(AutoExtendType extType) {return QVariant::fromValue(static_cast(extType)); } diff --git a/mythtv/libs/libmythtv/remoteencoder.cpp b/mythtv/libs/libmythtv/remoteencoder.cpp index d9df101a0dd..2baed6b1bbe 100644 --- a/mythtv/libs/libmythtv/remoteencoder.cpp +++ b/mythtv/libs/libmythtv/remoteencoder.cpp @@ -7,9 +7,9 @@ #include "libmythbase/mythdb.h" #include "libmythbase/mythlogging.h" #include "libmythbase/mythsocket.h" -#include "libmythbase/programinfo.h" #include "recorders/signalmonitor.h" +#include "programinfo.h" #include "remoteencoder.h" #define LOC QString("RemoteEncoder(%1): ").arg(m_recordernum) diff --git a/mythtv/libs/libmythtv/remoteencoder.h b/mythtv/libs/libmythtv/remoteencoder.h index 62813ce9b1b..6c05073d0e2 100644 --- a/mythtv/libs/libmythtv/remoteencoder.h +++ b/mythtv/libs/libmythtv/remoteencoder.h @@ -13,8 +13,8 @@ // MythTV headers #include "libmythbase/mythtimer.h" #include "libmythbase/mythtypes.h" -#include "libmythbase/programtypes.h" #include "libmythtv/mythtvexp.h" +#include "libmythtv/programtypes.h" #include "libmythtv/tv.h" #include "libmythtv/videoouttypes.h" diff --git a/mythtv/libs/libmythtv/test/CMakeLists.txt b/mythtv/libs/libmythtv/test/CMakeLists.txt index 90ac2ce05dc..50533e75633 100644 --- a/mythtv/libs/libmythtv/test/CMakeLists.txt +++ b/mythtv/libs/libmythtv/test/CMakeLists.txt @@ -19,4 +19,5 @@ add_subdirectory(test_mheg_dsmcc) add_subdirectory(test_mpegtables) add_subdirectory(test_mythiowrapper) add_subdirectory(test_pink_noise) +add_subdirectory(test_programinfo) add_subdirectory(test_subtitlescreen) diff --git a/mythtv/libs/libmythtv/test/test_eitfixups/test_eitfixups.cpp b/mythtv/libs/libmythtv/test/test_eitfixups/test_eitfixups.cpp index f1b1a1639ad..8c8a45a4b4f 100644 --- a/mythtv/libs/libmythtv/test/test_eitfixups/test_eitfixups.cpp +++ b/mythtv/libs/libmythtv/test/test_eitfixups/test_eitfixups.cpp @@ -23,10 +23,10 @@ #include "test_eitfixups.h" -#include "libmythbase/programinfo.h" #include "libmythtv/channelutil.h" #include "libmythtv/eitfixup.h" #include "libmythtv/mpeg/dishdescriptors.h" +#include "libmythtv/programinfo.h" // Make this non-zero to enable dumping event details to stdout diff --git a/mythtv/libs/libmythbase/test/test_programinfo/.gitignore b/mythtv/libs/libmythtv/test/test_programinfo/.gitignore similarity index 100% rename from mythtv/libs/libmythbase/test/test_programinfo/.gitignore rename to mythtv/libs/libmythtv/test/test_programinfo/.gitignore diff --git a/mythtv/libs/libmythbase/test/test_programinfo/CMakeLists.txt b/mythtv/libs/libmythtv/test/test_programinfo/CMakeLists.txt similarity index 63% rename from mythtv/libs/libmythbase/test/test_programinfo/CMakeLists.txt rename to mythtv/libs/libmythtv/test/test_programinfo/CMakeLists.txt index 8ca258e80fb..671adcbc1b7 100644 --- a/mythtv/libs/libmythbase/test/test_programinfo/CMakeLists.txt +++ b/mythtv/libs/libmythtv/test/test_programinfo/CMakeLists.txt @@ -8,6 +8,6 @@ add_executable(test_programinfo test_programinfo.cpp test_programinfo.h) target_include_directories(test_programinfo PRIVATE . ../..) -target_link_libraries(test_programinfo PUBLIC myth Qt${QT_VERSION_MAJOR}::Test) +target_link_libraries(test_programinfo PUBLIC mythtv Qt${QT_VERSION_MAJOR}::Test) -add_test(NAME AudioConvert COMMAND test_programinfo) +add_test(NAME ProgramInfo COMMAND test_programinfo) diff --git a/mythtv/libs/libmythbase/test/test_programinfo/test_programinfo.cpp b/mythtv/libs/libmythtv/test/test_programinfo/test_programinfo.cpp similarity index 100% rename from mythtv/libs/libmythbase/test/test_programinfo/test_programinfo.cpp rename to mythtv/libs/libmythtv/test/test_programinfo/test_programinfo.cpp diff --git a/mythtv/libs/libmythbase/test/test_programinfo/test_programinfo.h b/mythtv/libs/libmythtv/test/test_programinfo/test_programinfo.h similarity index 99% rename from mythtv/libs/libmythbase/test/test_programinfo/test_programinfo.h rename to mythtv/libs/libmythtv/test/test_programinfo/test_programinfo.h index 1da89f0bd77..705230039dc 100644 --- a/mythtv/libs/libmythbase/test/test_programinfo/test_programinfo.h +++ b/mythtv/libs/libmythtv/test/test_programinfo/test_programinfo.h @@ -23,8 +23,8 @@ #include #include "libmythbase/mythcorecontext.h" -#include "libmythbase/programtypes.h" -#include "libmythbase/programinfo.h" +#include "libmythtv/programtypes.h" +#include "libmythtv/programinfo.h" #define DEBUG 0 diff --git a/mythtv/libs/libmythtv/test/test_programinfo/test_programinfo.pro b/mythtv/libs/libmythtv/test/test_programinfo/test_programinfo.pro new file mode 100644 index 00000000000..a0db56a7cc4 --- /dev/null +++ b/mythtv/libs/libmythtv/test/test_programinfo/test_programinfo.pro @@ -0,0 +1,46 @@ +include ( ../../../../settings.pro ) +include ( ../../../../test.pro ) + +QT += xml sql network testlib +using_opengl: QT += opengl + +TEMPLATE = app +TARGET = test_programinfo +INCLUDEPATH += ../../.. + +LIBS += -L../../../libmythbase -lmythbase-$$LIBVERSION +LIBS += -L../../../libmythui -lmythui-$$LIBVERSION +LIBS += -L../../../libmythupnp -lmythupnp-$$LIBVERSION +LIBS += -L../../../../external/FFmpeg/libswresample -lmythswresample +LIBS += -L../../../../external/FFmpeg/libavutil -lmythavutil +LIBS += -L../../../../external/FFmpeg/libavcodec -lmythavcodec +LIBS += -L../../../../external/FFmpeg/libswscale -lmythswscale +LIBS += -L../../../../external/FFmpeg/libavformat -lmythavformat +LIBS += -L../../../../external/FFmpeg/libavfilter -lmythavfilter +LIBS += -L../../../../external/FFmpeg/libpostproc -lmythpostproc +using_mheg:LIBS += -L../../../libmythfreemheg -lmythfreemheg-$$LIBVERSION +LIBS += -L../.. -lmythtv-$$LIBVERSION + +QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../../external/FFmpeg/libswresample +QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../../external/FFmpeg/libavutil +QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../../external/FFmpeg/libswscale +QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../../external/FFmpeg/libavformat +QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../../external/FFmpeg/libavfilter +QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../../external/FFmpeg/libavcodec +QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../../external/FFmpeg/libpostproc +QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythbase +QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythui +QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythupnp +QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythfreemheg + +# Input +HEADERS += test_programinfo.h +SOURCES += test_programinfo.cpp + +QMAKE_CLEAN += $(TARGET) $(TARGETA) $(TARGETD) $(TARGET0) $(TARGET1) $(TARGET2) +QMAKE_CLEAN += ; ( cd $(OBJECTS_DIR) && rm -f *.gcov *.gcda *.gcno ) + +LIBS += $$EXTRA_LIBS $$LATE_LIBS + +# Fix runtime linking on Ubuntu 17.10. +linux:QMAKE_LFLAGS += -Wl,--disable-new-dtags diff --git a/mythtv/libs/libmythtv/tv_play.cpp b/mythtv/libs/libmythtv/tv_play.cpp index 94dee65e955..6877a838a34 100644 --- a/mythtv/libs/libmythtv/tv_play.cpp +++ b/mythtv/libs/libmythtv/tv_play.cpp @@ -34,9 +34,6 @@ #include "libmythbase/mythlogging.h" #include "libmythbase/mythmedia.h" #include "libmythbase/mythmiscutil.h" -#include "libmythbase/programinfo.h" -#include "libmythbase/programinforemoteutil.h" -#include "libmythbase/programtypes.h" #include "libmythbase/signalhandling.h" #include "libmythbase/stringutil.h" @@ -65,6 +62,9 @@ #include "mythtvactionutils.h" #include "playercontext.h" #include "playgroup.h" +#include "programinfo.h" +#include "programinforemoteutil.h" +#include "programtypes.h" #include "recordinginfo.h" #include "recordingrule.h" #include "remoteencoder.h" diff --git a/mythtv/libs/libmythtv/tv_rec.cpp b/mythtv/libs/libmythtv/tv_rec.cpp index 149c24df921..a0a83afe5b2 100644 --- a/mythtv/libs/libmythtv/tv_rec.cpp +++ b/mythtv/libs/libmythtv/tv_rec.cpp @@ -16,7 +16,6 @@ #include "libmythbase/mythdb.h" #include "libmythbase/mythlogging.h" #include "libmythbase/mythrandom.h" -#include "libmythbase/programinfo.h" #include "libmythbase/storagegroup.h" #include "cardutil.h" @@ -31,6 +30,7 @@ #include "mythsystemevent.h" #include "osd.h" #include "previewgeneratorqueue.h" +#include "programinfo.h" #include "recorders/channelbase.h" #include "recorders/dtvchannel.h" #include "recorders/dtvrecorder.h" diff --git a/mythtv/libs/libmythtv/tv_rec.h b/mythtv/libs/libmythtv/tv_rec.h index a06bab04d66..c5d764825a6 100644 --- a/mythtv/libs/libmythtv/tv_rec.h +++ b/mythtv/libs/libmythtv/tv_rec.h @@ -22,10 +22,10 @@ #include "libmythbase/mythconfig.h" #include "libmythbase/mythdeque.h" #include "libmythbase/mythtimer.h" -#include "libmythbase/programtypes.h" // for RecStatus, RecStatus::Type, etc #include "inputinfo.h" #include "mythtvexp.h" // for MTV_PUBLIC +#include "programtypes.h" // for RecStatus, RecStatus::Type, etc #include "recordinginfo.h" #include "signalmonitorlistener.h" #include "tv.h" diff --git a/mythtv/libs/libmythtv/tvbrowsehelper.h b/mythtv/libs/libmythtv/tvbrowsehelper.h index 7304e79380b..cea35ba1d6f 100644 --- a/mythtv/libs/libmythtv/tvbrowsehelper.h +++ b/mythtv/libs/libmythtv/tvbrowsehelper.h @@ -9,8 +9,8 @@ // MythTV #include "libmythbase/mthread.h" -#include "libmythbase/programtypes.h" #include "channelinfo.h" +#include "programtypes.h" #include "tv.h" // Std diff --git a/mythtv/libs/libmythtv/tvremoteutil.cpp b/mythtv/libs/libmythtv/tvremoteutil.cpp index 5a93a1d1c2c..5c2ddf49972 100644 --- a/mythtv/libs/libmythtv/tvremoteutil.cpp +++ b/mythtv/libs/libmythtv/tvremoteutil.cpp @@ -3,10 +3,10 @@ #include "libmythbase/mythcorecontext.h" #include "libmythbase/mythlogging.h" -#include "libmythbase/programinfo.h" #include "cardutil.h" #include "inputinfo.h" +#include "programinfo.h" #include "remoteencoder.h" #include "tv_rec.h" #include "tvremoteutil.h" diff --git a/mythtv/programs/mythavtest/mythavtest.cpp b/mythtv/programs/mythavtest/mythavtest.cpp index a67e7a8580c..82882f9396a 100644 --- a/mythtv/programs/mythavtest/mythavtest.cpp +++ b/mythtv/programs/mythavtest/mythavtest.cpp @@ -19,11 +19,11 @@ #include "libmythbase/mythlogging.h" #include "libmythbase/mythmiscutil.h" #include "libmythbase/mythversion.h" -#include "libmythbase/programinfo.h" #include "libmythtv/dbcheck.h" #include "libmythtv/jitterometer.h" #include "libmythtv/mythplayerui.h" #include "libmythtv/mythvideoout.h" +#include "libmythtv/programinfo.h" #include "libmythtv/tv_play.h" #include "libmythui/mythmainwindow.h" #include "libmythui/mythuihelper.h" diff --git a/mythtv/programs/mythbackend/autoexpire.cpp b/mythtv/programs/mythbackend/autoexpire.cpp index bce40fb79d9..9c89833bd04 100644 --- a/mythtv/programs/mythbackend/autoexpire.cpp +++ b/mythtv/programs/mythbackend/autoexpire.cpp @@ -29,9 +29,9 @@ #include "libmythbase/mythdate.h" #include "libmythbase/mythdb.h" #include "libmythbase/mythlogging.h" -#include "libmythbase/programinfo.h" #include "libmythbase/storagegroup.h" #include "libmythprotoserver/requesthandler/fileserverutil.h" +#include "libmythtv/programinfo.h" #include "libmythtv/remoteencoder.h" #include "libmythtv/tv_rec.h" diff --git a/mythtv/programs/mythbackend/backendhousekeeper.cpp b/mythtv/programs/mythbackend/backendhousekeeper.cpp index 1e6302bcb52..92366c5889e 100644 --- a/mythtv/programs/mythbackend/backendhousekeeper.cpp +++ b/mythtv/programs/mythbackend/backendhousekeeper.cpp @@ -22,12 +22,12 @@ #include "libmythbase/mythlogging.h" #include "libmythbase/mythsystemlegacy.h" #include "libmythbase/mythversion.h" -#include "libmythbase/programtypes.h" -#include "libmythbase/recordingstatus.h" -#include "libmythbase/recordingtypes.h" #include "libmythbase/unziputil.h" #include "libmythmetadata/musicmetadata.h" #include "libmythtv/jobqueue.h" +#include "libmythtv/programtypes.h" +#include "libmythtv/recordingstatus.h" +#include "libmythtv/recordingtypes.h" // MythBackend #include "backendhousekeeper.h" diff --git a/mythtv/programs/mythbackend/encoderlink.cpp b/mythtv/programs/mythbackend/encoderlink.cpp index 4375c7493e8..4d42702aa25 100644 --- a/mythtv/programs/mythbackend/encoderlink.cpp +++ b/mythtv/programs/mythbackend/encoderlink.cpp @@ -11,10 +11,10 @@ #include "libmythbase/mythcorecontext.h" #include "libmythbase/mythdate.h" #include "libmythbase/mythlogging.h" // for LOG -#include "libmythbase/programinfo.h" // for ProgramInfo #include "libmythbase/referencecounter.h" #include "libmythprotoserver/requesthandler/fileserverutil.h" #include "libmythtv/inputinfo.h" // for InputInfo +#include "libmythtv/programinfo.h" // for ProgramInfo #include "libmythtv/tv_rec.h" // MythBackend diff --git a/mythtv/programs/mythbackend/encoderlink.h b/mythtv/programs/mythbackend/encoderlink.h index bf79ed6e7c0..b25412a8036 100644 --- a/mythtv/programs/mythbackend/encoderlink.h +++ b/mythtv/programs/mythbackend/encoderlink.h @@ -10,7 +10,7 @@ #include // for QMutex #include // for QString -#include "libmythbase/recordingstatus.h" +#include "libmythtv/recordingstatus.h" #include "libmythtv/tv.h" // for SleepStatus, etc #include "libmythtv/videoouttypes.h" // for PictureAttribute diff --git a/mythtv/programs/mythbackend/filetransfer.cpp b/mythtv/programs/mythbackend/filetransfer.cpp index d211070e172..9f392c67297 100644 --- a/mythtv/programs/mythbackend/filetransfer.cpp +++ b/mythtv/programs/mythbackend/filetransfer.cpp @@ -10,8 +10,8 @@ #include "libmythbase/mythdate.h" #include "libmythbase/mythlogging.h" #include "libmythbase/mythsocket.h" -#include "libmythbase/programinfo.h" #include "libmythtv/io/mythmediabuffer.h" +#include "libmythtv/programinfo.h" // MythBackend #include "filetransfer.h" diff --git a/mythtv/programs/mythbackend/httpstatus.h b/mythtv/programs/mythbackend/httpstatus.h index 4f78dd9bc5b..d11b7060192 100644 --- a/mythtv/programs/mythbackend/httpstatus.h +++ b/mythtv/programs/mythbackend/httpstatus.h @@ -15,7 +15,7 @@ #include #include -#include "libmythbase/programinfo.h" +#include "libmythtv/programinfo.h" #include "libmythupnp/httpserver.h" enum HttpStatusMethod : std::uint8_t diff --git a/mythtv/programs/mythbackend/mainserver.cpp b/mythtv/programs/mythbackend/mainserver.cpp index d30fae7f203..575015e4304 100644 --- a/mythtv/programs/mythbackend/mainserver.cpp +++ b/mythtv/programs/mythbackend/mainserver.cpp @@ -52,7 +52,6 @@ #include "libmythbase/mythsystemlegacy.h" #include "libmythbase/mythtimezone.h" #include "libmythbase/mythversion.h" -#include "libmythbase/programinfo.h" #include "libmythbase/remotefile.h" #include "libmythbase/serverpool.h" #include "libmythbase/storagegroup.h" @@ -68,6 +67,7 @@ #include "libmythtv/jobqueue.h" #include "libmythtv/mythsystemevent.h" #include "libmythtv/previewgeneratorqueue.h" +#include "libmythtv/programinfo.h" #include "libmythtv/recordinginfo.h" #include "libmythtv/recordingrule.h" #include "libmythtv/scheduledrecording.h" diff --git a/mythtv/programs/mythbackend/mythbackend.cpp b/mythtv/programs/mythbackend/mythbackend.cpp index 3777d5f7461..8b332a09196 100644 --- a/mythtv/programs/mythbackend/mythbackend.cpp +++ b/mythtv/programs/mythbackend/mythbackend.cpp @@ -36,7 +36,6 @@ #include "libmythbase/mythmiscutil.h" #include "libmythbase/mythtranslation.h" #include "libmythbase/mythversion.h" -#include "libmythbase/programinfo.h" #include "libmythbase/storagegroup.h" #include "libmythtv/dbcheck.h" #include "libmythtv/jobqueue.h" diff --git a/mythtv/programs/mythbackend/mythbackend_main_helpers.cpp b/mythtv/programs/mythbackend/mythbackend_main_helpers.cpp index 7a4747c1a0a..b87efde9813 100644 --- a/mythtv/programs/mythbackend/mythbackend_main_helpers.cpp +++ b/mythtv/programs/mythbackend/mythbackend_main_helpers.cpp @@ -34,13 +34,13 @@ static inline void be_sd_notify(const char */*str*/) {}; #include "libmythbase/mythtimezone.h" #include "libmythbase/mythtranslation.h" #include "libmythbase/mythversion.h" -#include "libmythbase/programinfo.h" #include "libmythbase/storagegroup.h" #include "libmythtv/dbcheck.h" #include "libmythtv/eitcache.h" #include "libmythtv/jobqueue.h" #include "libmythtv/mythsystemevent.h" #include "libmythtv/previewgenerator.h" +#include "libmythtv/programinfo.h" #include "libmythtv/scheduledrecording.h" #include "libmythtv/tv_rec.h" #include "libmythupnp/ssdp.h" diff --git a/mythtv/programs/mythbackend/playbacksock.cpp b/mythtv/programs/mythbackend/playbacksock.cpp index 798a22919e3..bdae2b99d28 100644 --- a/mythtv/programs/mythbackend/playbacksock.cpp +++ b/mythtv/programs/mythbackend/playbacksock.cpp @@ -9,9 +9,9 @@ #include "libmythbase/mythcorecontext.h" #include "libmythbase/mythdate.h" #include "libmythbase/mythlogging.h" -#include "libmythbase/programinfo.h" #include "libmythbase/referencecounter.h" #include "libmythtv/inputinfo.h" +#include "libmythtv/programinfo.h" // MythBackend #include "mainserver.h" diff --git a/mythtv/programs/mythbackend/playbacksock.h b/mythtv/programs/mythbackend/playbacksock.h index 520d61a793e..a2f32f8ebc8 100644 --- a/mythtv/programs/mythbackend/playbacksock.h +++ b/mythtv/programs/mythbackend/playbacksock.h @@ -9,10 +9,10 @@ #include #include "libmythbase/filesysteminfo.h" -#include "libmythbase/programinfo.h" // ProgramInfo -#include "libmythbase/programtypes.h" // RecStatus::Type #include "libmythbase/referencecounter.h" #include "libmythtv/inputinfo.h" +#include "libmythtv/programinfo.h" // ProgramInfo +#include "libmythtv/recordingstatus.h" // RecStatus::Type class MythSocket; class MainServer; diff --git a/mythtv/programs/mythbackend/servicesv2/v2channel.cpp b/mythtv/programs/mythbackend/servicesv2/v2channel.cpp index fec64efabe8..c0468f35d18 100644 --- a/mythtv/programs/mythbackend/servicesv2/v2channel.cpp +++ b/mythtv/programs/mythbackend/servicesv2/v2channel.cpp @@ -40,7 +40,6 @@ #include "libmythbase/mythdirs.h" #include "libmythbase/mythlogging.h" #include "libmythbase/mythversion.h" -#include "libmythbase/programtypes.h" #include "libmythbase/mythdownloadmanager.h" #include "libmythtv/channelutil.h" #include "libmythtv/channelscan/scanwizardconfig.h" @@ -52,6 +51,7 @@ #include "libmythbase/mythdate.h" #include "libmythtv/frequencies.h" #include "libmythbase/mythsystemlegacy.h" +#include "libmythtv/programtypes.h" #include "libmythtv/restoredata.h" #include "libmythtv/scheduledrecording.h" diff --git a/mythtv/programs/mythbackend/servicesv2/v2content.cpp b/mythtv/programs/mythbackend/servicesv2/v2content.cpp index cd78196d4de..9af1d527f66 100644 --- a/mythtv/programs/mythbackend/servicesv2/v2content.cpp +++ b/mythtv/programs/mythbackend/servicesv2/v2content.cpp @@ -39,7 +39,6 @@ #include "libmythbase/mythdownloadmanager.h" #include "libmythbase/mythlogging.h" #include "libmythbase/mythmiscutil.h" -#include "libmythbase/programinfo.h" #include "libmythbase/remotefile.h" #include "libmythbase/storagegroup.h" #include "libmythmetadata/musicmetadata.h" @@ -47,6 +46,7 @@ #include "libmythprotoserver/requesthandler/fileserverutil.h" #include "libmythtv/metadataimagehelper.h" #include "libmythtv/previewgenerator.h" +#include "libmythtv/programinfo.h" // MythBackend #include "v2content.h" diff --git a/mythtv/programs/mythbackend/servicesv2/v2dvr.cpp b/mythtv/programs/mythbackend/servicesv2/v2dvr.cpp index 8bbb3ad5327..ae264435d97 100644 --- a/mythtv/programs/mythbackend/servicesv2/v2dvr.cpp +++ b/mythtv/programs/mythbackend/servicesv2/v2dvr.cpp @@ -34,13 +34,13 @@ #include "libmythbase/mythscheduler.h" #include "libmythbase/mythsorthelper.h" #include "libmythbase/mythversion.h" -#include "libmythbase/programinfo.h" #include "libmythbase/storagegroup.h" #include "libmythtv/cardutil.h" #include "libmythtv/channelutil.h" #include "libmythtv/jobqueue.h" #include "libmythtv/playgroup.h" #include "libmythtv/programdata.h" +#include "libmythtv/programinfo.h" #include "libmythtv/tv_rec.h" // MythBackend diff --git a/mythtv/programs/mythbackend/servicesv2/v2guide.cpp b/mythtv/programs/mythbackend/servicesv2/v2guide.cpp index d6fd6597d15..4025560236d 100644 --- a/mythtv/programs/mythbackend/servicesv2/v2guide.cpp +++ b/mythtv/programs/mythbackend/servicesv2/v2guide.cpp @@ -36,6 +36,7 @@ #include "libmythbase/storagegroup.h" #include "libmythtv/channelgroup.h" #include "libmythtv/channelutil.h" +#include "libmythtv/programinfo.h" // MythBackend #include "autoexpire.h" diff --git a/mythtv/programs/mythbackend/servicesv2/v2guide.h b/mythtv/programs/mythbackend/servicesv2/v2guide.h index 4b15017cbb5..9687f01c761 100644 --- a/mythtv/programs/mythbackend/servicesv2/v2guide.h +++ b/mythtv/programs/mythbackend/servicesv2/v2guide.h @@ -31,7 +31,6 @@ // MythTV #include "libmythbase/http/mythhttpservice.h" -#include "libmythbase/programinfo.h" // MythBackend #include "v2channelGroupList.h" diff --git a/mythtv/programs/mythbackend/servicesv2/v2recording.h b/mythtv/programs/mythbackend/servicesv2/v2recording.h index 47198452084..ebe0915cee9 100644 --- a/mythtv/programs/mythbackend/servicesv2/v2recording.h +++ b/mythtv/programs/mythbackend/servicesv2/v2recording.h @@ -17,8 +17,8 @@ // MythTV #include "libmythbase/http/mythhttpservice.h" -#include "libmythbase/programtypes.h" -#include "libmythbase/recordingstatus.h" +#include "libmythtv/programtypes.h" +#include "libmythtv/recordingstatus.h" class V2RecordingInfo : public QObject { diff --git a/mythtv/programs/mythbackend/servicesv2/v2serviceUtil.cpp b/mythtv/programs/mythbackend/servicesv2/v2serviceUtil.cpp index c437e7fe14c..7bfadd748af 100644 --- a/mythtv/programs/mythbackend/servicesv2/v2serviceUtil.cpp +++ b/mythtv/programs/mythbackend/servicesv2/v2serviceUtil.cpp @@ -20,16 +20,16 @@ #include "libmythbase/mythlogging.h" #include "libmythbase/mythscheduler.h" // #include "libmythbase/mythsorthelper.h" -#include "libmythbase/programinfo.h" -#include "libmythbase/programtypes.h" -#include "libmythbase/recordingtypes.h" #include "libmythmetadata/videoutils.h" #include "libmythtv/cardutil.h" #include "libmythtv/channelgroup.h" #include "libmythtv/channelinfo.h" #include "libmythtv/channelutil.h" +#include "libmythtv/programinfo.h" +#include "libmythtv/programtypes.h" #include "libmythtv/recorders/firewiredevice.h" #include "libmythtv/recordinginfo.h" +#include "libmythtv/recordingtypes.h" #include "libmythtv/tv_rec.h" // MythBackend diff --git a/mythtv/programs/mythbackend/servicesv2/v2status.h b/mythtv/programs/mythbackend/servicesv2/v2status.h index d4b913b4c03..2c353d9d77c 100644 --- a/mythtv/programs/mythbackend/servicesv2/v2status.h +++ b/mythtv/programs/mythbackend/servicesv2/v2status.h @@ -20,7 +20,7 @@ #include "libmythbase/http/mythhttpdata.h" #include "libmythbase/http/mythhttpservice.h" #include "libmythbase/http/mythmimedatabase.h" -#include "libmythbase/programinfo.h" +#include "libmythtv/programinfo.h" // MythBackend #include "preformat.h" diff --git a/mythtv/programs/mythbackend/servicesv2/v2video.cpp b/mythtv/programs/mythbackend/servicesv2/v2video.cpp index dd8d616ea0d..cde2aeb42a8 100644 --- a/mythtv/programs/mythbackend/servicesv2/v2video.cpp +++ b/mythtv/programs/mythbackend/servicesv2/v2video.cpp @@ -7,13 +7,13 @@ #include "libmythbase/mythmiscutil.h" #include "libmythbase/mythsorthelper.h" #include "libmythbase/mythversion.h" -#include "libmythbase/programinfo.h" #include "libmythbase/storagegroup.h" #include "libmythmetadata/bluraymetadata.h" #include "libmythmetadata/globals.h" #include "libmythmetadata/metadatafactory.h" #include "libmythmetadata/videometadata.h" #include "libmythtv/mythavutil.h" +#include "libmythtv/programinfo.h" // MythBackend #include "v2artworkInfoList.h" diff --git a/mythtv/programs/mythccextractor/mythccextractor.cpp b/mythtv/programs/mythccextractor/mythccextractor.cpp index 0e4862b319b..788afcdb8b6 100644 --- a/mythtv/programs/mythccextractor/mythccextractor.cpp +++ b/mythtv/programs/mythccextractor/mythccextractor.cpp @@ -13,9 +13,9 @@ #include "libmythbase/exitcodes.h" #include "libmythbase/mythappname.h" #include "libmythbase/mythversion.h" -#include "libmythbase/programinfo.h" #include "libmythtv/io/mythmediabuffer.h" #include "libmythtv/mythccextractorplayer.h" +#include "libmythtv/programinfo.h" // MythCCExtractor #include "mythccextractor_commandlineparser.h" diff --git a/mythtv/programs/mythcommflag/ClassicCommDetector.cpp b/mythtv/programs/mythcommflag/ClassicCommDetector.cpp index 9c9744064ba..dccaeb5e6d9 100644 --- a/mythtv/programs/mythcommflag/ClassicCommDetector.cpp +++ b/mythtv/programs/mythcommflag/ClassicCommDetector.cpp @@ -12,9 +12,9 @@ #include "libmythbase/mythcorecontext.h" #include "libmythbase/mythlogging.h" #include "libmythbase/mythmiscutil.h" -#include "libmythbase/programinfo.h" #include "libmythbase/sizetliteral.h" #include "libmythtv/mythcommflagplayer.h" +#include "libmythtv/programtypes.h" // Commercial Flagging headers #include "ClassicCommDetector.h" diff --git a/mythtv/programs/mythcommflag/ClassicCommDetector.h b/mythtv/programs/mythcommflag/ClassicCommDetector.h index 7f37f709f7c..26456fad8c2 100644 --- a/mythtv/programs/mythcommflag/ClassicCommDetector.h +++ b/mythtv/programs/mythcommflag/ClassicCommDetector.h @@ -11,8 +11,8 @@ #include // MythTV headers -#include "libmythbase/programinfo.h" #include "libmythtv/mythframe.h" +#include "libmythtv/programtypes.h" // Commercial Flagging headers #include "CommDetectorBase.h" diff --git a/mythtv/programs/mythcommflag/CommDetector2.cpp b/mythtv/programs/mythcommflag/CommDetector2.cpp index 8ae2f8e63e1..d4bee7db690 100644 --- a/mythtv/programs/mythcommflag/CommDetector2.cpp +++ b/mythtv/programs/mythcommflag/CommDetector2.cpp @@ -14,9 +14,9 @@ #include "libmythbase/mythdate.h" #include "libmythbase/mythdb.h" #include "libmythbase/mythlogging.h" -#include "libmythbase/programinfo.h" #include "libmythtv/channelutil.h" #include "libmythtv/mythcommflagplayer.h" +#include "libmythtv/programinfo.h" // Commercial Flagging headers #include "BlankFrameDetector.h" diff --git a/mythtv/programs/mythcommflag/CommDetector2.h b/mythtv/programs/mythcommflag/CommDetector2.h index b3eb010f255..eab33cf5c33 100644 --- a/mythtv/programs/mythcommflag/CommDetector2.h +++ b/mythtv/programs/mythcommflag/CommDetector2.h @@ -8,7 +8,7 @@ #include // MythTV headers -#include "libmythbase/programinfo.h" +#include "libmythtv/programtypes.h" // Commercial Flagging headers #include "CommDetectorBase.h" diff --git a/mythtv/programs/mythcommflag/CommDetectorBase.h b/mythtv/programs/mythcommflag/CommDetectorBase.h index 080255c88b0..2a6cb3f5db4 100644 --- a/mythtv/programs/mythcommflag/CommDetectorBase.h +++ b/mythtv/programs/mythcommflag/CommDetectorBase.h @@ -6,7 +6,7 @@ #include #include -#include "libmythbase/programtypes.h" +#include "libmythtv/programtypes.h" static constexpr int64_t MAX_BLANK_FRAMES { 180 }; diff --git a/mythtv/programs/mythcommflag/CommDetectorFactory.h b/mythtv/programs/mythcommflag/CommDetectorFactory.h index e03a21e6641..7944a9ae0ec 100644 --- a/mythtv/programs/mythcommflag/CommDetectorFactory.h +++ b/mythtv/programs/mythcommflag/CommDetectorFactory.h @@ -1,7 +1,7 @@ #ifndef COMMDETECTOR_FACTORY_H #define COMMDETECTOR_FACTORY_H -#include "libmythbase/programinfo.h" +#include "libmythtv/programtypes.h" class CommDetectorBase; class MythCommFlagPlayer; diff --git a/mythtv/programs/mythcommflag/PrePostRollFlagger.cpp b/mythtv/programs/mythcommflag/PrePostRollFlagger.cpp index 873bf939b96..b4f7fe51c32 100644 --- a/mythtv/programs/mythcommflag/PrePostRollFlagger.cpp +++ b/mythtv/programs/mythcommflag/PrePostRollFlagger.cpp @@ -9,8 +9,8 @@ // MythTV headers #include "libmythbase/mythcorecontext.h" #include "libmythbase/mythlogging.h" -#include "libmythbase/programinfo.h" #include "libmythtv/mythcommflagplayer.h" +#include "libmythtv/programinfo.h" PrePostRollFlagger::PrePostRollFlagger(SkipType commDetectMethod, bool showProgress, bool fullSpeed, diff --git a/mythtv/programs/mythcommflag/mythcommflag.cpp b/mythtv/programs/mythcommflag/mythcommflag.cpp index fcf6c0b74d5..d3d35cac12f 100644 --- a/mythtv/programs/mythcommflag/mythcommflag.cpp +++ b/mythtv/programs/mythcommflag/mythcommflag.cpp @@ -34,11 +34,11 @@ #include "libmythbase/mythmiscutil.h" #include "libmythbase/mythtranslation.h" #include "libmythbase/mythversion.h" -#include "libmythbase/programinfo.h" #include "libmythbase/remotefile.h" #include "libmythtv/io/mythmediabuffer.h" #include "libmythtv/jobqueue.h" #include "libmythtv/mythcommflagplayer.h" +#include "libmythtv/programinfo.h" #include "libmythtv/remoteencoder.h" #include "libmythtv/tvremoteutil.h" diff --git a/mythtv/programs/mythfilldatabase/xmltvparser.cpp b/mythtv/programs/mythfilldatabase/xmltvparser.cpp index 14557c2c09c..95548f36c9c 100644 --- a/mythtv/programs/mythfilldatabase/xmltvparser.cpp +++ b/mythtv/programs/mythfilldatabase/xmltvparser.cpp @@ -17,11 +17,11 @@ #include "libmythbase/exitcodes.h" #include "libmythbase/mythdate.h" #include "libmythbase/mythlogging.h" -#include "libmythbase/programinfo.h" #include "libmythmetadata/metadatadownload.h" #include "libmythtv/channelinfo.h" #include "libmythtv/mpeg/dvbdescriptors.h" #include "libmythtv/programdata.h" +#include "libmythtv/programinfo.h" // filldata headers #include "channeldata.h" diff --git a/mythtv/programs/mythfrontend/channelrecpriority.h b/mythtv/programs/mythfrontend/channelrecpriority.h index 8b9dbc82563..5b5e1c4ca23 100644 --- a/mythtv/programs/mythfrontend/channelrecpriority.h +++ b/mythtv/programs/mythfrontend/channelrecpriority.h @@ -1,7 +1,6 @@ #ifndef CHANNELRECPRIORITY_H_ #define CHANNELRECPRIORITY_H_ -#include "libmythbase/programinfo.h" #include "libmythui/mythscreentype.h" class ChannelInfo; diff --git a/mythtv/programs/mythfrontend/customedit.h b/mythtv/programs/mythfrontend/customedit.h index 0c595ddb094..166dd27f629 100644 --- a/mythtv/programs/mythfrontend/customedit.h +++ b/mythtv/programs/mythfrontend/customedit.h @@ -1,8 +1,8 @@ #ifndef CUSTOMEDIT_H_ #define CUSTOMEDIT_H_ -#include "libmythbase/programinfo.h" #include "libmythtv/mythplayer.h" +#include "libmythtv/programinfo.h" #include "libmythui/mythscreentype.h" class MythUITextEdit; diff --git a/mythtv/programs/mythfrontend/custompriority.h b/mythtv/programs/mythfrontend/custompriority.h index 2eb06edc706..8878f99c35f 100644 --- a/mythtv/programs/mythfrontend/custompriority.h +++ b/mythtv/programs/mythfrontend/custompriority.h @@ -1,7 +1,7 @@ #ifndef CUSTOMPRIORITY_H_ #define CUSTOMPRIORITY_H_ -#include "libmythbase/programinfo.h" +#include "libmythtv/programinfo.h" #include "libmythui/mythscreentype.h" class MythUITextEdit; diff --git a/mythtv/programs/mythfrontend/guidegrid.cpp b/mythtv/programs/mythfrontend/guidegrid.cpp index 7d640faafe0..9bc6b8c1b76 100644 --- a/mythtv/programs/mythfrontend/guidegrid.cpp +++ b/mythtv/programs/mythfrontend/guidegrid.cpp @@ -16,13 +16,13 @@ #include "libmythbase/mythevent.h" // for MythEvent, etc #include "libmythbase/mythlogging.h" #include "libmythbase/mythtypes.h" // for InfoMap -#include "libmythbase/programinfo.h" -#include "libmythbase/programtypes.h" // for RecStatus, etc -#include "libmythbase/recordingtypes.h" // for toString, etc #include "libmythtv/cardutil.h" #include "libmythtv/channelinfo.h" #include "libmythtv/channelutil.h" +#include "libmythtv/programinfo.h" +#include "libmythtv/programtypes.h" #include "libmythtv/recordingrule.h" +#include "libmythtv/recordingtypes.h" #include "libmythtv/tv.h" // for ::kState_WatchingLiveTV #include "libmythtv/tv_actions.h" // for ACTION_CHANNELSEARCH, etc #include "libmythtv/tv_play.h" diff --git a/mythtv/programs/mythfrontend/guidegrid.h b/mythtv/programs/mythfrontend/guidegrid.h index 46d7914bcab..5c593e28458 100644 --- a/mythtv/programs/mythfrontend/guidegrid.h +++ b/mythtv/programs/mythfrontend/guidegrid.h @@ -14,9 +14,9 @@ // MythTV #include "libmythbase/mthreadpool.h" -#include "libmythbase/programinfo.h" #include "libmythtv/channelgroup.h" #include "libmythtv/channelutil.h" +#include "libmythtv/programinfo.h" #include "libmythtv/tv_play.h" #include "libmythui/mythscreentype.h" #include "libmythui/mythuiguidegrid.h" diff --git a/mythtv/programs/mythfrontend/idlescreen.cpp b/mythtv/programs/mythfrontend/idlescreen.cpp index f6b899df736..80b55ece920 100644 --- a/mythtv/programs/mythfrontend/idlescreen.cpp +++ b/mythtv/programs/mythfrontend/idlescreen.cpp @@ -8,7 +8,7 @@ #include "libmythbase/mythcorecontext.h" #include "libmythbase/mythlogging.h" #include "libmythbase/mythsystemlegacy.h" -#include "libmythbase/programinfo.h" +#include "libmythtv/programinfo.h" #include "libmythtv/tvremoteutil.h" #include "libmythui/mythmainwindow.h" #include "libmythui/mythuibuttonlist.h" diff --git a/mythtv/programs/mythfrontend/idlescreen.h b/mythtv/programs/mythfrontend/idlescreen.h index 9cad86a2412..ac00194b53f 100644 --- a/mythtv/programs/mythfrontend/idlescreen.h +++ b/mythtv/programs/mythfrontend/idlescreen.h @@ -2,7 +2,7 @@ #define IDLESCREEN_H // MythTV -#include "libmythbase/programinfo.h" +#include "libmythtv/programinfo.h" #include "libmythui/mythscreentype.h" class MythUIStateType; diff --git a/mythtv/programs/mythfrontend/manualschedule.cpp b/mythtv/programs/mythfrontend/manualschedule.cpp index a1c24faff0d..759f4b08a46 100644 --- a/mythtv/programs/mythfrontend/manualschedule.cpp +++ b/mythtv/programs/mythfrontend/manualschedule.cpp @@ -7,11 +7,11 @@ #include "libmythbase/mythdate.h" #include "libmythbase/mythdbcon.h" #include "libmythbase/mythlogging.h" -#include "libmythbase/programinfo.h" -#include "libmythbase/recordingtypes.h" #include "libmythtv/channelinfo.h" #include "libmythtv/channelutil.h" +#include "libmythtv/programinfo.h" #include "libmythtv/recordingrule.h" +#include "libmythtv/recordingtypes.h" #include "libmythui/mythmainwindow.h" #include "libmythui/mythuibutton.h" #include "libmythui/mythuibuttonlist.h" diff --git a/mythtv/programs/mythfrontend/mythfrontend.cpp b/mythtv/programs/mythfrontend/mythfrontend.cpp index 3ffe76b19a6..c728f326a93 100644 --- a/mythtv/programs/mythfrontend/mythfrontend.cpp +++ b/mythtv/programs/mythfrontend/mythfrontend.cpp @@ -60,7 +60,6 @@ #include "libmythbase/mythsystemlegacy.h" #include "libmythbase/mythtranslation.h" #include "libmythbase/mythversion.h" -#include "libmythbase/programinfo.h" #include "libmythbase/referencecounter.h" #include "libmythbase/signalhandling.h" #include "libmythmetadata/cleanup.h" @@ -70,6 +69,7 @@ #include "libmythtv/mythsystemevent.h" #include "libmythtv/playgroup.h" #include "libmythtv/previewgeneratorqueue.h" +#include "libmythtv/programinfo.h" #include "libmythtv/scheduledrecording.h" #include "libmythtv/tv.h" #include "libmythtv/tvremoteutil.h" diff --git a/mythtv/programs/mythfrontend/networkcontrol.cpp b/mythtv/programs/mythfrontend/networkcontrol.cpp index 873f6172a38..210f2423417 100644 --- a/mythtv/programs/mythfrontend/networkcontrol.cpp +++ b/mythtv/programs/mythfrontend/networkcontrol.cpp @@ -23,7 +23,6 @@ #include "libmythbase/mythlogging.h" #include "libmythbase/mythmiscutil.h" #include "libmythbase/mythversion.h" -#include "libmythbase/programinfo.h" #include "libmythtv/mythsystemevent.h" #include "libmythtv/previewgenerator.h" #include "libmythui/mythmainwindow.h" diff --git a/mythtv/programs/mythfrontend/playbackbox.cpp b/mythtv/programs/mythfrontend/playbackbox.cpp index 3b0a06d49dd..99a609b353c 100644 --- a/mythtv/programs/mythfrontend/playbackbox.cpp +++ b/mythtv/programs/mythfrontend/playbackbox.cpp @@ -23,15 +23,15 @@ #include "libmythbase/mythevent.h" // for MythEvent, etc #include "libmythbase/mythlogging.h" #include "libmythbase/mythrandom.h" -#include "libmythbase/programinfo.h" -#include "libmythbase/programtypes.h" // for AudioProps, SubtitleTypes, etc -#include "libmythbase/recordingtypes.h" #include "libmythbase/stringutil.h" #include "libmythmetadata/mythuimetadataresults.h" #include "libmythtv/playgroup.h" #include "libmythtv/previewgeneratorqueue.h" +#include "libmythtv/programinfo.h" +#include "libmythtv/programtypes.h" #include "libmythtv/recordinginfo.h" #include "libmythtv/recordingrule.h" +#include "libmythtv/recordingtypes.h" #include "libmythtv/tv.h" #include "libmythtv/tv_actions.h" // for ACTION_LISTRECORDEDEPISODES, etc #include "libmythui/mythdialogbox.h" diff --git a/mythtv/programs/mythfrontend/playbackboxhelper.cpp b/mythtv/programs/mythfrontend/playbackboxhelper.cpp index e2f9d926cd7..28225ada7c6 100644 --- a/mythtv/programs/mythfrontend/playbackboxhelper.cpp +++ b/mythtv/programs/mythfrontend/playbackboxhelper.cpp @@ -16,11 +16,11 @@ #include "libmythbase/mythevent.h" #include "libmythbase/mythlogging.h" #include "libmythbase/mythrandom.h" -#include "libmythbase/programinfo.h" -#include "libmythbase/programinforemoteutil.h" #include "libmythbase/storagegroup.h" #include "libmythtv/metadataimagehelper.h" #include "libmythtv/previewgeneratorqueue.h" +#include "libmythtv/programinfo.h" +#include "libmythtv/programinforemoteutil.h" #include "libmythtv/tvremoteutil.h" // MythFrontend diff --git a/mythtv/programs/mythfrontend/playbackboxlistitem.cpp b/mythtv/programs/mythfrontend/playbackboxlistitem.cpp index c989185867b..2fc9ac42894 100644 --- a/mythtv/programs/mythfrontend/playbackboxlistitem.cpp +++ b/mythtv/programs/mythfrontend/playbackboxlistitem.cpp @@ -1,5 +1,5 @@ // MythTV -#include "libmythbase/programinfo.h" +#include "libmythtv/programinfo.h" // MythFrontend #include "playbackbox.h" diff --git a/mythtv/programs/mythfrontend/playbackstate.cpp b/mythtv/programs/mythfrontend/playbackstate.cpp index 1fde21b6ae4..c7f308206a5 100644 --- a/mythtv/programs/mythfrontend/playbackstate.cpp +++ b/mythtv/programs/mythfrontend/playbackstate.cpp @@ -5,8 +5,8 @@ #include "libmythbase/mythdb.h" #include "libmythbase/mythdbcon.h" #include "libmythbase/mythlogging.h" -#include "libmythbase/programtypes.h" #include "libmythmetadata/videometadata.h" +#include "libmythtv/programtypes.h" PlaybackState::PlaybackState() { diff --git a/mythtv/programs/mythfrontend/prevreclist.h b/mythtv/programs/mythfrontend/prevreclist.h index d5acbbc39ab..226fe7651f1 100644 --- a/mythtv/programs/mythfrontend/prevreclist.h +++ b/mythtv/programs/mythfrontend/prevreclist.h @@ -21,7 +21,7 @@ #define PREVRECLIST_H_ // MythTV -#include "libmythbase/programinfo.h" +#include "libmythtv/programinfo.h" // mythfrontend #include "schedulecommon.h" diff --git a/mythtv/programs/mythfrontend/progdetails.h b/mythtv/programs/mythfrontend/progdetails.h index d742e824e1d..b4704074e4a 100644 --- a/mythtv/programs/mythfrontend/progdetails.h +++ b/mythtv/programs/mythfrontend/progdetails.h @@ -6,7 +6,7 @@ #include // MythTV -#include "libmythbase/programinfo.h" +#include "libmythtv/programinfo.h" #include "libmythui/mythscreentype.h" // MythFrontend diff --git a/mythtv/programs/mythfrontend/progfind.cpp b/mythtv/programs/mythfrontend/progfind.cpp index fac45dd02b3..1cc5d588c8b 100644 --- a/mythtv/programs/mythfrontend/progfind.cpp +++ b/mythtv/programs/mythfrontend/progfind.cpp @@ -11,7 +11,7 @@ #include "libmythbase/mythdb.h" #include "libmythbase/mythdbcon.h" #include "libmythbase/mythlogging.h" -#include "libmythbase/programtypes.h" // for RecStatus +#include "libmythtv/recordingstatus.h" // for RecStatus #include "libmythtv/tv_actions.h" // for ACTION_CHANNELSEARCH #include "libmythtv/tv_play.h" #include "libmythui/mythmainwindow.h" diff --git a/mythtv/programs/mythfrontend/progfind.h b/mythtv/programs/mythfrontend/progfind.h index 08494011724..23b9d9ea0d7 100644 --- a/mythtv/programs/mythfrontend/progfind.h +++ b/mythtv/programs/mythfrontend/progfind.h @@ -6,8 +6,8 @@ #include // MythTV -#include "libmythbase/programinfo.h" #include "libmythtv/playercontext.h" +#include "libmythtv/programinfo.h" #include "libmythui/mythdialogbox.h" #include "libmythui/mythscreentype.h" diff --git a/mythtv/programs/mythfrontend/proglist.h b/mythtv/programs/mythfrontend/proglist.h index 542e3350875..113b8199656 100644 --- a/mythtv/programs/mythfrontend/proglist.h +++ b/mythtv/programs/mythfrontend/proglist.h @@ -6,7 +6,7 @@ #include // MythTV headers -#include "libmythbase/programinfo.h" // for ProgramList +#include "libmythtv/programinfo.h" // for ProgramList // MythFrontend #include "proglist_helpers.h" diff --git a/mythtv/programs/mythfrontend/proglist_helpers.h b/mythtv/programs/mythfrontend/proglist_helpers.h index 773f423ea96..d386d5c5ff7 100644 --- a/mythtv/programs/mythfrontend/proglist_helpers.h +++ b/mythtv/programs/mythfrontend/proglist_helpers.h @@ -7,7 +7,7 @@ #include // MythTV headers -#include "libmythbase/recordingtypes.h" +#include "libmythtv/recordingtypes.h" #include "libmythui/mythscreentype.h" class MythUIText; diff --git a/mythtv/programs/mythfrontend/programinfocache.cpp b/mythtv/programs/mythfrontend/programinfocache.cpp index 6c653d231f2..af9ae178e27 100644 --- a/mythtv/programs/mythfrontend/programinfocache.cpp +++ b/mythtv/programs/mythfrontend/programinfocache.cpp @@ -17,8 +17,8 @@ #include "libmythbase/mythdb.h" #include "libmythbase/mythevent.h" #include "libmythbase/mythlogging.h" -#include "libmythbase/programinfo.h" -#include "libmythbase/programinforemoteutil.h" +#include "libmythtv/programinfo.h" +#include "libmythtv/programinforemoteutil.h" // MythFrontend #include "programinfocache.h" diff --git a/mythtv/programs/mythfrontend/programrecpriority.cpp b/mythtv/programs/mythfrontend/programrecpriority.cpp index 594f0c158b8..0d035c0f70c 100644 --- a/mythtv/programs/mythfrontend/programrecpriority.cpp +++ b/mythtv/programs/mythfrontend/programrecpriority.cpp @@ -8,9 +8,9 @@ #include "libmythbase/mythdb.h" #include "libmythbase/mythcorecontext.h" #include "libmythbase/mythlogging.h" -#include "libmythbase/programinforemoteutil.h" #include "libmythbase/stringutil.h" #include "libmythbase/ternarycompare.h" +#include "libmythtv/programinforemoteutil.h" #include "libmythtv/recordingrule.h" #include "libmythtv/scheduledrecording.h" #include "libmythui/mythdialogbox.h" diff --git a/mythtv/programs/mythfrontend/schedulecommon.cpp b/mythtv/programs/mythfrontend/schedulecommon.cpp index 24ba9eb9891..25847acfa9b 100644 --- a/mythtv/programs/mythfrontend/schedulecommon.cpp +++ b/mythtv/programs/mythfrontend/schedulecommon.cpp @@ -4,9 +4,9 @@ // MythTV #include "libmythbase/mythcorecontext.h" #include "libmythbase/mythlogging.h" -#include "libmythbase/programinfo.h" -#include "libmythbase/programinforemoteutil.h" #include "libmythtv/channelutil.h" +#include "libmythtv/programinfo.h" +#include "libmythtv/programinforemoteutil.h" #include "libmythtv/recordinginfo.h" #include "libmythtv/tvremoteutil.h" #include "libmythui/mythdialogbox.h" diff --git a/mythtv/programs/mythfrontend/schedulecommon.h b/mythtv/programs/mythfrontend/schedulecommon.h index bbcaa951cc1..56d82a44e5d 100644 --- a/mythtv/programs/mythfrontend/schedulecommon.h +++ b/mythtv/programs/mythfrontend/schedulecommon.h @@ -6,9 +6,9 @@ #include // MythTV +#include "libmythtv/programinfo.h" #include "libmythui/mythmainwindow.h" #include "libmythui/mythscreentype.h" -#include "libmythbase/programinfo.h" class RecordingInfo; class MythMenu; diff --git a/mythtv/programs/mythfrontend/scheduleeditor.cpp b/mythtv/programs/mythfrontend/scheduleeditor.cpp index b98d899c11d..5f102d1e99d 100644 --- a/mythtv/programs/mythfrontend/scheduleeditor.cpp +++ b/mythtv/programs/mythfrontend/scheduleeditor.cpp @@ -10,15 +10,15 @@ #include "libmythbase/mythcorecontext.h" #include "libmythbase/mythlogging.h" #include "libmythbase/mythtypes.h" -#include "libmythbase/programtypes.h" -#include "libmythbase/recordingtypes.h" #include "libmythbase/storagegroup.h" #include "libmythmetadata/mythuiimageresults.h" #include "libmythmetadata/mythuimetadataresults.h" #include "libmythtv/cardutil.h" #include "libmythtv/metadataimagehelper.h" #include "libmythtv/playgroup.h" +#include "libmythtv/programtypes.h" #include "libmythtv/recordingprofile.h" +#include "libmythtv/recordingtypes.h" #include "libmythtv/tv_play.h" #include "libmythui/mythdialogbox.h" #include "libmythui/mythmainwindow.h" diff --git a/mythtv/programs/mythfrontend/statusbox.cpp b/mythtv/programs/mythfrontend/statusbox.cpp index 955751f71e2..4a408667607 100644 --- a/mythtv/programs/mythfrontend/statusbox.cpp +++ b/mythtv/programs/mythfrontend/statusbox.cpp @@ -11,11 +11,11 @@ #include "libmythbase/mythlogging.h" #include "libmythbase/mythmiscutil.h" #include "libmythbase/mythversion.h" -#include "libmythbase/programinforemoteutil.h" #include "libmythbase/stringutil.h" #include "libmythtv/cardutil.h" #include "libmythtv/decoders/mythcodeccontext.h" #include "libmythtv/jobqueue.h" +#include "libmythtv/programinforemoteutil.h" #include "libmythtv/recordinginfo.h" #include "libmythtv/tv.h" #include "libmythui/mythdialogbox.h" diff --git a/mythtv/programs/mythfrontend/themechooser.cpp b/mythtv/programs/mythfrontend/themechooser.cpp index 4db23c3f859..7807b40dcce 100644 --- a/mythtv/programs/mythfrontend/themechooser.cpp +++ b/mythtv/programs/mythfrontend/themechooser.cpp @@ -13,7 +13,6 @@ #include "libmythbase/mythdownloadmanager.h" #include "libmythbase/mythlogging.h" #include "libmythbase/mythversion.h" -#include "libmythbase/programtypes.h" #include "libmythbase/remotefile.h" #include "libmythbase/storagegroup.h" #include "libmythbase/unziputil.h" // for extractZIP diff --git a/mythtv/programs/mythfrontend/viewscheduled.cpp b/mythtv/programs/mythfrontend/viewscheduled.cpp index 4e400ccc336..c58afc031e6 100644 --- a/mythtv/programs/mythfrontend/viewscheduled.cpp +++ b/mythtv/programs/mythfrontend/viewscheduled.cpp @@ -7,10 +7,10 @@ // MythTV #include "libmythbase/mythcorecontext.h" #include "libmythbase/mythlogging.h" -#include "libmythbase/programtypes.h" // for RecStatus, etc -#include "libmythbase/recordingtypes.h" // for toString +#include "libmythtv/programtypes.h" #include "libmythtv/recordinginfo.h" #include "libmythtv/recordingrule.h" +#include "libmythtv/recordingtypes.h" #include "libmythtv/tv_actions.h" // for ACTION_CHANNELSEARCH #include "libmythtv/tv_play.h" #include "libmythui/mythdialogbox.h" diff --git a/mythtv/programs/mythfrontend/viewscheduled.h b/mythtv/programs/mythfrontend/viewscheduled.h index 6ffaf7c0ef0..c9ae5d3da57 100644 --- a/mythtv/programs/mythfrontend/viewscheduled.h +++ b/mythtv/programs/mythfrontend/viewscheduled.h @@ -7,7 +7,7 @@ #include // MythTV -#include "libmythbase/programinfo.h" +#include "libmythtv/programinfo.h" #include "libmythui/mythscreentype.h" // MythFrontend diff --git a/mythtv/programs/mythfrontend/viewschedulediff.h b/mythtv/programs/mythfrontend/viewschedulediff.h index 9a79ab4a82d..0615f0ec50b 100644 --- a/mythtv/programs/mythfrontend/viewschedulediff.h +++ b/mythtv/programs/mythfrontend/viewschedulediff.h @@ -6,7 +6,7 @@ #include // MythTV -#include "libmythbase/programinfo.h" +#include "libmythtv/programinfo.h" #include "libmythui/mythscreentype.h" class ProgramStruct diff --git a/mythtv/programs/mythmetadatalookup/lookup.cpp b/mythtv/programs/mythmetadatalookup/lookup.cpp index 3ad9156b86e..f2e1449cf77 100644 --- a/mythtv/programs/mythmetadatalookup/lookup.cpp +++ b/mythtv/programs/mythmetadatalookup/lookup.cpp @@ -7,10 +7,10 @@ // MythTV #include "libmythbase/mythcorecontext.h" #include "libmythbase/mythlogging.h" -#include "libmythbase/programinfo.h" -#include "libmythbase/programinforemoteutil.h" #include "libmythtv/jobqueue.h" #include "libmythtv/metadataimagehelper.h" +#include "libmythtv/programinfo.h" +#include "libmythtv/programinforemoteutil.h" #include "libmythtv/recordingrule.h" // MythMetadataLookup diff --git a/mythtv/programs/mythmetadatalookup/lookup.h b/mythtv/programs/mythmetadatalookup/lookup.h index ac5c3ce6c9a..8f21b1ede6e 100644 --- a/mythtv/programs/mythmetadatalookup/lookup.h +++ b/mythtv/programs/mythmetadatalookup/lookup.h @@ -4,8 +4,8 @@ #include #include -#include "libmythbase/programinfo.h" #include "libmythmetadata/metadatafactory.h" +#include "libmythtv/programinfo.h" class LookerUpper : public QObject { diff --git a/mythtv/programs/mythpreviewgen/mythpreviewgen.cpp b/mythtv/programs/mythpreviewgen/mythpreviewgen.cpp index 38142acf5bd..2ad30b064ad 100644 --- a/mythtv/programs/mythpreviewgen/mythpreviewgen.cpp +++ b/mythtv/programs/mythpreviewgen/mythpreviewgen.cpp @@ -31,11 +31,11 @@ #include "libmythbase/mythdb.h" #include "libmythbase/mythlogging.h" #include "libmythbase/mythversion.h" -#include "libmythbase/programinfo.h" #include "libmythbase/storagegroup.h" #include "libmythtv/dbcheck.h" #include "libmythtv/mythsystemevent.h" #include "libmythtv/previewgenerator.h" +#include "libmythtv/programinfo.h" //MythPreviewGen #include "mythpreviewgen_commandlineparser.h" diff --git a/mythtv/programs/mythshutdown/mythshutdown.cpp b/mythtv/programs/mythshutdown/mythshutdown.cpp index c58e679a476..efa7b6c2ed9 100644 --- a/mythtv/programs/mythshutdown/mythshutdown.cpp +++ b/mythtv/programs/mythshutdown/mythshutdown.cpp @@ -21,8 +21,8 @@ #include "libmythbase/mythlogging.h" #include "libmythbase/mythsystemlegacy.h" #include "libmythbase/mythversion.h" -#include "libmythbase/programinfo.h" #include "libmythtv/jobqueue.h" +#include "libmythtv/programinfo.h" #include "libmythtv/tv.h" #include "libmythtv/tvremoteutil.h" diff --git a/mythtv/programs/mythtranscode/cutter.h b/mythtv/programs/mythtranscode/cutter.h index b003dd490bc..ee5dbd2fc1f 100644 --- a/mythtv/programs/mythtranscode/cutter.h +++ b/mythtv/programs/mythtranscode/cutter.h @@ -2,8 +2,8 @@ #define CUTTER_H #include // for int64_t -#include "libmythbase/programtypes.h" // for frm_dir_map_t #include "libmythtv/deletemap.h" // for DeleteMap +#include "libmythtv/programtypes.h" // for frm_dir_map_t // Cutter object is used in performing clean cutting. The // act of cutting is shared between the player and the diff --git a/mythtv/programs/mythtranscode/mpeg2fix.h b/mythtv/programs/mythtranscode/mpeg2fix.h index f3cd62c6eb5..74129a14925 100644 --- a/mythtv/programs/mythtranscode/mpeg2fix.h +++ b/mythtv/programs/mythtranscode/mpeg2fix.h @@ -30,8 +30,8 @@ extern "C" #include // MythTV -#include "libmythbase/programtypes.h" #include "libmythtv/mythavutil.h" +#include "libmythtv/programtypes.h" // MythTranscode #include "transcodedefs.h" diff --git a/mythtv/programs/mythtranscode/mythtranscode.cpp b/mythtv/programs/mythtranscode/mythtranscode.cpp index 8e2de0ef725..f8b0895cd6d 100644 --- a/mythtv/programs/mythtranscode/mythtranscode.cpp +++ b/mythtv/programs/mythtranscode/mythtranscode.cpp @@ -21,10 +21,10 @@ #include "libmythbase/mythmiscutil.h" #include "libmythbase/mythtranslation.h" #include "libmythbase/mythversion.h" -#include "libmythbase/programinfo.h" #include "libmythbase/remotefile.h" #include "libmythtv/HLS/httplivestream.h" #include "libmythtv/jobqueue.h" +#include "libmythtv/programinfo.h" #include "libmythtv/recordinginfo.h" // MythTranscode diff --git a/mythtv/programs/mythtranscode/transcode.cpp b/mythtv/programs/mythtranscode/transcode.cpp index 61f9764bf36..a5fbb576693 100644 --- a/mythtv/programs/mythtranscode/transcode.cpp +++ b/mythtv/programs/mythtranscode/transcode.cpp @@ -24,12 +24,12 @@ #include "libmythbase/mythcorecontext.h" #include "libmythbase/mythdbcon.h" #include "libmythbase/mythlogging.h" -#include "libmythbase/programinfo.h" #include "libmythtv/HLS/httplivestream.h" #include "libmythtv/deletemap.h" #include "libmythtv/io/mythavformatwriter.h" #include "libmythtv/jobqueue.h" #include "libmythtv/mythavutil.h" +#include "libmythtv/programinfo.h" #include "libmythtv/recordingprofile.h" #include "libmythtv/tvremoteutil.h" diff --git a/mythtv/programs/mythtranscode/transcode.h b/mythtv/programs/mythtranscode/transcode.h index 7867021059e..472f755aeac 100644 --- a/mythtv/programs/mythtranscode/transcode.h +++ b/mythtv/programs/mythtranscode/transcode.h @@ -1,7 +1,7 @@ // MythTV -#include "libmythbase/programtypes.h" #include "libmythtv/io/mythfifowriter.h" #include "libmythtv/playercontext.h" +#include "libmythtv/programtypes.h" #include "libmythtv/recordingprofile.h" // MythTranscode diff --git a/mythtv/programs/mythutil/mythutil.h b/mythtv/programs/mythutil/mythutil.h index 7019c9c55c6..e374c67a5b4 100644 --- a/mythtv/programs/mythutil/mythutil.h +++ b/mythtv/programs/mythutil/mythutil.h @@ -6,7 +6,7 @@ #include // libmyth* includes -#include "libmythbase/programinfo.h" +#include "libmythtv/programinfo.h" // Local includes #include "mythutil_commandlineparser.h" diff --git a/mythtv/programs/mythutil/recordingutils.cpp b/mythtv/programs/mythutil/recordingutils.cpp index 3ecdb83d225..e6b805390fd 100644 --- a/mythtv/programs/mythutil/recordingutils.cpp +++ b/mythtv/programs/mythutil/recordingutils.cpp @@ -12,9 +12,9 @@ #include "libmythbase/exitcodes.h" #include "libmythbase/mythdirs.h" #include "libmythbase/mythsystem.h" -#include "libmythbase/programinforemoteutil.h" #include "libmythbase/remotefile.h" #include "libmythbase/stringutil.h" +#include "libmythtv/programinforemoteutil.h" // Local includes #include "recordingutils.h" diff --git a/mythtv/programs/mythwelcome/welcomedialog.h b/mythtv/programs/mythwelcome/welcomedialog.h index b03773ee889..e1b984b6010 100644 --- a/mythtv/programs/mythwelcome/welcomedialog.h +++ b/mythtv/programs/mythwelcome/welcomedialog.h @@ -5,7 +5,7 @@ #include // myth -#include "libmythbase/programinfo.h" +#include "libmythtv/programinfo.h" #include "libmythtv/tvremoteutil.h" #include "libmythui/mythdialogbox.h" #include "libmythui/mythscreentype.h" From 9dcd4ab0e7af7530adc2b25390def63a12da0a13 Mon Sep 17 00:00:00 2001 From: Scott Theisen Date: Fri, 4 Jul 2025 17:01:10 -0400 Subject: [PATCH 11/13] libmythtv/programinforemoteutil: remove unused functions --- .../libs/libmythtv/programinforemoteutil.cpp | 77 ------------------- mythtv/libs/libmythtv/programinforemoteutil.h | 5 -- 2 files changed, 82 deletions(-) diff --git a/mythtv/libs/libmythtv/programinforemoteutil.cpp b/mythtv/libs/libmythtv/programinforemoteutil.cpp index fbe0bc495a3..c8f87a452ec 100644 --- a/mythtv/libs/libmythtv/programinforemoteutil.cpp +++ b/mythtv/libs/libmythtv/programinforemoteutil.cpp @@ -138,23 +138,6 @@ std::vector *RemoteGetConflictList(const ProgramInfo *pginfo) return retlist; } -QDateTime RemoteGetPreviewLastModified(const ProgramInfo *pginfo) -{ - QStringList strlist( "QUERY_PIXMAP_LASTMODIFIED" ); - pginfo->ToStringList(strlist); - - if (!gCoreContext->SendReceiveStringList(strlist)) - return {}; - - if (!strlist.isEmpty() && !strlist[0].isEmpty() && (strlist[0] != "BAD")) - { - qint64 timet = strlist[0].toLongLong(); - return MythDate::fromSecsSinceEpoch(timet); - } - - return {}; -} - /// Download preview & get timestamp if newer than cachefile's /// last modified time, otherwise just get the timestamp QDateTime RemoteGetPreviewIfModified( @@ -280,64 +263,4 @@ QDateTime RemoteGetPreviewIfModified( return retdatetime; } -bool RemoteFillProgramInfo(ProgramInfo &pginfo, const QString &playbackhost) -{ - QStringList strlist( "FILL_PROGRAM_INFO" ); - strlist << playbackhost; - pginfo.ToStringList(strlist); - - if (gCoreContext->SendReceiveStringList(strlist)) - { - ProgramInfo tmp(strlist); - if (tmp.HasPathname() || tmp.GetChanID()) - { - pginfo = tmp; - return true; - } - } - - return false; -} - -/** - * \brief return list of currently recording shows - */ -std::vector *RemoteGetCurrentlyRecordingList(void) -{ - QString str = "QUERY_RECORDINGS "; - str += "Recording"; - QStringList strlist( str ); - - auto *reclist = new std::vector; - auto *info = new std::vector; - if (!RemoteGetRecordingList(*info, strlist)) - { - delete info; - return reclist; - } - - // make sure whatever RemoteGetRecordingList() returned - // only has RecStatus::Recording shows - for (auto & p : *info) - { - if (p->GetRecordingStatus() == RecStatus::Recording || - p->GetRecordingStatus() == RecStatus::Tuning || - p->GetRecordingStatus() == RecStatus::Failing || - (p->GetRecordingStatus() == RecStatus::Recorded && - p->GetRecordingGroup() == "LiveTV")) - { - reclist->push_back(new ProgramInfo(*p)); - } - } - - while (!info->empty()) - { - delete info->back(); - info->pop_back(); - } - delete info; - - return reclist; -} - /* vim: set expandtab tabstop=4 shiftwidth=4: */ diff --git a/mythtv/libs/libmythtv/programinforemoteutil.h b/mythtv/libs/libmythtv/programinforemoteutil.h index 640c9210e24..fc195634b67 100644 --- a/mythtv/libs/libmythtv/programinforemoteutil.h +++ b/mythtv/libs/libmythtv/programinforemoteutil.h @@ -22,14 +22,9 @@ MTV_PUBLIC uint RemoteGetRecordingList(std::vector &reclist, QStringList &strList); MTV_PUBLIC std::vector *RemoteGetConflictList(const ProgramInfo *pginfo); -MTV_PUBLIC QDateTime RemoteGetPreviewLastModified(const ProgramInfo *pginfo); MTV_PUBLIC QDateTime RemoteGetPreviewIfModified(const ProgramInfo &pginfo, const QString &cachefile); -MTV_PUBLIC bool RemoteFillProgramInfo(ProgramInfo &pginfo, const QString &playbackhostname); - -MTV_PUBLIC std::vector *RemoteGetCurrentlyRecordingList(void); - #endif // PROGRAMINFO_REMOTEUTIL_H /* vim: set expandtab tabstop=4 shiftwidth=4: */ From c4794a064fdbceedb98babfb6ce2c5c2803c02eb Mon Sep 17 00:00:00 2001 From: Scott Theisen Date: Fri, 4 Jul 2025 17:03:50 -0400 Subject: [PATCH 12/13] libmythtv/programinforemoteutil: make RemoteGetRecordingList() static --- .../libs/libmythtv/programinforemoteutil.cpp | 55 +++++++++---------- mythtv/libs/libmythtv/programinforemoteutil.h | 2 - 2 files changed, 27 insertions(+), 30 deletions(-) diff --git a/mythtv/libs/libmythtv/programinforemoteutil.cpp b/mythtv/libs/libmythtv/programinforemoteutil.cpp index c8f87a452ec..c466add578c 100644 --- a/mythtv/libs/libmythtv/programinforemoteutil.cpp +++ b/mythtv/libs/libmythtv/programinforemoteutil.cpp @@ -11,6 +11,33 @@ #include "programinfo.h" +static uint RemoteGetRecordingList(std::vector &reclist, QStringList &strList) +{ + if (!gCoreContext->SendReceiveStringList(strList) || strList.isEmpty()) + return 0; + + int numrecordings = strList[0].toInt(); + if (numrecordings <= 0) + return 0; + + if ((numrecordings * NUMPROGRAMLINES) + 1 > strList.size()) + { + LOG(VB_GENERAL, LOG_ERR, + "RemoteGetRecordingList() list size appears to be incorrect."); + return 0; + } + + uint reclist_initial_size = (uint) reclist.size(); + QStringList::const_iterator it = strList.cbegin() + 1; + for (int i = 0; i < numrecordings; i++) + { + auto *pginfo = new ProgramInfo(it, strList.cend()); + reclist.push_back(pginfo); + } + + return ((uint) reclist.size()) - reclist_initial_size; +} + std::vector *RemoteGetRecordedList(int sort) { QString str = "QUERY_RECORDINGS "; @@ -98,34 +125,6 @@ void RemoteGetAllExpiringRecordings(std::vector &expiringlist) RemoteGetRecordingList(expiringlist, strList); } -uint RemoteGetRecordingList( - std::vector &reclist, QStringList &strList) -{ - if (!gCoreContext->SendReceiveStringList(strList) || strList.isEmpty()) - return 0; - - int numrecordings = strList[0].toInt(); - if (numrecordings <= 0) - return 0; - - if ((numrecordings * NUMPROGRAMLINES) + 1 > strList.size()) - { - LOG(VB_GENERAL, LOG_ERR, - "RemoteGetRecordingList() list size appears to be incorrect."); - return 0; - } - - uint reclist_initial_size = (uint) reclist.size(); - QStringList::const_iterator it = strList.cbegin() + 1; - for (int i = 0; i < numrecordings; i++) - { - auto *pginfo = new ProgramInfo(it, strList.cend()); - reclist.push_back(pginfo); - } - - return ((uint) reclist.size()) - reclist_initial_size; -} - std::vector *RemoteGetConflictList(const ProgramInfo *pginfo) { QString cmd = QString("QUERY_GETCONFLICTING"); diff --git a/mythtv/libs/libmythtv/programinforemoteutil.h b/mythtv/libs/libmythtv/programinforemoteutil.h index fc195634b67..a1181eecec4 100644 --- a/mythtv/libs/libmythtv/programinforemoteutil.h +++ b/mythtv/libs/libmythtv/programinforemoteutil.h @@ -18,8 +18,6 @@ MTV_PUBLIC bool RemoteUndeleteRecording(uint recordingID); MTV_PUBLIC std::vector *RemoteGetRecordedList(int sort); MTV_PUBLIC void RemoteGetAllScheduledRecordings(std::vector &scheduledlist); MTV_PUBLIC void RemoteGetAllExpiringRecordings(std::vector &expiringlist); -MTV_PUBLIC uint RemoteGetRecordingList(std::vector &reclist, - QStringList &strList); MTV_PUBLIC std::vector *RemoteGetConflictList(const ProgramInfo *pginfo); MTV_PUBLIC QDateTime RemoteGetPreviewIfModified(const ProgramInfo &pginfo, From 592852aa8a63dc3dad02d9c6b8e6abf23254a959 Mon Sep 17 00:00:00 2001 From: Scott Theisen Date: Sat, 6 Dec 2025 15:41:19 -0500 Subject: [PATCH 13/13] Bump MYTHTV_BINARY_VERSION after splitting up libmythbase/remoteutil.h and moving program* and recording* from libmythbase to libmythtv. --- cmake/VersionInformation.cmake | 2 +- mythtv/configure | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/VersionInformation.cmake b/cmake/VersionInformation.cmake index 298ceeefc2a..fa2ed703bb5 100644 --- a/cmake/VersionInformation.cmake +++ b/cmake/VersionInformation.cmake @@ -17,7 +17,7 @@ endif() # # See mythtv/libs/libmythbase/mythversion.h.in -set(MYTHTV_BINARY_CHANGED "20251120-1") +set(MYTHTV_BINARY_CHANGED "20251207-1") set(MYTHTV_BINARY_VERSION "${PROJECT_VERSION_MAJOR}.${MYTHTV_BINARY_CHANGED}") # See mythtv/bindings/python/MythTV/static.py.in diff --git a/mythtv/configure b/mythtv/configure index f6c0032e41b..07fd2d65998 100755 --- a/mythtv/configure +++ b/mythtv/configure @@ -13,7 +13,7 @@ MYTHTV_VERSION_MAJMIN="36.0" MYTHTV_LIBVERSION="36" # See mythtv/libs/libmythbase/mythversion.h.in -MYTHTV_BINARY_VERSION="36.20251120-1" +MYTHTV_BINARY_VERSION="36.20251207-1" # See bindings/python/MythTV/static.py.in MYTHTV_PYTHON_OWN_VERSION="(36,0,-1,0)" # See python/MythTV/services_api/send.py.in