Video Visualisations: Reset the visualisations on audio changes.

Author: Mark Kendall

mythtv/libs/libmythtv/audioplayer.cpp

@@ -70,6 +70,16 @@ void AudioPlayer::RemoveVisuals(void)
         m_audioOutput->removeVisual(m_visuals[i]);
 }
 
+void AudioPlayer::ResetVisuals(void)
+{
+    if (!m_audioOutput)
+        return;
+
+    QMutexLocker lock(&m_lock);
+    for (uint i = 0; i < m_visuals.size(); i++)
+        m_visuals[i]->prepare();
+}
+
 void AudioPlayer::Reset(void)
 {
     if (!m_audioOutput)
@@ -164,6 +174,8 @@ QString AudioPlayer::ReinitAudio(void)
         m_muted_on_creation = false;
     }
 
+    ResetVisuals();
+
     return errMsg;
 }
 
@@ -257,6 +269,8 @@ void AudioPlayer::SetAudioParams(AudioFormat format, int orig_channels,
     m_samplerate    = samplerate;
     m_passthru      = passthru;
     m_codec_profile = codec_profile;
+
+    ResetVisuals();
 }
 
 void AudioPlayer::SetEffDsp(int dsprate)

mythtv/libs/libmythtv/audioplayer.h

@@ -77,6 +77,7 @@ class MTV_PUBLIC AudioPlayer
   private:
     void AddVisuals(void);
     void RemoveVisuals(void);
+    void ResetVisuals(void);
 
   private:
     MythPlayer  *m_parent;

mythtv/libs/libmythtv/visualisations/videovisualspectrum.cpp

@@ -124,6 +124,13 @@ void VideoVisualSpectrum::Draw(const QRect &area, MythPainter *painter,
     DrawPriv(painter, device);
 }
 
+void VideoVisualSpectrum::prepare(void)
+{
+    for (int i = 0; i < m_magnitudes.size(); i++)
+        m_magnitudes[i] = 0.0;
+    VideoVisual::prepare();
+}
+
 void VideoVisualSpectrum::DrawPriv(MythPainter *painter, QPaintDevice* device)
 {
     static const QBrush brush(QColor(0, 0, 200, 180));

mythtv/libs/libmythtv/visualisations/videovisualspectrum.h

@@ -12,6 +12,7 @@ class VideoVisualSpectrum : public VideoVisual
 
     virtual void Draw(const QRect &area, MythPainter *painter,
                       QPaintDevice* device);
+    virtual void prepare();
 
   protected:
     virtual bool Initialise(const QRect &area);