[dvdplayer] avoid deadlock due to player state section and player locks

mikrohard · Apr 17, 2012 · 638fc4f · 638fc4f
1 parent cad5f17
commit 638fc4f
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp
@@ -2425,16 +2425,18 @@ bool CDVDPlayer::SeekScene(bool bPlus)
 
 void CDVDPlayer::GetAudioInfo(CStdString& strAudioInfo)
 {
-  CSingleLock lock(m_StateSection);
-  strAudioInfo.Format("D(%s) P(%s)", m_State.demux_audio.c_str()
-                                   , m_dvdPlayerAudio.GetPlayerInfo().c_str());
+  { CSingleLock lock(m_StateSection);
+    strAudioInfo.Format("D(%s)", m_State.demux_audio.c_str());
+  }
+  strAudioInfo.AppendFormat(" P(%s)", m_dvdPlayerAudio.GetPlayerInfo().c_str());
 }
 
 void CDVDPlayer::GetVideoInfo(CStdString& strVideoInfo)
 {
-  CSingleLock lock(m_StateSection);
-  strVideoInfo.Format("D(%s) P(%s)", m_State.demux_video.c_str()
-                                   , m_dvdPlayerVideo.GetPlayerInfo().c_str());
+  { CSingleLock lock(m_StateSection);
+    strVideoInfo.Format("D(%s)", m_State.demux_video.c_str());
+  }
+  strVideoInfo.AppendFormat(" P(%s)", m_dvdPlayerVideo.GetPlayerInfo().c_str());
 }
 
 void CDVDPlayer::GetGeneralInfo(CStdString& strGeneralInfo)