diff --git a/mythplugins/COPYING b/mythplugins/COPYING
diff --git a/mythplugins/mytharchive/mytharchive/mytharchive.pro b/mythplugins/mytharchive/mytharchive/mytharchive.pro
@@ -13,7 +13,6 @@ LIBS += -lmythavutil
 LIBS += -lmythmetadata-$$LIBVERSION
 LIBS += -lmythtv-$$LIBVERSION
 # libmythtv dependencies
-using_live: LIBS += -lmythlivemedia-$$LIBVERSION
 using_mheg: LIBS += -lmythfreemheg-$$LIBVERSION
 using_hdhomerun: LIBS += -lhdhomerun
 

diff --git a/mythplugins/mytharchive/mytharchivehelper/mytharchivehelper.pro b/mythplugins/mytharchive/mytharchivehelper/mytharchivehelper.pro
@@ -28,7 +28,6 @@ LIBS += -lmythavfilter
 LIBS += -lz
 LIBS += -lmythtv-$$LIBVERSION
 # libmythtv dependencies
-using_live: LIBS += -lmythlivemedia-$$LIBVERSION
 using_mheg: LIBS += -lmythfreemheg-$$LIBVERSION
 using_hdhomerun: LIBS += -lhdhomerun
 

diff --git a/mythplugins/mythbrowser/COPYING b/mythplugins/mythbrowser/COPYING
diff --git a/mythplugins/mythgame/mythgame/gamehandler.cpp b/mythplugins/mythgame/mythgame/gamehandler.cpp
@@ -298,7 +298,6 @@ static void UpdateGameCounts(const QStringList& updatelist)
     MSqlQuery query(MSqlQuery::InitCon());
 
     static const QRegularExpression multiDiskRGXP { "[0-4]$" };
-    int pos = 0;
 
     QString lastrom;
     QString firstname;
