MythPlayer: fix possible leak.

jyavenard · jyavenard · commit 549b17f41625 · 2011-03-22T13:05:44.000+11:00
If SetAudioOutput was called when an audio object had already been created; the existing object wouldn't have been destroyed
diff --git a/mythtv/libs/libmythtv/audioplayer.cpp b/mythtv/libs/libmythtv/audioplayer.cpp
@@ -101,7 +101,7 @@ QString AudioPlayer::ReinitAudio(void)
         }
         m_no_audio_out = true;
     }
-    else if (m_no_audio_out)
+    else if (m_no_audio_out && m_audioOutput)
     {
         VERBOSE(VB_IMPORTANT, LOC + "Enabling Audio");
         m_no_audio_out = false;
@@ -149,6 +149,8 @@ void AudioPlayer::PauseAudioUntilBuffered()
 
 void AudioPlayer::SetAudioOutput(AudioOutput *ao)
 {
+    // delete current audio class if any
+    DeleteOutput();
     m_lock.lock();
     m_audioOutput = ao;
     m_lock.unlock();

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ QString AudioPlayer::ReinitAudio(void)`
`101`	`101`	`}`
`102`	`102`	`m_no_audio_out = true;`
`103`	`103`	`}`
`104`		`- else if (m_no_audio_out)`
	`104`	`+ else if (m_no_audio_out && m_audioOutput)`
`105`	`105`	`{`
`106`	`106`	`VERBOSE(VB_IMPORTANT, LOC + "Enabling Audio");`
`107`	`107`	`m_no_audio_out = false;`
`@@ -149,6 +149,8 @@ void AudioPlayer::PauseAudioUntilBuffered()`
`149`	`149`
`150`	`150`	`void AudioPlayer::SetAudioOutput(AudioOutput *ao)`
`151`	`151`	`{`
	`152`	`+ // delete current audio class if any`
	`153`	`+ DeleteOutput();`
`152`	`154`	`m_lock.lock();`
`153`	`155`	`m_audioOutput = ao;`
`154`	`156`	`m_lock.unlock();`