libmyth: Fix/enable visualisations for non mythmusic sources.

MythTV · Mar 18, 2011 · 0affac2 · 0affac2
1 parent 6c7a2ea
commit 0affac2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/mythtv/libs/libmyth/audio/audiooutputbase.cpp b/mythtv/libs/libmyth/audio/audiooutputbase.cpp
@@ -1292,14 +1292,17 @@ bool AudioOutputBase::AddData(void *in_buffer, int in_len,
     QMutexLocker lock(&audio_buflock);
 
     // Mythmusic doesn't give us timestamps
-    if (timecode < 0)
+    if (hasVisual())
     {
-        // Send original samples to mythmusic visualisation
-        timecode = (frames_buffered * 1000) / source_samplerate;
-        frames_buffered += frames;
+        if (timecode < 0)
+        {
+            // Send original samples to mythmusic visualisation
+            timecode = (frames_buffered * 1000) / source_samplerate;
+            frames_buffered += frames;
+            music = true;
+        }
         dispatchVisual((uchar *)in_buffer, len, timecode, source_channels,
                        output_settings->FormatToBits(format));
-        music = true;
     }
 
     // Calculate amount of free space required in ringbuffer

diff --git a/mythtv/libs/libmyth/output.h b/mythtv/libs/libmyth/output.h
@@ -102,6 +102,7 @@ class MPUBLIC OutputListeners : public MythObservable
     OutputListeners();
     virtual ~OutputListeners();
 
+    bool hasVisual(void) { return visuals.size(); }
     void addVisual(MythTV::Visual *);
     void removeVisual(MythTV::Visual *);