MythTV · ulmus-scott · May 22, 2025 · May 22, 2025 · May 17, 2025 · May 17, 2025
diff --git a/cmake/VersionInformation.cmake b/cmake/VersionInformation.cmake
@@ -17,7 +17,7 @@ endif()
 #
 
 # See mythtv/libs/libmythbase/mythversion.h.in
-set(MYTHTV_BINARY_CHANGED "20250212-1")
+set(MYTHTV_BINARY_CHANGED "20250816-1")
 set(MYTHTV_BINARY_VERSION "${PROJECT_VERSION_MAJOR}.${MYTHTV_BINARY_CHANGED}")
 
 # See mythtv/bindings/python/MythTV/static.py.in

diff --git a/mythplugins/mytharchive/mytharchive/thumbfinder.h b/mythplugins/mytharchive/mytharchive/thumbfinder.h
@@ -12,7 +12,7 @@ extern "C" {
 #include <QScopedPointer>
 
 // mythtv
-#include <libmyth/mythavframe.h>
+#include <libmythtv/mythavframe.h>
 #include <libmythbase/programtypes.h>
 #include <libmythtv/mythavutil.h>
 #include <libmythui/mythscreentype.h>

diff --git a/mythplugins/mytharchive/mytharchivehelper/mytharchivehelper.cpp b/mythplugins/mytharchive/mytharchivehelper/mytharchivehelper.cpp
@@ -42,7 +42,7 @@
 
 // MythTV headers
 #include <mythconfig.h>
-#include <libmyth/mythavframe.h>
+#include <libmythtv/mythavframe.h>
 #include <libmyth/mythcontext.h>
 #include <libmythbase/exitcodes.h>
 #include <libmythbase/filesysteminfo.h>

diff --git a/mythplugins/mythmusic/mythmusic/avfdecoder.cpp b/mythplugins/mythmusic/mythmusic/avfdecoder.cpp
@@ -30,8 +30,8 @@
 
 // MythTV headers
 #include <mythconfig.h>
-#include <libmyth/audio/audiooutput.h>
-#include <libmyth/audio/audiooutpututil.h>
+#include <libmythtv/audio/audiooutput.h>
+#include <libmythtv/audio/audiooutputsettings.h>
 #include <libmythbase/mythlogging.h>
 #include <libmythmetadata/metaio.h>
 #include <libmythmetadata/metaioavfcomment.h>

diff --git a/mythplugins/mythmusic/mythmusic/avfdecoder.h b/mythplugins/mythmusic/mythmusic/avfdecoder.h
@@ -12,7 +12,7 @@ extern "C" {
 #include <QObject>
 
 // MythTV headers
-#include <libmyth/audio/audiooutputsettings.h>
+#include <libmythtv/audio/audiooutputsettings.h>
 #include <libmythtv/mythavutil.h>
 
 // Mythmusic Headers

diff --git a/mythplugins/mythmusic/mythmusic/cddecoder.cpp b/mythplugins/mythmusic/mythmusic/cddecoder.cpp
@@ -17,7 +17,7 @@
 #include <cdio/logging.h>
 
 // MythTV
-#include <libmyth/audio/audiooutput.h>
+#include <libmythtv/audio/audiooutput.h>
 #include <libmythbase/mythlogging.h>
 #include <libmythmetadata/musicmetadata.h>
 

diff --git a/mythplugins/mythmusic/mythmusic/decoder.cpp b/mythplugins/mythmusic/mythmusic/decoder.cpp
@@ -8,8 +8,6 @@
 #include <QDir>
 
 // MythTV
-#include <libmyth/output.h>
-#include <libmyth/visual.h>
 #include <libmythmetadata/metaio.h>
 #include <libmythmetadata/musicmetadata.h>
 

diff --git a/mythplugins/mythmusic/mythmusic/decoder.h b/mythplugins/mythmusic/mythmusic/decoder.h
@@ -21,7 +21,6 @@ class DecoderFactory;
 
 class QObject;
 class QIODevice;
-class OutputEvent;
 
 class Buffer;
 class AudioOutput;

diff --git a/mythplugins/mythmusic/mythmusic/lyricsview.cpp b/mythplugins/mythmusic/mythmusic/lyricsview.cpp
@@ -9,7 +9,7 @@
 #include <QThread>
 
 // MythTV
-#include <libmyth/audio/audiooutput.h>
+#include <libmythtv/audio/audiooutput.h>
 #include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdbcon.h>
 #include <libmythbase/mythdirs.h>
@@ -101,11 +101,11 @@ void LyricsView::customEvent(QEvent *event)
     {
         findLyrics();
     }
-    else if (event->type() == OutputEvent::kInfo)
+    else if (event->type() == AudioOutput::Event::kInfo)
     {
         if (m_autoScroll)
         {
-            auto *oe = dynamic_cast<OutputEvent *>(event);
+            auto *oe = dynamic_cast<AudioOutput::Event *>(event);
             MusicMetadata *curMeta = gPlayer->getCurrentMetadata();
 
             if (!oe || !curMeta)

diff --git a/mythplugins/mythmusic/mythmusic/mainvisual.cpp b/mythplugins/mythmusic/mythmusic/mainvisual.cpp
@@ -141,8 +141,8 @@ void MainVisual::prepare()
         delete m_nodes.takeLast();
 }
 
-// This is called via : mythtv/libs/libmyth/output.cpp :: OutputListeners::dispatchVisual
-//    from : mythtv/libs/libmyth/audio/audiooutputbase.cpp :: AudioOutputBase::AddData
+// This is called via : mythtv/libs/libmythtv/audio/audiooutput.cpp :: AudioOutput::dispatchVisual
+//    from : mythtv/libs/libmythtv/audio/audiooutputbase.cpp :: AudioOutputBase::AddData
 // Caller holds mutex() lock
 void MainVisual::add(const void *buffer, unsigned long b_len,
                      std::chrono::milliseconds timecode,
@@ -266,17 +266,17 @@ void MainVisual::resize(const QSize size)
 
 void MainVisual::customEvent(QEvent *event)
 {
-    if ((event->type() == OutputEvent::kPlaying)   ||
-        (event->type() == OutputEvent::kInfo)      ||
-        (event->type() == OutputEvent::kBuffering) ||
-        (event->type() == OutputEvent::kPaused))
+    if ((event->type() == AudioOutput::Event::kPlaying)   ||
+        (event->type() == AudioOutput::Event::kInfo)      ||
+        (event->type() == AudioOutput::Event::kBuffering) ||
+        (event->type() == AudioOutput::Event::kPaused))
     {
         m_playing = true;
         if (!m_updateTimer->isActive())
             m_updateTimer->start();
     }
-    else if ((event->type() == OutputEvent::kStopped) ||
-             (event->type() == OutputEvent::kError))
+    else if ((event->type() == AudioOutput::Event::kStopped) ||
+             (event->type() == AudioOutput::Event::kError))
     {
         m_playing = false;
     }

diff --git a/mythplugins/mythmusic/mythmusic/mainvisual.h b/mythplugins/mythmusic/mythmusic/mainvisual.h
@@ -23,15 +23,15 @@
 #include <QWidget>
 
 // MythTV headers
-#include <libmyth/visual.h>
+#include <libmythtv/audio/visualization.h>
 
 // MythMusic
 #include "visualize.h"
 
 class MythUIVideo;
 
 // base class to handle things like frame rate...
-class MainVisual :  public QObject, public MythTV::Visual
+class MainVisual :  public QObject, public Visualization
 {
     Q_OBJECT
 

diff --git a/mythplugins/mythmusic/mythmusic/musiccommon.cpp b/mythplugins/mythmusic/mythmusic/musiccommon.cpp
@@ -7,7 +7,7 @@
 #include <QLocale>
 
 // mythtv
-#include <libmyth/audio/audiooutput.h>
+#include <libmythtv/audio/audiooutput.h>
 #include <libmythbase/lcddevice.h>
 #include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdate.h>
@@ -1232,7 +1232,7 @@ void MusicCommon::customEvent(QEvent *event)
 {
     QString statusString;
 
-    if (event->type() == OutputEvent::kPlaying)
+    if (event->type() == AudioOutput::Event::kPlaying)
     {
         MusicMetadata *curMeta = gPlayer->getCurrentMetadata();
         if (curMeta)
@@ -1265,11 +1265,11 @@ void MusicCommon::customEvent(QEvent *event)
             updateVolume();
         }
     }
-    else if (event->type() == OutputEvent::kBuffering)
+    else if (event->type() == AudioOutput::Event::kBuffering)
     {
         statusString = tr("Buffering stream.");
     }
-    else if (event->type() == OutputEvent::kPaused)
+    else if (event->type() == AudioOutput::Event::kPaused)
     {
         statusString = tr("Stream paused.");
 
@@ -1292,10 +1292,10 @@ void MusicCommon::customEvent(QEvent *event)
             }
         }
     }
-    else if (event->type() == OutputEvent::kInfo)
+    else if (event->type() == AudioOutput::Event::kInfo)
     {
 
-        auto *oe = dynamic_cast<OutputEvent *>(event);
+        auto *oe = dynamic_cast<AudioOutput::Event *>(event);
 
         if (!oe)
             return;
@@ -1364,7 +1364,7 @@ void MusicCommon::customEvent(QEvent *event)
         // TODO only need to update the playlist times here
         updatePlaylistStats();
     }
-    else if (event->type() == OutputEvent::kStopped)
+    else if (event->type() == AudioOutput::Event::kStopped)
     {
         statusString = tr("Stream stopped.");
         if (m_stopButton)

diff --git a/mythplugins/mythmusic/mythmusic/musiccommon.h b/mythplugins/mythmusic/mythmusic/musiccommon.h
@@ -6,7 +6,7 @@
 #include <QObject>
 
 // mythtv
-#include <libmyth/audio/audiooutput.h>
+#include <libmythtv/audio/audiooutput.h>
 #include <libmythbase/mythpluginexport.h>
 #include <libmythmetadata/musicmetadata.h>
 #include <libmythui/mythscreentype.h>

diff --git a/mythplugins/mythmusic/mythmusic/musicplayer.cpp b/mythplugins/mythmusic/mythmusic/musicplayer.cpp
@@ -9,7 +9,7 @@
 #include <QWidget>
 
 // mythtv
-#include <libmyth/audio/audiooutput.h>
+#include <libmythtv/audio/audiooutput.h>
 #include <libmythbase/mthreadpool.h>
 #include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdb.h>
@@ -288,7 +288,7 @@ void MusicPlayer::stop(bool stopAll)
 
     // because we don't actually stop the audio output we have to fake a Stopped
     // event so any listeners can act on it
-    OutputEvent oe(OutputEvent::kStopped);
+    AudioOutput::Event oe(AudioOutput::Event::kStopped);
     dispatch(oe);
 
     gCoreContext->emitTVPlaybackStopped();
@@ -389,35 +389,23 @@ bool MusicPlayer::openOutputDevice(void)
                    AUDIOOUTPUT_MUSIC, true, false,
                    gCoreContext->GetNumSetting("MusicDefaultUpmix", 0) + 1);
 
-    if (!m_output)
-    {
-        LOG(VB_GENERAL, LOG_ERR,
-            QString("MusicPlayer: Cannot open audio output device: %1").arg(adevice));
-
-        return false;
-    }
-
-    if (!m_output->GetError().isEmpty())
+    if (m_output == nullptr || !m_output->isConfigured())
     {
         LOG(VB_GENERAL, LOG_ERR,
             QString("MusicPlayer: Cannot open audio output device: %1").arg(adevice));
-        LOG(VB_GENERAL, LOG_ERR,
-            QString("Error was: %1").arg(m_output->GetError()));
 
         delete m_output;
         m_output = nullptr;
 
         return false;
     }
 
-    m_output->setBufferSize(256 * 1024);
-
     m_output->addListener(this);
 
     // add any visuals to the audio output
     // NOLINTNEXTLINE(modernize-loop-convert)
     for (auto it = m_visualisers.begin(); it != m_visualisers.end() ; ++it)
-        m_output->addVisual((MythTV::Visual*)(*it));
+        m_output->addVisual((Visualization*)(*it));
 
     // add any listeners to the audio output
     QMutexLocker locker(m_lock);
@@ -816,16 +804,16 @@ void MusicPlayer::customEvent(QEvent *event)
         }
     }
 
-    if (event->type() == OutputEvent::kError)
+    if (event->type() == AudioOutput::Event::kError)
     {
-        auto *aoe = dynamic_cast<OutputEvent *>(event);
+        auto *aoe = dynamic_cast<AudioOutput::Event *>(event);
 
         if (!aoe)
             return;
 
-        LOG(VB_GENERAL, LOG_ERR, QString("Audio Output Error: %1").arg(*aoe->errorMessage()));
+        LOG(VB_GENERAL, LOG_ERR, QString("Audio Output Error: %1").arg(aoe->errorMessage()));
 
-        MythErrorNotification n(tr("Audio Output Error"), tr("MythMusic"), *aoe->errorMessage());
+        MythErrorNotification n(tr("Audio Output Error"), tr("MythMusic"), aoe->errorMessage());
         GetNotificationCenter()->Queue(n);
 
         m_errorCount++;
@@ -882,9 +870,9 @@ void MusicPlayer::customEvent(QEvent *event)
             stop(true);
         }
     }
-    else if (event->type() == OutputEvent::kInfo)
+    else if (event->type() == AudioOutput::Event::kInfo)
     {
-        auto *oe = dynamic_cast<OutputEvent*>(event);
+        auto *oe = dynamic_cast<AudioOutput::Event*>(event);
 
         if (!oe)
             return;
@@ -1579,7 +1567,7 @@ void MusicPlayer::decoderHandlerReady(void)
     // NOLINTNEXTLINE(modernize-loop-convert)
     for (auto it = m_visualisers.begin(); it != m_visualisers.end() ; ++it)
     {
-        //m_output->addVisual((MythTV::Visual*)(*it));
+        //m_output->addVisual((Visualization*)(*it));
         //(*it)->setDecoder(decoder);
         //m_visual->setOutput(m_output);
     }

diff --git a/mythplugins/mythmusic/mythmusic/musicplayer.h b/mythplugins/mythmusic/mythmusic/musicplayer.h
@@ -2,7 +2,7 @@
 #define MUSICPLAYER_H_
 
 // MythTV
-#include <libmyth/audio/audiooutput.h>
+#include <libmythtv/audio/audiooutput.h>
 #include <libmythbase/mythobservable.h>
 #include <libmythbase/mythpluginexport.h>
 #include <libmythmetadata/musicmetadata.h>

diff --git a/mythplugins/mythmusic/mythmusic/streamview.cpp b/mythplugins/mythmusic/mythmusic/streamview.cpp
@@ -172,7 +172,7 @@ void StreamView::customEvent(QEvent *event)
 
         updateTrackInfo(gPlayer->getCurrentMetadata());
     }
-    else if (event->type() == OutputEvent::kPlaying)
+    else if (event->type() == AudioOutput::Event::kPlaying)
     {
         if (gPlayer->isPlaying())
         {
@@ -190,7 +190,7 @@ void StreamView::customEvent(QEvent *event)
         // pass it on to the default handler in MusicCommon
         handled = false;
     }
-    else if (event->type() == OutputEvent::kStopped)
+    else if (event->type() == AudioOutput::Event::kStopped)
     {
         if (m_streamList)
         {
@@ -205,7 +205,7 @@ void StreamView::customEvent(QEvent *event)
         // pass it on to the default handler in MusicCommon
         handled = false;
     }
-    else if (event->type() == OutputEvent::kBuffering)
+    else if (event->type() == AudioOutput::Event::kBuffering)
     {
     }
     else if (event->type() == MythEvent::kMythEventMessage)

diff --git a/mythplugins/mythmusic/mythmusic/synaesthesia.h b/mythplugins/mythmusic/mythmusic/synaesthesia.h
@@ -4,9 +4,6 @@
 // C++
 #include <array>
 
-// MythTV
-#include <libmyth/visual.h>
-
 // MythMusic
 #include "mainvisual.h"
 #include "polygon.h"

diff --git a/mythplugins/mythmusic/mythmusic/visualize.cpp b/mythplugins/mythmusic/mythmusic/visualize.cpp
@@ -1889,7 +1889,7 @@ unsigned long Piano::getDesiredSamples(void)
     // We want all the data! (within reason)
     //   typical observed values are 882 -
     //   12.5 chunks of data per second from 44100Hz signal : Sampled at 50Hz, lots of 4, see :
-    //   mythtv/libs/libmyth/audio/audiooutputbase.cpp :: AudioOutputBase::AddData
+    //   mythtv/libs/libmythtv/audio/audiooutputbase.cpp :: AudioOutputBase::AddData
     //   See : mythtv/mythplugins/mythmusic/mythmusic/avfdecoder.cpp "20ms worth"
     return (unsigned long) kPianoAudioSize;  // Maximum we can be given
 }

diff --git a/mythplugins/mythmusic/mythmusic/visualize.h b/mythplugins/mythmusic/mythmusic/visualize.h
@@ -20,7 +20,6 @@
 #include <QVector>
 
 // MythTV headers
-#include <libmyth/visual.h>
 #include <libmythmetadata/musicmetadata.h>
 #include <libmythbase/mythbaseexp.h>
 

diff --git a/mythtv/configure b/mythtv/configure
@@ -13,7 +13,7 @@
 MYTHTV_VERSION_MAJMIN="36.0"
 MYTHTV_LIBVERSION="36"
 # See mythtv/libs/libmythbase/mythversion.h.in
-MYTHTV_BINARY_VERSION="36.20250212-1"
+MYTHTV_BINARY_VERSION="36.20250816-1"
 # See bindings/python/MythTV/static.py.in
 MYTHTV_PYTHON_OWN_VERSION="(36,0,-1,0)"
 # See python/MythTV/services_api/send.py.in