convert MythPlayer::SignalTracksChanged(): from a signal to a virtual…

… function It is only used once and was only ever connected to itself. This basically reverts 4567527.
rcrdnalor · Jan 6, 2025 · d3b6c3e · d3b6c3e
1 parent 224d05a
commit d3b6c3e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/mythtv/libs/libmythtv/decoders/decoderbase.cpp b/mythtv/libs/libmythtv/decoders/decoderbase.cpp
@@ -1160,7 +1160,7 @@ int DecoderBase::AutoSelectTrack(uint Type)
             .arg(m_currentTrack[Type]+1).arg(Type).arg(iso639_key_toName(lang)).arg(lang));
 
     if (m_parent && (oldTrack != m_currentTrack[Type]))
-        emit m_parent->SignalTracksChanged(Type);
+        m_parent->tracksChanged(Type);
 
     return selTrack;
 }

diff --git a/mythtv/libs/libmythtv/mythplayer.h b/mythtv/libs/libmythtv/mythplayer.h
@@ -101,7 +101,6 @@ class MTV_PUBLIC MythPlayer : public QObject
     void SeekingDone();
     void PauseChanged(bool Paused);
     void RequestResetCaptions();
-    void SignalTracksChanged(uint Type);
 
   public:
     explicit MythPlayer(PlayerContext* Context, PlayerFlags Flags = kNoFlags);
@@ -204,6 +203,8 @@ class MTV_PUBLIC MythPlayer : public QObject
     // These two functions are not thread-safe (UI thread use only).
     bool GetAllowForcedSubtitles(void) const { return m_allowForcedSubtitles; }
 
+    virtual void tracksChanged([[maybe_unused]] uint TrackType) {}
+
     // LiveTV public stuff
     void CheckTVChain();
     void FileChangedCallback();

diff --git a/mythtv/libs/libmythtv/mythplayercaptionsui.cpp b/mythtv/libs/libmythtv/mythplayercaptionsui.cpp
@@ -47,7 +47,6 @@ MythPlayerCaptionsUI::MythPlayerCaptionsUI(MythMainWindow* MainWindow, TV* Tv, P
 
     // Signalled from the decoder
     connect(this, &MythPlayerCaptionsUI::EnableSubtitles, this, [this](bool Enable) { this->SetCaptionsEnabled(Enable, false); });
-    connect(this, &MythPlayerCaptionsUI::SignalTracksChanged, this, &MythPlayerCaptionsUI::TracksChanged);
 
     // Signalled from the base class
     connect(this, &MythPlayerCaptionsUI::RequestResetCaptions, this, &MythPlayerCaptionsUI::ResetCaptions);
@@ -251,7 +250,7 @@ void MythPlayerCaptionsUI::EnableCaptions(uint Mode, bool UpdateOSD)
 /*! \brief This tries to re-enable captions/subtitles if the user
  * wants them and one of the captions/subtitles tracks has changed.
  */
-void MythPlayerCaptionsUI::TracksChanged(uint TrackType)
+void MythPlayerCaptionsUI::tracksChanged(uint TrackType)
 {
     if (m_textDesired && (TrackType >= kTrackTypeSubtitle) && (TrackType <= kTrackTypeTeletextCaptions))
         SetCaptionsEnabled(true, false);

diff --git a/mythtv/libs/libmythtv/mythplayercaptionsui.h b/mythtv/libs/libmythtv/mythplayercaptionsui.h
@@ -32,9 +32,10 @@ class MTV_PUBLIC MythPlayerCaptionsUI : public MythPlayerAudioUI
     std::chrono::milliseconds GetStreamMaxPos();
     InteractiveTV* GetInteractiveTV() override;
 
+    void tracksChanged(uint TrackType) override;
+
   protected slots:
     void InitialiseState() override;
-    void TracksChanged(uint TrackType);
     void SetAllowForcedSubtitles(bool Allow);
     void ToggleCaptions();
     void ToggleCaptionsByType(uint Type);