@@ -331,7 +330,7 @@ static void UpdateGameCounts(const QStringList& updatelist)
                 {
                     int diskcount = 0;
                     int extlength = 0;
-                    pos = RomName.lastIndexOf(".");
+                    int pos = RomName.lastIndexOf(".");
                     if (pos > 1)
                     {
                         extlength = RomName.length() - pos;

diff --git a/mythplugins/mythnews/COPYING b/mythplugins/mythnews/COPYING
diff --git a/mythplugins/mythzoneminder/COPYING b/mythplugins/mythzoneminder/COPYING
diff --git a/mythplugins/mythzoneminder/mythzoneminder/zmliveplayer.cpp b/mythplugins/mythzoneminder/mythzoneminder/zmliveplayer.cpp
@@ -466,7 +466,7 @@ Player::~Player()
         free(m_rgba);
 }
 
-void Player::setMonitor(Monitor *mon)
+void Player::setMonitor(const Monitor *mon)
 {
     m_monitor = *mon;
 

diff --git a/mythplugins/mythzoneminder/mythzoneminder/zmliveplayer.h b/mythplugins/mythzoneminder/mythzoneminder/zmliveplayer.h
@@ -41,7 +41,7 @@ class Player
     void updateStatus(void);
     void updateCamera();
 
-    void setMonitor(Monitor *mon);
+    void setMonitor(const Monitor *mon);
     void setWidgets(MythUIImage *image, MythUIText *status,
                     MythUIText  *camera);
 

diff --git a/mythtv/FAQ b/mythtv/FAQ
diff --git a/mythtv/README b/mythtv/README
@@ -64,9 +64,12 @@ http://lists.mythtv.org/mailman/listinfo/mythtv-dev
 A users list exists as well, subscribe at:
 http://lists.mythtv.org/mailman/listinfo/mythtv-users
 
-A list that's restricted to the Git commit and Trac (bug tracking) messages is
-available at:
+A list that's restricted to the Git commit and Trac (bug tracking - no longer used)
+messages is available at:
 http://lists.mythtv.org/mailman/listinfo/mythtv-commits
 
+NOTE: We now use GitHub Issues to track bugs, tasks, pull requests etc at:
+https://github.com/MythTV/mythtv/issues
+
 To contact the developer's for corporate sponsorship, contract work or similarly
 formal and private matters please use the form at https://www.mythtv.org/contact/
diff --git a/mythtv/UPGRADING b/mythtv/UPGRADING
diff --git a/mythtv/bindings/python/ttvdbv4/definitions.py b/mythtv/bindings/python/ttvdbv4/definitions.py
@@ -3,7 +3,7 @@
 # ----------------------------------------------------
 # Purpose:   MythTV Python Bindings for TheTVDB v4 API
 # Copyright: (c) 2021 Roland Ernst
-# License:   GPL v2 or later, see COPYING for details
+# License:   GPL v2 or later, see LICENSE for details
 # ----------------------------------------------------
 
 

diff --git a/mythtv/bindings/python/ttvdbv4/get_api_v4.py b/mythtv/bindings/python/ttvdbv4/get_api_v4.py
@@ -3,7 +3,7 @@
 # ----------------------------------------------------
 # Purpose:   MythTV Python Bindings for TheTVDB v4 API
 # Copyright: (c) 2021 Roland Ernst
-# License:   GPL v2 or later, see COPYING for details
+# License:   GPL v2 or later, see LICENSE for details
 # ----------------------------------------------------
 
 """

diff --git a/mythtv/bindings/python/ttvdbv4/myth4ttvdbv4.py b/mythtv/bindings/python/ttvdbv4/myth4ttvdbv4.py
@@ -3,7 +3,7 @@
 # ----------------------------------------------------
 # Purpose:   MythTV Python Bindings for TheTVDB v4 API
 # Copyright: (c) 2021 Roland Ernst
-# License:   GPL v2 or later, see COPYING for details
+# License:   GPL v2 or later, see LICENSE for details
 # ----------------------------------------------------
 
 

diff --git a/mythtv/bindings/python/ttvdbv4/ttvdbv4_api.py b/mythtv/bindings/python/ttvdbv4/ttvdbv4_api.py
@@ -3,7 +3,7 @@
 # ----------------------------------------------------
 # Purpose:   MythTV Python Bindings for TheTVDB v4 API
 # Copyright: (c) 2021 Roland Ernst
-# License:   GPL v2 or later, see COPYING for details
+# License:   GPL v2 or later, see LICENSE for details
 # ----------------------------------------------------
 
 

diff --git a/mythtv/bindings/python/ttvdbv4/utils.py b/mythtv/bindings/python/ttvdbv4/utils.py
@@ -3,7 +3,7 @@
 # ----------------------------------------------------
 # Purpose:   MythTV Python Bindings for TheTVDB v4 API
 # Copyright: (c) 2021 Roland Ernst
-# License:   GPL v2 or later, see COPYING for details
+# License:   GPL v2 or later, see LICENSE for details
 # ----------------------------------------------------
 
 

diff --git a/mythtv/data/scanConfigs/dvb-s/Freesat.xml b/mythtv/data/scanConfigs/dvb-s/Freesat.xml
diff --git a/mythtv/docs/README.HOWTO b/mythtv/docs/README.HOWTO
diff --git a/mythtv/docs/README.txt b/mythtv/docs/README.txt
@@ -0,0 +1,8 @@
+This is for generating the source code documentation with doxygen, available at
+https://code.mythtv.org/doxygen/
+
+The MythTV User Manual is available on the MythTV Official Wiki at
+https://www.mythtv.org/wiki/User_Manual:Index
+
+and additional information is available in the Wiki at:
+http://www.mythtv.org/wiki/
diff --git a/mythtv/keys.txt → mythtv/keybindings.txt b/mythtv/keys.txt → mythtv/keybindings.txt
diff --git a/mythtv/libs/libmyth/audio/audiosettings.cpp b/mythtv/libs/libmyth/audio/audiosettings.cpp
@@ -43,7 +43,7 @@ AudioSettings::AudioSettings(
     bool                        set_initial_vol,
     bool                        use_passthru,
     int                         upmixer_startup,
-    AudioOutputSettings        *custom) :
+    const AudioOutputSettings  *custom) :
     m_mainDevice(std::move(main_device)),
     m_passthruDevice(std::move(passthru_device)),
     m_format(format),

diff --git a/mythtv/libs/libmyth/audio/audiosettings.h b/mythtv/libs/libmyth/audio/audiosettings.h
@@ -42,7 +42,7 @@ class MPUBLIC AudioSettings
         bool                    set_initial_vol,
         bool                    use_passthru,
         int                     upmixer_startup = 0,
-        AudioOutputSettings     *custom = nullptr);
+        const AudioOutputSettings *custom = nullptr);
 
     AudioSettings(AudioFormat   format,
                   int           channels,

diff --git a/mythtv/libs/libmythbase/mythchrono.h b/mythtv/libs/libmythbase/mythchrono.h
@@ -72,9 +72,9 @@ using SystemTime = std::chrono::time_point<SystemClock>;
 //
 
 /// @brief Helper function for convert a floating point number to a duration.
-//
-//  \param  value A floating point number that represents a time in seconds.
-//  \returns The same number of seconds as a std::chrono::seconds.
+///
+/// \param  value A floating point number that represents a time in seconds.
+/// \returns The same number of seconds as a std::chrono::seconds.
 template <typename T>
 typename std::enable_if_t<std::is_floating_point_v<T>, std::chrono::seconds>
 secondsFromFloat (T value)
@@ -83,9 +83,9 @@ secondsFromFloat (T value)
 }
 
 /// @brief Helper function for convert a floating point number to a duration.
-//
-//  \param  value A floating point number that represents a time in milliseconds.
-//  \returns The same number of seconds as a std::chrono::milliseconds.
+///
+/// \param  value A floating point number that represents a time in milliseconds.
+/// \returns The same number of seconds as a std::chrono::milliseconds.
 template <typename T>
 typename std::enable_if_t<std::is_floating_point_v<T>, std::chrono::milliseconds>
 millisecondsFromFloat (T value)
@@ -94,9 +94,9 @@ millisecondsFromFloat (T value)
 }
 
 /// @brief Helper function for convert a floating point number to a duration.
-//
-//  \param  value A floating point number that represents a time in microseconds.
-//  \returns The same number of seconds as a std::chrono::microseconds.
+///
+/// \param  value A floating point number that represents a time in microseconds.
+/// \returns The same number of seconds as a std::chrono::microseconds.
 template <typename T>
 typename std::enable_if_t<std::is_floating_point_v<T>, std::chrono::microseconds>
 microsecondsFromFloat (T value)
@@ -116,12 +116,12 @@ std::chrono::milliseconds millisecondsFromParts (int hours, int minutes = 0,
 }
 
 /// @brief Convert a timeval to a duration.
-//
-//  Always specify the desired precision when calling this function.
-//  I.E. Always call in the form:
-//  durationFromTimeval<std::chrono::milliseconds>(t);
-//
-//  Timevals can support a precision as small as microseconds.
+///
+/// Always specify the desired precision when calling this function.
+/// I.E. Always call in the form:
+/// durationFromTimeval<std::chrono::milliseconds>(t);
+///
+/// Timevals can support a precision as small as microseconds.
 template <typename T>
 constexpr T durationFromTimeval (timeval t)
 {
@@ -133,12 +133,12 @@ constexpr T durationFromTimeval (timeval t)
 }
 
 /// @brief Compute delta between timevals and convert to a duration.
-//
-//  Always specify the desired precision when calling this function.
-//  I.E. Always call in the form:
-//  durationFromTimevalDelta<std::chrono::milliseconds>(t);
-//
-//  Timevals can support a precision as small as microseconds.
+///
+/// Always specify the desired precision when calling this function.
+/// I.E. Always call in the form:
+/// durationFromTimevalDelta<std::chrono::milliseconds>(t);
+///
+/// Timevals can support a precision as small as microseconds.
 template <typename T>
 constexpr T durationFromTimevalDelta (timeval a, timeval b)
 {
@@ -150,12 +150,12 @@ constexpr T durationFromTimevalDelta (timeval a, timeval b)
 }
 
 /// @brief Convert a timespec to a duration.
-//
-//  Always specify the desired precision when calling this function.
-//  I.E. Always call in the form:
-//  durationFromTimespec<std::chrono::milliseconds>(t);
-//
-//  Timevals can support a precision as small as nanoseconds.
+///
+/// Always specify the desired precision when calling this function.
+/// I.E. Always call in the form:
+/// durationFromTimespec<std::chrono::milliseconds>(t);
+///
+/// Timevals can support a precision as small as nanoseconds.
 template <typename T>
 constexpr T durationFromTimespec (struct timespec time)
 {
@@ -172,13 +172,13 @@ constexpr T durationFromTimespec (struct timespec time)
 //
 
 /// @brief Get the currenttime as a duration.
-//
-//  Always specify the desired precision when calling this function.
-//  I.E. Always call in the form:
-//  nowAsDuration<std::chrono::milliseconds>(t);
-//
-//  This function is based upon the gettimeoday function, so can
-//  return precisions as small as microseconds.
+///
+/// Always specify the desired precision when calling this function.
+/// I.E. Always call in the form:
+/// nowAsDuration<std::chrono::milliseconds>(t);
+///
+/// This function is based upon the gettimeoday function, so can
+/// return precisions as small as microseconds.
 template <typename T>
 T nowAsDuration (bool adjustForTZ = false)
 {

diff --git a/mythtv/libs/libmythfreemheg/ParseNode.h b/mythtv/libs/libmythfreemheg/ParseNode.h
@@ -125,7 +125,7 @@ class MHPBool: public MHParseNode
 class MHPString: public MHParseNode
 {
   public:
-    explicit MHPString(MHOctetString &pSrc): MHParseNode(PNString) { m_Value.Copy(pSrc); }
+    explicit MHPString(const MHOctetString &pSrc): MHParseNode(PNString) { m_Value.Copy(pSrc); }
 
   public:
     MHOctetString m_Value;

diff --git a/mythtv/libs/libmythmetadata/libmythmetadata.pro b/mythtv/libs/libmythmetadata/libmythmetadata.pro
@@ -89,7 +89,6 @@ LIBS += $${CONFIG_TAGLIB_LIBS}
 win32-msvc*:LIBS += -ltag
 
 using_mheg:LIBS += -L../libmythfreemheg        -lmythfreemheg-$${LIBVERSION}
-using_live:LIBS += -L../libmythlivemedia        -lmythlivemedia-$${LIBVERSION}
 
 mingw:LIBS += -lws2_32
 mingw:LIBS += libbluray

diff --git a/mythtv/libs/libmythprotoserver/libmythprotoserver.pro b/mythtv/libs/libmythprotoserver/libmythprotoserver.pro
@@ -45,7 +45,6 @@ LIBS += -lmythservicecontracts-$$LIBVERSION
 LIBS += -lmythavutil -lmythavcodec -lmythavformat -lmythswscale
 LIBS += $$EXTRA_LIBS $$LATE_LIBS $$QMAKE_LIBS_DYNLOAD
 using_mheg:LIBS += -L../libmythfreemheg -lmythfreemheg-$$LIBVERSION
-using_live:LIBS += -L../libmythlivemedia -lmythlivemedia-$$LIBVERSION
 
 inc.path = $${PREFIX}/include/mythtv/protoserver
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracthelper.h b/mythtv/libs/libmythservicecontracts/datacontracthelper.h
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2010 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 //

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/artworkInfo.h b/mythtv/libs/libmythservicecontracts/datacontracts/artworkInfo.h
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2011 Robert McNamara <rmcnamara@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/artworkInfoList.h b/mythtv/libs/libmythservicecontracts/datacontracts/artworkInfoList.h
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2011 Robert McNamara <rmcnamara@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/backendInfo.h b/mythtv/libs/libmythservicecontracts/datacontracts/backendInfo.h
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2015 Bill Meek, from: 2010 David Blain <dblain@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/blurayInfo.h b/mythtv/libs/libmythservicecontracts/datacontracts/blurayInfo.h
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2011 Robert McNamara <rmcnamara@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/buildInfo.h b/mythtv/libs/libmythservicecontracts/datacontracts/buildInfo.h
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2015 Bill Meek, from: 2010 David Blain <dblain@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/captureCard.h b/mythtv/libs/libmythservicecontracts/datacontracts/captureCard.h
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2011 Robert McNamara <rmcnamara@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/captureCardList.h b/mythtv/libs/libmythservicecontracts/datacontracts/captureCardList.h
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2011 Robert McNamara <rmcnamara@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/castMember.h b/mythtv/libs/libmythservicecontracts/datacontracts/castMember.h
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2013 Stuart Morgan <smorgan@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/channelGroup.h b/mythtv/libs/libmythservicecontracts/datacontracts/channelGroup.h
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2013 Stuart Morgan <smorgan@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/connectionInfo.h b/mythtv/libs/libmythservicecontracts/datacontracts/connectionInfo.h
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2010 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/cutList.h b/mythtv/libs/libmythservicecontracts/datacontracts/cutList.h
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2014 team MythTV
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/cutting.h b/mythtv/libs/libmythservicecontracts/datacontracts/cutting.h
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2014 team MythTV
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/databaseInfo.h b/mythtv/libs/libmythservicecontracts/datacontracts/databaseInfo.h
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2010 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/encoder.h b/mythtv/libs/libmythservicecontracts/datacontracts/encoder.h
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2010 David Blain <dblain@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/encoderList.h b/mythtv/libs/libmythservicecontracts/datacontracts/encoderList.h
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2010 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/enum.h b/mythtv/libs/libmythservicecontracts/datacontracts/enum.h
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2014 David Blain <dblain@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/enumItem.h b/mythtv/libs/libmythservicecontracts/datacontracts/enumItem.h
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2014 David Blain <dblain@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/envInfo.h b/mythtv/libs/libmythservicecontracts/datacontracts/envInfo.h
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2015 Bill Meek, from: 2010 David Blain <dblain@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/frontend.h b/mythtv/libs/libmythservicecontracts/datacontracts/frontend.h
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2014 Stuart Morgan <smorgan@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/frontendList.h b/mythtv/libs/libmythservicecontracts/datacontracts/frontendList.h
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2014 Stuart Morgan <smorgan@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/genre.h b/mythtv/libs/libmythservicecontracts/datacontracts/genre.h
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2017 Paul Harrison <pharrison@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/genreList.h b/mythtv/libs/libmythservicecontracts/datacontracts/genreList.h
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2017 Paul Harrison <pharrison@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/input.h b/mythtv/libs/libmythservicecontracts/datacontracts/input.h
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2013 Stuart Morgan <smorgan@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/inputList.h b/mythtv/libs/libmythservicecontracts/datacontracts/inputList.h
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2013 Stuart Morgan <smorgan@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/labelValue.h b/mythtv/libs/libmythservicecontracts/datacontracts/labelValue.h
@@ -1,7 +1,7 @@
 //////////////////////////////////////////////////////////////////////////////
 // Program Name: labelValue.h
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/lineup.h b/mythtv/libs/libmythservicecontracts/datacontracts/lineup.h
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2011 Robert McNamara <rmcnamara@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/logInfo.h b/mythtv/libs/libmythservicecontracts/datacontracts/logInfo.h
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2015 Bill Meek, from: 2010 David Blain <dblain@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/logMessage.h b/mythtv/libs/libmythservicecontracts/datacontracts/logMessage.h
@@ -1,7 +1,7 @@
 //////////////////////////////////////////////////////////////////////////////
 // Program Name: logMessage.h
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/markup.h b/mythtv/libs/libmythservicecontracts/datacontracts/markup.h
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2021 team MythTV
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/markupList.h b/mythtv/libs/libmythservicecontracts/datacontracts/markupList.h
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2021 team MythTV
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/musicMetadataInfo.h b/mythtv/libs/libmythservicecontracts/datacontracts/musicMetadataInfo.h
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2017 Paul Harrison <pharrison@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/musicMetadataInfoList.h b/mythtv/libs/libmythservicecontracts/datacontracts/musicMetadataInfoList.h
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2017 Paul Harrison <pharrison@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/programAndChannel.h b/mythtv/libs/libmythservicecontracts/datacontracts/programAndChannel.h
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2010 David Blain <dblain@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/programGuide.h b/mythtv/libs/libmythservicecontracts/datacontracts/programGuide.h
@@ -6,7 +6,7 @@
 //                                                                            
 // Copyright (c) 2010 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/programList.h b/mythtv/libs/libmythservicecontracts/datacontracts/programList.h
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2010 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/recording.h b/mythtv/libs/libmythservicecontracts/datacontracts/recording.h
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2010 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/settingList.h b/mythtv/libs/libmythservicecontracts/datacontracts/settingList.h
@@ -4,7 +4,7 @@
 //                                                                            
 // Copyright (c) 2010 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/timeZoneInfo.h b/mythtv/libs/libmythservicecontracts/datacontracts/timeZoneInfo.h
@@ -1,7 +1,7 @@
 //////////////////////////////////////////////////////////////////////////////
 // Program Name: timeZoneInfo.h
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/titleInfo.h b/mythtv/libs/libmythservicecontracts/datacontracts/titleInfo.h
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2013 Chris Pinkham <cpinkham@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 ////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/titleInfoList.h b/mythtv/libs/libmythservicecontracts/datacontracts/titleInfoList.h
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2013 Chris Pinkham <cpinkham@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 ////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/versionInfo.h b/mythtv/libs/libmythservicecontracts/datacontracts/versionInfo.h
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2011 Raymond Wagner <rwagner@mythtv.org>
 //                      
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/videoLookupInfo.h b/mythtv/libs/libmythservicecontracts/datacontracts/videoLookupInfo.h
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2011 Robert McNamara <rmcnamara@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/videoLookupInfoList.h b/mythtv/libs/libmythservicecontracts/datacontracts/videoLookupInfoList.h
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2011 Robert McNamara <rmcnamara@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/videoMetadataInfo.h b/mythtv/libs/libmythservicecontracts/datacontracts/videoMetadataInfo.h
@@ -5,7 +5,7 @@
 // Copyright (c) 2010 Robert McNamara <rmcnamara@mythtv.org>
 // Copyright (c) 2013 Stuart Morgan   <smorgan@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/videoMetadataInfoList.h b/mythtv/libs/libmythservicecontracts/datacontracts/videoMetadataInfoList.h
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2011 Robert McNamara <rmcnamara@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/videoStreamInfo.h b/mythtv/libs/libmythservicecontracts/datacontracts/videoStreamInfo.h
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2020 Peter Bennett <pbennett@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/videoStreamInfoList.h b/mythtv/libs/libmythservicecontracts/datacontracts/videoStreamInfoList.h
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2011 Peter Bennett <pbennett@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/wolInfo.h b/mythtv/libs/libmythservicecontracts/datacontracts/wolInfo.h
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2010 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/service.cpp b/mythtv/libs/libmythservicecontracts/service.cpp
@@ -6,7 +6,7 @@
 //
 // Copyright (c) 2010 David Blain <dblain@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/service.h b/mythtv/libs/libmythservicecontracts/service.h
@@ -6,7 +6,7 @@
 //                                                                            
 // Copyright (c) 2010 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/services/captureServices.h b/mythtv/libs/libmythservicecontracts/services/captureServices.h
@@ -6,7 +6,7 @@
 //
 // Copyright (c) 2011 Robert McNamara <rmcnamara@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/services/channelServices.h b/mythtv/libs/libmythservicecontracts/services/channelServices.h
@@ -6,7 +6,7 @@
 //
 // Copyright (c) 2010 Robert McNamara <rmcnamara@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/services/contentServices.h b/mythtv/libs/libmythservicecontracts/services/contentServices.h
@@ -6,7 +6,7 @@
 //
 // Copyright (c) 2010 David Blain <dblain@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/services/dvrServices.h b/mythtv/libs/libmythservicecontracts/services/dvrServices.h
@@ -6,7 +6,7 @@
 //
 // Copyright (c) 2010 David Blain <dblain@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/services/guideServices.h b/mythtv/libs/libmythservicecontracts/services/guideServices.h
@@ -6,7 +6,7 @@
 //
 // Copyright (c) 2010 David Blain <dblain@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/services/musicServices.h b/mythtv/libs/libmythservicecontracts/services/musicServices.h
@@ -6,7 +6,7 @@
 //
 // Copyright (c) 2017 Paul Harrison <pharrison@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/services/mythServices.h b/mythtv/libs/libmythservicecontracts/services/mythServices.h
@@ -6,7 +6,7 @@
 //
 // Copyright (c) 2010 David Blain <dblain@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/services/rttiServices.h b/mythtv/libs/libmythservicecontracts/services/rttiServices.h
@@ -6,7 +6,7 @@
 //
 // Copyright (c) 2014 David Blain <dblain@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythservicecontracts/services/videoServices.h b/mythtv/libs/libmythservicecontracts/services/videoServices.h
@@ -6,7 +6,7 @@
 //
 // Copyright (c) 2011 Robert McNamara <rmcnamara@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythtv/AirPlay/mythraopconnection.cpp b/mythtv/libs/libmythtv/AirPlay/mythraopconnection.cpp
@@ -578,14 +578,14 @@ void MythRAOPConnection::timevalToNTP(timeval t, uint32_t &ntpSec, uint32_t &ntp
 
 
 ///
-// \param buf       A pointer to the received data.
-// \param type      The type of this packet.
-// \param seq       The sequence number of this packet. This value is not
-//                  always set.
-// \param timestamp The frame number of the first frame in this
-//                  packet.  NOT milliseconds. This value is not
-//                  always set.
-// \returns true if the packet header was successfully parsed.
+/// \param buf       A pointer to the received data.
+/// \param type      The type of this packet.
+/// \param seq       The sequence number of this packet. This value is not
+///                  always set.
+/// \param timestamp The frame number of the first frame in this
+///                  packet.  NOT milliseconds. This value is not
+///                  always set.
+/// \returns true if the packet header was successfully parsed.
 bool MythRAOPConnection::GetPacketType(const QByteArray &buf, uint8_t &type,
                                        uint16_t &seq, uint64_t &timestamp)
 {

diff --git a/mythtv/libs/libmythtv/DVD/mythdvdbuffer.cpp b/mythtv/libs/libmythtv/DVD/mythdvdbuffer.cpp
@@ -1922,7 +1922,7 @@ bool MythDVDBuffer::GetDVDStateSnapshot(QString& State)
 
 /** \brief Restore a DVD VM from a snapshot
  */
-bool MythDVDBuffer::RestoreDVDStateSnapshot(QString& State)
+bool MythDVDBuffer::RestoreDVDStateSnapshot(const QString& State)
 {
     QByteArray state = State.toUtf8();
     return (dvdnav_set_state(m_dvdnav, state.constData()) == DVDNAV_STATUS_OK);

diff --git a/mythtv/libs/libmythtv/DVD/mythdvdbuffer.h b/mythtv/libs/libmythtv/DVD/mythdvdbuffer.h
@@ -93,7 +93,7 @@ class MTV_PUBLIC MythDVDBuffer : public MythOpticalBuffer
     int       GetAudioTrackNum     (uint StreamId);
     int       GetAudioTrackType    (uint Index);
     bool      GetDVDStateSnapshot  (QString& State);
-    bool      RestoreDVDStateSnapshot(QString& State);
+    bool      RestoreDVDStateSnapshot(const QString& State);
     double    GetFrameRate         (void);
     bool      StartOfTitle         (void) const;
     bool      EndOfTitle           (void) const;

diff --git a/mythtv/libs/libmythtv/channelscan/channelscanmiscsettings.h b/mythtv/libs/libmythtv/channelscan/channelscanmiscsettings.h
@@ -256,12 +256,12 @@ class ScanTransponder: public TransMythUIComboBoxSetting
     QMap<QString, struct tuningdata> tdm;
 
   public:
-    QString getFrequency (QString &satname) {return tdm[satname].frequency; }
-    QString getPolarity  (QString &satname) {return tdm[satname].polarity;  }
-    QString getSymbolrate(QString &satname) {return tdm[satname].symbolrate;}
-    QString getModulation(QString &satname) {return tdm[satname].modulation;}
-    QString getModSys    (QString &satname) {return tdm[satname].modSys;    }
-    QString getFec       (QString &satname) {return tdm[satname].fec;       }
+    QString getFrequency (const QString &satname) {return tdm[satname].frequency; }
+    QString getPolarity  (const QString &satname) {return tdm[satname].polarity;  }
+    QString getSymbolrate(const QString &satname) {return tdm[satname].symbolrate;}
+    QString getModulation(const QString &satname) {return tdm[satname].modulation;}
+    QString getModSys    (const QString &satname) {return tdm[satname].modSys;    }
+    QString getFec       (const QString &satname) {return tdm[satname].fec;       }
 };
 
 class ScanFrequencykHz: public TransTextEditSetting

diff --git a/mythtv/libs/libmythtv/libmythtv.pro b/mythtv/libs/libmythtv/libmythtv.pro
@@ -40,14 +40,6 @@ DEPENDPATH  += ./recorders/dvbdev
 DEPENDPATH  += ./recorders/rtp
 DEPENDPATH  += ./recorders/vbitext
 DEPENDPATH  += ./recorders/HLS
-DEPENDPATH  += ../libmythlivemedia/BasicUsageEnvironment/include
-DEPENDPATH  += ../libmythlivemedia/BasicUsageEnvironment
-DEPENDPATH  += ../libmythlivemedia/groupsock/include
-DEPENDPATH  += ../libmythlivemedia/groupsock
-DEPENDPATH  += ../libmythlivemedia/liveMedia/include
-DEPENDPATH  += ../libmythlivemedia/liveMedia
-DEPENDPATH  += ../libmythlivemedia/UsageEnvironment/include
-DEPENDPATH  += ../libmythlivemedia/UsageEnvironment
 DEPENDPATH  += ../libmythbase ../libmythui
 DEPENDPATH  += ../libmythupnp
 DEPENDPATH  += ../libmythservicecontracts
@@ -1166,7 +1158,6 @@ LIBS += -lmythui-$$LIBVERSION       -lmythupnp-$$LIBVERSION
 LIBS += -lmythbase-$$LIBVERSION
 LIBS += -lmythservicecontracts-$$LIBVERSION
 using_mheg: LIBS += -L../libmythfreemheg -lmythfreemheg-$$LIBVERSION
-using_live: LIBS += -L../libmythlivemedia -lmythlivemedia-$$LIBVERSION
 using_backend:using_mp3lame: LIBS += -lmp3lame
 using_backend: LIBS += -llzo2
 LIBS += $$EXTRA_LIBS $$QMAKE_LIBS_DYNLOAD
@@ -1182,7 +1173,6 @@ LIBS += $$EXTRA_LIBS $$QMAKE_LIBS_DYNLOAD
     POST_TARGETDEPS += ../../external/FFmpeg/libavfilter/$$avLibName(avfilter)
 
     using_mheg: POST_TARGETDEPS += ../libmythfreemheg/libmythfreemheg-$${MYTH_SHLIB_EXT}
-    using_live: POST_TARGETDEPS += ../libmythlivemedia/libmythlivemedia-$${MYTH_SHLIB_EXT}
 }
 
 INCLUDEPATH += $$POSTINC

diff --git a/mythtv/libs/libmythtv/mpeg/dvbdescriptors.h b/mythtv/libs/libmythtv/mpeg/dvbdescriptors.h
@@ -853,7 +853,7 @@ class SatelliteDeliverySystemDescriptor : public MPEGDescriptor
     uint Polarization(void)       const { return (m_data[8]>>5)&0x3; }
     QString PolarizationString()  const
     {
-        static std::array<QString,4> ps { "h", "v", "l", "r" };
+        static const std::array<const QString,4> ps { "h", "v", "l", "r" };
         return ps[Polarization()];
     }
     bool IsCircularPolarization(void) const       { return ((m_data[8]>>6)&0x1) != 0; }
@@ -871,7 +871,7 @@ class SatelliteDeliverySystemDescriptor : public MPEGDescriptor
     uint RollOff(void) const { return (m_data[8]>>3)&0x3; }
     QString RollOffString(void) const
     {
-        static std::array<QString,4> ro { "0.35", "0.20", "0.25", "auto" };
+        static const std::array<const QString,4> ro { "0.35", "0.20", "0.25", "auto" };
         return ro[RollOff()];
     }
     // modulation system        1   8.5
@@ -892,7 +892,7 @@ class SatelliteDeliverySystemDescriptor : public MPEGDescriptor
     uint Modulation(void) const { return m_data[8]&0x03; }
     QString ModulationString(void) const
     {
-        static std::array<QString,4> ms { "qpsk", "qpsk", "8psk", "qam_16" };
+        static const std::array<const QString,4> ms { "qpsk", "qpsk", "8psk", "qam_16" };
         return ms[Modulation()];
     }
     // symbol_rate             28   9.0
@@ -996,7 +996,7 @@ class TerrestrialDeliverySystemDescriptor : public MPEGDescriptor
     /// \bug returns "a" for values >= 4 for compatibility with siparser.cpp
     QString HierarchyString(void) const
     {
-        static std::array<QString,8> hs { "n", "1", "2", "4", "a", "a", "a", "a" };
+        static const std::array<const QString,8> hs { "n", "1", "2", "4", "a", "a", "a", "a" };
         return hs[Hierarchy()];
     }
     bool NativeInterleaver(void) const { return ( m_data[7] & 0x20 ) != 0; }
@@ -1017,7 +1017,7 @@ class TerrestrialDeliverySystemDescriptor : public MPEGDescriptor
     uint CodeRateHP(void) const { return m_data[7] & 0x7; }
     QString CodeRateHPString(void) const
     {
-        static std::array<QString,8> cr {
+        static const std::array<const QString,8> cr {
             "1/2", "2/3", "3/4", "5/6", "7/8", "auto", "auto", "auto"
         };
         return cr[CodeRateHP()];
@@ -1026,7 +1026,7 @@ class TerrestrialDeliverySystemDescriptor : public MPEGDescriptor
     uint CodeRateLP(void) const { return (m_data[8]>>5) & 0x7; }
     QString CodeRateLPString(void) const
     {
-        static std::array<QString,8> cr {
+        static const std::array<const QString,8> cr {
             "1/2", "2/3", "3/4", "5/6", "7/8", "auto", "auto", "auto"
         };
         return cr[CodeRateLP()];
@@ -1042,7 +1042,7 @@ class TerrestrialDeliverySystemDescriptor : public MPEGDescriptor
     uint GuardInterval(void) const { return (m_data[8]>>3) & 0x3; }
     QString GuardIntervalString(void) const
     {
-        static std::array<QString,4> gi { "1/32", "1/16", "1/8", "1/4" };
+        static const std::array<const QString,4> gi { "1/32", "1/16", "1/8", "1/4" };
         return gi[GuardInterval()];
     }
     // transmission_mode        2   8.5
@@ -1055,7 +1055,7 @@ class TerrestrialDeliverySystemDescriptor : public MPEGDescriptor
     uint TransmissionMode(void) const { return (m_data[8]>>1) & 0x3; }
     QString TransmissionModeString(void) const
     {
-        static std::array<QString,4> tm { "2", "8", "4", "auto" };
+        static const std::array<const QString,4> tm { "2", "8", "4", "auto" };
         return tm[TransmissionMode()];
     }
     // other_frequency_flag     1   8.7
@@ -1864,7 +1864,7 @@ class ParentalRatingDescriptor : public MPEGDescriptor
             // 0x00 - undefined
             return -1;
         }
-        if ((rawRating >= 0x01) && (rawRating <= 0x0F))
+        if (rawRating <= 0x0F)
         {
             // 0x01 to 0x0F - minumum age = rating + 3 years
             return rawRating + 3;

diff --git a/mythtv/libs/libmythtv/mythvideooutgpu.cpp b/mythtv/libs/libmythtv/mythvideooutgpu.cpp
@@ -136,6 +136,7 @@ MythVideoOutputGPU *MythVideoOutputGPU::Create(MythMainWindow* MainWindow, MythR
 //            video = new VideoOutputD3D();
 #endif
 #ifdef USING_OPENGL
+        // cppcheck-suppress knownConditionTrueFalse
         if (!video && renderer.contains("opengl") && openglrender)
         {
             video = new MythVideoOutputOpenGL(MainWindow, openglrender,

diff --git a/mythtv/libs/libmythtv/recorders/dtvrecorder.cpp b/mythtv/libs/libmythtv/recorders/dtvrecorder.cpp
@@ -1145,7 +1145,7 @@ void DTVRecorder::FindPSKeyFrames(const uint8_t *buffer, uint len)
                 frameRate = frameRateMap[(bufptr[3] & 0x0000000f)];
             }
         }
-        else if (!m_videoBytesRemaining && !m_audioBytesRemaining)
+        else if (!m_audioBytesRemaining)
         {
             if ((stream_id >= PESStreamID::MPEGVideoStreamBegin) &&
                 (stream_id <= PESStreamID::MPEGVideoStreamEnd))

diff --git a/mythtv/libs/libmythtv/recorders/vboxutils.cpp b/mythtv/libs/libmythtv/recorders/vboxutils.cpp
@@ -400,7 +400,7 @@ bool VBox::sendQuery(const QString& query, QDomDocument* xmlDoc)
     return true;
 }
 
-QString VBox::getStrValue(QDomElement &element, const QString &name, int index)
+QString VBox::getStrValue(const QDomElement &element, const QString &name, int index)
 {
     QDomNodeList nodes = element.elementsByTagName(name);
     if (!nodes.isEmpty())
@@ -414,7 +414,7 @@ QString VBox::getStrValue(QDomElement &element, const QString &name, int index)
     return QString();
 }
 
-int VBox::getIntValue(QDomElement &element, const QString &name, int index)
+int VBox::getIntValue(const QDomElement &element, const QString &name, int index)
 {
     QString value = getStrValue(element, name, index);
 

diff --git a/mythtv/libs/libmythtv/recorders/vboxutils.h b/mythtv/libs/libmythtv/recorders/vboxutils.h
@@ -52,7 +52,7 @@ class VBox
   private:
     static QStringList doUPNPSearch(void);
     static QString getFirstText(QDomElement &element);
-    static QString getStrValue(QDomElement &element, const QString &name, int index = 0);
-    static int getIntValue(QDomElement &element, const QString &name, int index = 0);
+    static QString getStrValue(const QDomElement &element, const QString &name, int index = 0);
+    static int getIntValue(const QDomElement &element, const QString &name, int index = 0);
 };
 #endif // VBOX_UTILS_H
diff --git a/mythtv/libs/libmythtv/tv_play.cpp b/mythtv/libs/libmythtv/tv_play.cpp
@@ -2929,27 +2929,27 @@ void TV::HandleSpeedChangeTimerEvent()
 }
 
 ///
-//  \brief Prevent events from being sent to another object.
-//
-//  Selectively block certain KeyPress and Resize events from being sent to
-//  the specified object. This function is called by Qt before it calls
-//  Object->event(Event). It can be used by the TV object to either block
-//  events from being sent to the specified object, or for it to handle the
-//  events instead of sending them to the specified object.  As of mid
-//  2021, this filter is only used to redirect some events from the
-//  MythMainWindow object to the TV object.
-//
-//  \warning If an event will be received by both the MythMainWindow object
-//  and the TV object, block it instead of redirecting it. Redirecting it
-//  just causes the event to be handled twice, once in the direct call from
-//  Qt to TV::event and once in the call from Qt to this function to
-//  TV::event.
-//
-//  \param  Object The QObject whose events are being filtered.
-//  \param  Event  The QEvent that is about to be passed to Object->event().
-//  \return        True if the event should be dropped. False if the Qt
-//                 code should call Object->event(Event).
-//
+/// \brief Prevent events from being sent to another object.
+///
+/// Selectively block certain KeyPress and Resize events from being sent to
+/// the specified object. This function is called by Qt before it calls
+/// Object->event(Event). It can be used by the TV object to either block
+/// events from being sent to the specified object, or for it to handle the
+/// events instead of sending them to the specified object.  As of mid
+/// 2021, this filter is only used to redirect some events from the
+/// MythMainWindow object to the TV object.
+///
+/// \warning If an event will be received by both the MythMainWindow object
+/// and the TV object, block it instead of redirecting it. Redirecting it
+/// just causes the event to be handled twice, once in the direct call from
+/// Qt to TV::event and once in the call from Qt to this function to
+/// TV::event.
+///
+/// \param  Object The QObject whose events are being filtered.
+/// \param  Event  The QEvent that is about to be passed to Object->event().
+/// \return        True if the event should be dropped. False if the Qt
+///                code should call Object->event(Event).
+///
 bool TV::eventFilter(QObject* Object, QEvent* Event)
 {
     // We want to intercept all resize events sent to the main window

diff --git a/mythtv/libs/libmythui/platforms/mythdisplayrpi.cpp b/mythtv/libs/libmythui/platforms/mythdisplayrpi.cpp
@@ -176,7 +176,7 @@ const MythDisplayModes& MythDisplayRPI::GetVideoModes(void)
     m_videoModes.clear();
     m_modeMap.clear();
     DisplayModeMap screenmap;
-    HDMI_RES_GROUP_T groups[2] = { HDMI_RES_GROUP_CEA, HDMI_RES_GROUP_DMT };
+    const HDMI_RES_GROUP_T groups[2] = { HDMI_RES_GROUP_CEA, HDMI_RES_GROUP_DMT };
 
     for (int i = 0; i < 2; ++i)
     {

diff --git a/mythtv/libs/libmythupnp/bufferedsocketdevice.cpp b/mythtv/libs/libmythupnp/bufferedsocketdevice.cpp
@@ -6,7 +6,7 @@
 //                                                                            
 // Copyright (c) 2005 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/bufferedsocketdevice.h b/mythtv/libs/libmythupnp/bufferedsocketdevice.h
@@ -6,7 +6,7 @@
 //                                                                            
 // Copyright (c) 2005 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/configuration.cpp b/mythtv/libs/libmythupnp/configuration.cpp
@@ -6,7 +6,7 @@
 //                                                                            
 // Copyright (c) 2007 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/configuration.h b/mythtv/libs/libmythupnp/configuration.h
@@ -6,7 +6,7 @@
 //                                                                            
 // Copyright (c) 2007 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/eventing.cpp b/mythtv/libs/libmythupnp/eventing.cpp
@@ -6,7 +6,7 @@
 //                                                                            
 // Copyright (c) 2006 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/eventing.h b/mythtv/libs/libmythupnp/eventing.h
@@ -6,7 +6,7 @@
 //
 // Copyright (c) 2006 David Blain <dblain@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/htmlserver.cpp b/mythtv/libs/libmythupnp/htmlserver.cpp
@@ -6,7 +6,7 @@
 //                                                                            
 // Copyright (c) 2011 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/htmlserver.h b/mythtv/libs/libmythupnp/htmlserver.h
@@ -6,7 +6,7 @@
 //
 // Copyright (c) 2011 David Blain <dblain@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/httprequest.cpp b/mythtv/libs/libmythupnp/httprequest.cpp
@@ -6,7 +6,7 @@
 //
 // Copyright (c) 2005 David Blain <dblain@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/httprequest.h b/mythtv/libs/libmythupnp/httprequest.h
@@ -6,7 +6,7 @@
 //
 // Copyright (c) 2005 David Blain <dblain@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/httpserver.cpp b/mythtv/libs/libmythupnp/httpserver.cpp
@@ -8,7 +8,7 @@
 // Copyright (c) 2005 David Blain <dblain@mythtv.org>
 //               2014 Stuart Morgan <smorgan@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/httpserver.h b/mythtv/libs/libmythupnp/httpserver.h
@@ -7,7 +7,7 @@
 //                                                                            
 // Copyright (c) 2005 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/mbroadcastsocketdevice.h b/mythtv/libs/libmythupnp/mbroadcastsocketdevice.h
@@ -6,7 +6,7 @@
 //
 // Copyright (c) 2005 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/mmulticastsocketdevice.cpp b/mythtv/libs/libmythupnp/mmulticastsocketdevice.cpp
@@ -6,7 +6,7 @@
 //                                                                            
 // Copyright (c) 2005 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/mmulticastsocketdevice.h b/mythtv/libs/libmythupnp/mmulticastsocketdevice.h
@@ -6,7 +6,7 @@
 //                                                                            
 // Copyright (c) 2005 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/mythxmlclient.cpp b/mythtv/libs/libmythupnp/mythxmlclient.cpp
@@ -6,7 +6,7 @@
 //
 // Copyright (c) 2007 David Blain <dblain@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/mythxmlclient.h b/mythtv/libs/libmythupnp/mythxmlclient.h
@@ -6,7 +6,7 @@
 //
 // Copyright (c) 2007 David Blain <dblain@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/serializers/jsonSerializer.cpp b/mythtv/libs/libmythupnp/serializers/jsonSerializer.cpp
@@ -6,7 +6,7 @@
 //                                                                            
 // Copyright (c) 2005 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/serializers/jsonSerializer.h b/mythtv/libs/libmythupnp/serializers/jsonSerializer.h
@@ -6,7 +6,7 @@
 //                                                                            
 // Copyright (c) 2005 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/serializers/serializer.cpp b/mythtv/libs/libmythupnp/serializers/serializer.cpp
@@ -6,7 +6,7 @@
 //                                                                            
 // Copyright (c) 2005 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/serializers/serializer.h b/mythtv/libs/libmythupnp/serializers/serializer.h
@@ -6,7 +6,7 @@
 //                                                                            
 // Copyright (c) 2005 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/serializers/soapSerializer.h b/mythtv/libs/libmythupnp/serializers/soapSerializer.h
@@ -6,7 +6,7 @@
 //                                                                            
 // Copyright (c) 2005 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/serializers/xmlSerializer.cpp b/mythtv/libs/libmythupnp/serializers/xmlSerializer.cpp
@@ -6,7 +6,7 @@
 //                                                                            
 // Copyright (c) 2005 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/serializers/xmlSerializer.h b/mythtv/libs/libmythupnp/serializers/xmlSerializer.h
@@ -6,7 +6,7 @@
 //                                                                            
 // Copyright (c) 2005 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/serverSideScripting.cpp b/mythtv/libs/libmythupnp/serverSideScripting.cpp
@@ -6,7 +6,7 @@
 //                                                                            
 // Copyright (c) 2011 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/serverSideScripting.h b/mythtv/libs/libmythupnp/serverSideScripting.h
@@ -6,7 +6,7 @@
 //                                                                            
 // Copyright (c) 2011 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/servicehost.cpp b/mythtv/libs/libmythupnp/servicehost.cpp
@@ -6,7 +6,7 @@
 //
 // Copyright (c) 2010 David Blain <dblain@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/servicehost.h b/mythtv/libs/libmythupnp/servicehost.h
@@ -6,7 +6,7 @@
 //                                                                            
 // Copyright (c) 2010 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/soapclient.cpp b/mythtv/libs/libmythupnp/soapclient.cpp
@@ -6,7 +6,7 @@
 //                                                                            
 // Copyright (c) 2007 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/soapclient.h b/mythtv/libs/libmythupnp/soapclient.h
@@ -6,7 +6,7 @@
 //                                                                            
 // Copyright (c) 2007 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/ssdp.cpp b/mythtv/libs/libmythupnp/ssdp.cpp
@@ -6,7 +6,7 @@
 //                                                                            
 // Copyright (c) 2005 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/ssdp.h b/mythtv/libs/libmythupnp/ssdp.h
@@ -6,7 +6,7 @@
 //
 // Copyright (c) 2005 David Blain <dblain@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/ssdpcache.cpp b/mythtv/libs/libmythupnp/ssdpcache.cpp
@@ -6,7 +6,7 @@
 //                                                                            
 // Copyright (c) 2007 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/ssdpcache.h b/mythtv/libs/libmythupnp/ssdpcache.h
@@ -6,7 +6,7 @@
 //
 // Copyright (c) 2007 David Blain <dblain@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/taskqueue.cpp b/mythtv/libs/libmythupnp/taskqueue.cpp
@@ -6,7 +6,7 @@
 //                                                                            
 // Copyright (c) 2005 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 
@@ -164,8 +164,8 @@ void TaskQueue::Clear( )
 
 /////////////////////////////////////////////////////////////////////////////
 /// \brief Add a task to run in the future.
-//  \param msec The number of milliseconds in the future to run this task
-//  \param pTask A pointer to the task.
+/// \param msec The number of milliseconds in the future to run this task
+/// \param pTask A pointer to the task.
 /////////////////////////////////////////////////////////////////////////////
 
 void TaskQueue::AddTask( std::chrono::milliseconds msec, Task *pTask )
@@ -177,8 +177,8 @@ void TaskQueue::AddTask( std::chrono::milliseconds msec, Task *pTask )
 
 /////////////////////////////////////////////////////////////////////////////
 /// \brief Add a task to run at a specific time.
-//  \param msec The time when this task should run
-//  \param pTask A pointer to the task.
+/// \param msec The time when this task should run
+/// \param pTask A pointer to the task.
 /////////////////////////////////////////////////////////////////////////////
 
 void TaskQueue::AddTaskAbsolute( TaskTime ttKey, Task *pTask )
@@ -194,7 +194,7 @@ void TaskQueue::AddTaskAbsolute( TaskTime ttKey, Task *pTask )
 
 /////////////////////////////////////////////////////////////////////////////
 /// \brief Add a task to run now.
-//  \param pTask A pointer to the task.
+/// \param pTask A pointer to the task.
 /////////////////////////////////////////////////////////////////////////////
 
 void TaskQueue::AddTask( Task *pTask )

diff --git a/mythtv/libs/libmythupnp/taskqueue.h b/mythtv/libs/libmythupnp/taskqueue.h
@@ -6,7 +6,7 @@
 //                                                                            
 // Copyright (c) 2005 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/upnp.cpp b/mythtv/libs/libmythupnp/upnp.cpp
@@ -6,7 +6,7 @@
 //
 // Copyright (c) 2005 David Blain <dblain@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/upnp.h b/mythtv/libs/libmythupnp/upnp.h
@@ -6,7 +6,7 @@
 //                                                                            
 // Copyright (c) 2005 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/upnpcds.cpp b/mythtv/libs/libmythupnp/upnpcds.cpp
@@ -6,7 +6,7 @@
 //
 // Copyright (c) 2005 David Blain <dblain@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/upnpcds.h b/mythtv/libs/libmythupnp/upnpcds.h
@@ -6,7 +6,7 @@
 //                                                                            
 // Copyright (c) 2005 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/upnpcdsobjects.cpp b/mythtv/libs/libmythupnp/upnpcdsobjects.cpp
@@ -6,7 +6,7 @@
 //                                                                            
 // Copyright (c) 2005 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/upnpcdsobjects.h b/mythtv/libs/libmythupnp/upnpcdsobjects.h
@@ -6,7 +6,7 @@
 //
 // Copyright (c) 2005 David Blain <dblain@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/upnpcmgr.cpp b/mythtv/libs/libmythupnp/upnpcmgr.cpp
@@ -6,7 +6,7 @@
 //                                                                            
 // Copyright (c) 2006 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/upnpcmgr.h b/mythtv/libs/libmythupnp/upnpcmgr.h
@@ -6,7 +6,7 @@
 //                                                                            
 // Copyright (c) 2006 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/upnpdevice.cpp b/mythtv/libs/libmythupnp/upnpdevice.cpp
@@ -6,7 +6,7 @@
 //
 // Copyright (c) 2005 David Blain <dblain@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/upnpdevice.h b/mythtv/libs/libmythupnp/upnpdevice.h
@@ -6,7 +6,7 @@
 //
 // Copyright (c) 2005 David Blain <dblain@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/upnpserviceimpl.h b/mythtv/libs/libmythupnp/upnpserviceimpl.h
@@ -6,7 +6,7 @@
 //                                                                            
 // Copyright (c) 2007 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/upnptaskcache.h b/mythtv/libs/libmythupnp/upnptaskcache.h
@@ -6,7 +6,7 @@
 //                                                                            
 // Copyright (c) 2007 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/upnptaskevent.cpp b/mythtv/libs/libmythupnp/upnptaskevent.cpp
@@ -6,7 +6,7 @@
 //                                                                            
 // Copyright (c) 2006 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/upnptaskevent.h b/mythtv/libs/libmythupnp/upnptaskevent.h
@@ -6,7 +6,7 @@
 //                                                                            
 // Copyright (c) 2006 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/upnptasknotify.cpp b/mythtv/libs/libmythupnp/upnptasknotify.cpp
@@ -6,7 +6,7 @@
 //                                                                            
 // Copyright (c) 2005 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/upnptasknotify.h b/mythtv/libs/libmythupnp/upnptasknotify.h
@@ -6,7 +6,7 @@
 //
 // Copyright (c) 2005 David Blain <dblain@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/upnptasksearch.cpp b/mythtv/libs/libmythupnp/upnptasksearch.cpp
@@ -6,7 +6,7 @@
 //                                                                            
 // Copyright (c) 2005 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/upnptasksearch.h b/mythtv/libs/libmythupnp/upnptasksearch.h
@@ -6,7 +6,7 @@
 //                                                                            
 // Copyright (c) 2005 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/upnputil.cpp b/mythtv/libs/libmythupnp/upnputil.cpp
@@ -6,7 +6,7 @@
 //                                                                            
 // Copyright (c) 2007 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/upnputil.h b/mythtv/libs/libmythupnp/upnputil.h
@@ -6,7 +6,7 @@
 //                                                                            
 // Copyright (c) 2007 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/websocket.h b/mythtv/libs/libmythupnp/websocket.h
@@ -6,7 +6,7 @@
 //
 // Copyright (c) 2015 Stuart Morgan <smorgan@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/wsdl.cpp b/mythtv/libs/libmythupnp/wsdl.cpp
@@ -6,7 +6,7 @@
 //                                                                            
 // Copyright (c) 2010 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/wsdl.h b/mythtv/libs/libmythupnp/wsdl.h
@@ -6,7 +6,7 @@
 //                                                                            
 // Copyright (c) 2010 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/xsd.cpp b/mythtv/libs/libmythupnp/xsd.cpp
@@ -6,7 +6,7 @@
 //                                                                            
 // Copyright (c) 2012 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 /////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/libs/libmythupnp/xsd.h b/mythtv/libs/libmythupnp/xsd.h
@@ -6,7 +6,7 @@
 //                                                                            
 // Copyright (c) 2012 David Blain <dblain@mythtv.org>
 //                                          
-// Licensed under the GPL v2 or later, see COPYING for details                    
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/programs/mythbackend/serviceHosts/musicServiceHost.h b/mythtv/programs/mythbackend/serviceHosts/musicServiceHost.h
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2017 Paul Harrison <pharrison@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/programs/mythbackend/services/music.cpp b/mythtv/programs/mythbackend/services/music.cpp
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2017 Paul Harrison <pharrison@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/programs/mythbackend/services/music.h b/mythtv/programs/mythbackend/services/music.h
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2017 Paul Harrison <pharrison@mythtv.org>
 //
-// Licensed under the GPL v2 or later, see COPYING for details
+// Licensed under the GPL v2 or later, see LICENSE for details
 //
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/mythtv/programs/mythcommflag/ClassicCommDetector.cpp b/mythtv/programs/mythcommflag/ClassicCommDetector.cpp
@@ -1883,6 +1883,9 @@ void ClassicCommDetector::BuildBlankFrameCommList(void)
 {
     LOG(VB_COMMFLAG, LOG_INFO, "CommDetect::BuildBlankFrameCommList()");
 
+    if (m_blankFrameMap.count() == 0)
+        return;
+
     auto *bframes = new long long[m_blankFrameMap.count()*2];
     auto *c_start = new long long[m_blankFrameMap.count()];
     auto *c_end   = new long long[m_blankFrameMap.count()];
@@ -1894,14 +1897,6 @@ void ClassicCommDetector::BuildBlankFrameCommList(void)
     for (auto it = m_blankFrameMap.begin(); it != m_blankFrameMap.end(); ++it)
         bframes[frames++] = it.key();
 
-    if (frames == 0)
-    {
-        delete[] c_start;
-        delete[] c_end;
-        delete[] bframes;
-        return;
-    }
-
     // detect individual commercials from blank frames
     // commercial end is set to frame right before ending blank frame to
     //    account for instances with only a single blank frame between comms.

diff --git a/mythtv/programs/mythfrontend/networkcontrol.cpp b/mythtv/programs/mythfrontend/networkcontrol.cpp
@@ -1538,7 +1538,7 @@ void NetworkControl::notifyDataAvailable(void)
 }
 
 void NetworkControl::sendReplyToClient(NetworkControlClient *ncc,
-                                       QString &reply)
+                                       const QString &reply)
 {
     if (!m_clients.contains(ncc))
     {

diff --git a/mythtv/programs/mythfrontend/networkcontrol.h b/mythtv/programs/mythfrontend/networkcontrol.h
@@ -123,7 +123,7 @@ class NetworkControl : public ServerPool, public QRunnable
     QString processHelp(NetworkCommand *nc);
 
     void notifyDataAvailable(void);
-    void sendReplyToClient(NetworkControlClient *ncc, QString &reply);
+    void sendReplyToClient(NetworkControlClient *ncc, const QString &reply);
     void customEvent(QEvent *e) override; // QObject
 
     static QString listRecordings(const QString& chanid = "", const QString& starttime = "");

diff --git a/mythtv/programs/mythfrontend/playbackbox.cpp b/mythtv/programs/mythfrontend/playbackbox.cpp
@@ -3565,7 +3565,7 @@ void PlaybackBox::stopPlaylistJobQueueJob(int jobType)
                 jobType, tmpItem->GetChanID(),
                 tmpItem->GetRecordingStartTime(), JOB_STOP);
 
-            if ((jobType & JOB_COMMFLAG) && (tmpItem))
+            if (jobType & JOB_COMMFLAG)
             {
                 tmpItem->SetEditing(false);
                 tmpItem->SetFlagging(false);

diff --git a/mythtv/programs/mythfrontend/upnpscanner.cpp b/mythtv/programs/mythfrontend/upnpscanner.cpp
@@ -77,19 +77,19 @@ void MediaServerItem::Reset(void)
 }
 
 /**
- * \class MediaServer
+ * \class UpnpMediaServer
  *  A simple wrapper containing details about a UPnP Media Server
  */
-class MediaServer : public MediaServerItem
+class UpnpMediaServer : public MediaServerItem
 {
   public:
-    MediaServer()
+    UpnpMediaServer()
      : MediaServerItem(QString("0"), QString(), QString(), QString()),
        m_eventSubPath(QString()),
        m_friendlyName(QString("Unknown"))
     {
     }
-    explicit MediaServer(QUrl URL)
+    explicit UpnpMediaServer(QUrl URL)
      : MediaServerItem(QString("0"), QString(), QString(), QString()),
        m_serverURL(std::move(URL)), m_eventSubPath(QString()),
        m_friendlyName(QString("Unknown"))
@@ -225,7 +225,7 @@ void UPNPScanner::GetInitialMetadata(VideoMetadataListManager::metadata_list* li
     mediaservers->setPathRoot();
 
     m_lock.lock();
-    QMutableHashIterator<QString,MediaServer*> it(m_servers);
+    QMutableHashIterator<QString,UpnpMediaServer*> it(m_servers);
     while (it.hasNext())
     {
         it.next();
@@ -271,7 +271,7 @@ void UPNPScanner::GetMetadata(VideoMetadataListManager::metadata_list* list,
     mediaservers->setPathRoot();
 
     m_lock.lock();
-    QMutableHashIterator<QString,MediaServer*> it(m_servers);
+    QMutableHashIterator<QString,UpnpMediaServer*> it(m_servers);
     while (it.hasNext())
     {
         it.next();
@@ -398,7 +398,7 @@ QMap<QString,QString> UPNPScanner::ServerList(void)
 {
     QMap<QString,QString> servers;
     m_lock.lock();
-    QHashIterator<QString,MediaServer*> it(m_servers);
+    QHashIterator<QString,UpnpMediaServer*> it(m_servers);
     while (it.hasNext())
     {
         it.next();
@@ -467,7 +467,7 @@ void UPNPScanner::Stop(void)
         m_watchdogTimer->stop();
 
     // cleanup our servers and subscriptions
-    QHashIterator<QString,MediaServer*> it(m_servers);
+    QHashIterator<QString,UpnpMediaServer*> it(m_servers);
     while (it.hasNext())
     {
         it.next();
@@ -523,7 +523,7 @@ void UPNPScanner::Update(void)
     // if our network queue is full, then we may need to come back later
     bool reschedule = false;
 
-    QHashIterator<QString,MediaServer*> it(m_servers);
+    QHashIterator<QString,UpnpMediaServer*> it(m_servers);
     while (it.hasNext())
     {
         it.next();
@@ -564,7 +564,7 @@ void UPNPScanner::CheckStatus(void)
     // Remove stale servers - the SSDP cache code does not send out removal
     // notifications for expired (rather than explicitly closed) connections
     m_lock.lock();
-    QMutableHashIterator<QString,MediaServer*> it(m_servers);
+    QMutableHashIterator<QString,UpnpMediaServer*> it(m_servers);
     while (it.hasNext())
     {
         it.next();
@@ -573,7 +573,7 @@ void UPNPScanner::CheckStatus(void)
         {
             LOG(VB_UPNP, LOG_INFO, LOC + QString("%1 no longer in SSDP cache. Removing")
                 .arg(it.value()->m_serverURL.toString()));
-            MediaServer* last = it.value();
+            UpnpMediaServer* last = it.value();
             it.remove();
             delete last;
         }
@@ -734,7 +734,7 @@ void UPNPScanner::timerEvent(QTimerEvent * event)
     QString usn;
 
     m_lock.lock();
-    QHashIterator<QString,MediaServer*> it(m_servers);
+    QHashIterator<QString,UpnpMediaServer*> it(m_servers);
     while (it.hasNext())
     {
         it.next();
@@ -775,7 +775,7 @@ void UPNPScanner::ScheduleUpdate(void)
 void UPNPScanner::CheckFailure(const QUrl &url)
 {
     m_lock.lock();
-    QHashIterator<QString,MediaServer*> it(m_servers);
+    QHashIterator<QString,UpnpMediaServer*> it(m_servers);
     while (it.hasNext())
     {
         it.next();
@@ -796,7 +796,7 @@ void UPNPScanner::Debug(void)
     m_lock.lock();
     LOG(VB_UPNP, LOG_INFO, LOC + QString("%1 media servers discovered:")
                                    .arg(m_servers.size()));
-    QHashIterator<QString,MediaServer*> it(m_servers);
+    QHashIterator<QString,UpnpMediaServer*> it(m_servers);
     while (it.hasNext())
     {
         it.next();
@@ -831,7 +831,7 @@ void UPNPScanner::BrowseNextContainer(void)
 {
     QMutexLocker locker(&m_lock);
 
-    QHashIterator<QString,MediaServer*> it(m_servers);
+    QHashIterator<QString,UpnpMediaServer*> it(m_servers);
     bool complete = true;
     while (it.hasNext())
     {
@@ -943,7 +943,7 @@ void UPNPScanner::AddServer(const QString &usn, const QString &url)
     m_lock.lock();
     if (!m_servers.contains(usn))
     {
-        m_servers.insert(usn, new MediaServer(url));
+        m_servers.insert(usn, new UpnpMediaServer(url));
         LOG(VB_GENERAL, LOG_INFO, LOC + QString("Adding: %1").arg(usn));
         ScheduleUpdate();
     }
@@ -959,7 +959,7 @@ void UPNPScanner::RemoveServer(const QString &usn)
     if (m_servers.contains(usn))
     {
         LOG(VB_GENERAL, LOG_INFO, LOC + QString("Removing: %1").arg(usn));
-        MediaServer* old = m_servers[usn];
+        UpnpMediaServer* old = m_servers[usn];
         if (old->m_renewalTimerId)
             killTimer(old->m_renewalTimerId);
         m_servers.remove(usn);
@@ -1035,8 +1035,8 @@ void UPNPScanner::ParseBrowse(const QUrl &url, QNetworkReply *reply)
     // determine the 'server' which requested the browse
     m_lock.lock();
 
-    MediaServer* server = nullptr;
-    QHashIterator<QString,MediaServer*> it(m_servers);
+    UpnpMediaServer* server = nullptr;
+    QHashIterator<QString,UpnpMediaServer*> it(m_servers);
     while (it.hasNext())
     {
         it.next();
@@ -1300,7 +1300,7 @@ bool UPNPScanner::ParseDescription(const QUrl &url, QNetworkReply *reply)
     std::chrono::seconds timeout = 0s;
 
     m_lock.lock();
-    QHashIterator<QString,MediaServer*> it(m_servers);
+    QHashIterator<QString,UpnpMediaServer*> it(m_servers);
     while (it.hasNext())
     {
         it.next();

diff --git a/mythtv/programs/mythfrontend/upnpscanner.h b/mythtv/programs/mythfrontend/upnpscanner.h
@@ -21,7 +21,7 @@
 #include "upnpexp.h"
 #include "videometadatalistmanager.h"
 
-class MediaServer;
+class UpnpMediaServer;
 class UPNPSubscription;
 class meta_dir_node;
 
@@ -124,7 +124,7 @@ class UPNPScanner : public QObject
 #else
     QRecursiveMutex  m_lock;
 #endif
-    QHash<QString,MediaServer*> m_servers;
+    QHash<QString,UpnpMediaServer*> m_servers;
     QNetworkAccessManager *m_network {nullptr};
     // TODO Move to QMultiHash when we move to Qt >=4.7
     // QHash(QUrl) unsupported on < 4.7

diff --git a/mythtv/programs/mythwelcome/main.cpp b/mythtv/programs/mythwelcome/main.cpp
@@ -145,8 +145,8 @@ int main(int argc, char **argv)
         // Block by running an event loop until last screen is removed
         QEventLoop block;
         QObject::connect(mainStack, &MythScreenStack::topScreenChanged,
-                         &block, [&](MythScreenType* _screen)
-        { if (!_screen) block.quit(); });
+                         &block, [&](const MythScreenType* _screen)
+                             { if (!_screen) block.quit(); });
         block.exec();
     }
 

diff --git a/mythtv/programs/programs-libs.pro b/mythtv/programs/programs-libs.pro
@@ -4,7 +4,7 @@ win32-msvc*:INCLUDEPATH -= $$SRC_PATH_BARE/../platform/win32/msvc/external/pthre
 INCLUDEPATH += ../.. ../../libs/ ../../libs/libmyth ../../libs/libmyth/audio
 INCLUDEPATH +=  ../../libs/libmythtv ../.. ../../external/FFmpeg
 INCLUDEPATH += ../../libs/libmythupnp ../../libs/libmythui ../../libs/libmythmetadata
-INCLUDEPATH += ../../libs/libmythlivemedia ../../libs/libmythbase
+INCLUDEPATH += ../../libs/libmythbase
 
 !win32-msvc* {
   QMAKE_CXXFLAGS += -isystem ../../external/libmythdvdnav/dvdnav
@@ -64,7 +64,6 @@ LIBS += -lmythservicecontracts-$$LIBVERSION
 LIBS += -lmythprotoserver-$$LIBVERSION
 
 using_frontend: using_opengl: QT += opengl
-using_live:LIBS += -L../../libs/libmythlivemedia -lmythlivemedia-$$LIBVERSION
 using_mheg:LIBS += -L../../libs/libmythfreemheg -lmythfreemheg-$$LIBVERSION
 using_hdhomerun:LIBS += -lhdhomerun
 using_taglib: LIBS += $$CONFIG_TAGLIB_LIBS
@@ -95,16 +94,14 @@ win32 {
     POST_TARGETDEPS += ../../libs/libmythbase/libmythbase-$${MYTH_SHLIB_EXT}
     POST_TARGETDEPS += ../../libs/libmythservicecontracts/libmythservicecontracts-$${MYTH_SHLIB_EXT}
     POST_TARGETDEPS += ../../libs/libmythprotoserver/libmythprotoserver-$${MYTH_SHLIB_EXT}
-
-    using_live: POST_TARGETDEPS += ../../libs/libmythlivemedia/libmythlivemedia-$${MYTH_SHLIB_EXT}
 }
 
 DEPENDPATH += ../.. ../../libs ../../libs/libmyth ../../libs/libmyth/audio
 DEPENDPATH += ../../libs/libmythtv
 DEPENDPATH += ../../libs/libmythtv/mpeg ../../libs/libmythtv/vbitext
 DEPENDPATH += ../.. ../../external/FFmpeg
 DEPENDPATH += ../../libs/libmythupnp ../../libs/libmythui
-DEPENDPATH += ../../libs/libmythlivemedia ../../libmythbase
+DEPENDPATH += ../../libmythbase
 DEPENDPATH +=../../libs/libmythservicecontracts ../../libs/libmythprotoserver
 
 using_mingw:DEFINES += USING_MINGW

diff --git a/mythtv/programs/scripts/metadata/Music/discid/COPYING.LESSER b/mythtv/programs/scripts/metadata/Music/discid/COPYING.LESSER
@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/mythtv/programs/scripts/metadata/Music/musicbrainzngs/COPYING b/mythtv/programs/scripts/metadata/Music/musicbrainzngs/COPYING
@@ -0,0 +1,40 @@
+Copyright 2011 Alastair Porter, Adrian Sampson, and others.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+The license for the file `musicbrainzngs/compat.py` is
+
+Copyright (c) 2012 Kenneth Reitz.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/mythtv/programs/scripts/metadata/Television/ttvdb4.py b/mythtv/programs/scripts/metadata/Television/ttvdb4.py
@@ -4,7 +4,7 @@
 # ----------------------------------------------------
 # Purpose:   MythTV Python Bindings for TheTVDB v4 API
 # Copyright: (c) 2021 Roland Ernst
-# License:   GPL v2 or later, see COPYING for details
+# License:   GPL v2 or later, see LICENSE for details
 # ----------------------------------------------------