Ticket #9382: aplayer.patch

mythtv/libs/libmythtv/audioplayer.cpp

@@ -345 +345 @@
 
 void AudioPlayer::AddAudioData(char *buffer, int len, int64_t timecode)
 {
-    if (m_parent->PrepareAudioSample(timecode) && m_audioOutput &&
-        !no_audio_out)
+    if (!m_audioOutput)
+        return;
+
+    if (m_parent->PrepareAudioSample(timecode) && !no_audio_out)
         m_audioOutput->Drain();
+
     int samplesize = m_audioOutput->GetBytesPerFrame();
 
-    if ((samplesize <= 0) || !m_audioOutput)
+    if (samplesize <= 0)
         return;
     int frames = len / samplesize;
 
+
     if (!m_audioOutput->AddFrames(buffer, frames, timecode))
         VERBOSE(VB_PLAYBACK, LOC + "AddAudioData(): "
                 "Audio buffer overflow, audio data lost!");