Merge pull request #4400 from Jalle19/fix-log-messages

Fix some erroneous log messages

diff --git a/xbmc/filesystem/PVRFile.cpp b/xbmc/filesystem/PVRFile.cpp
index 7665e95..4fe1a1d 100644 (file)
--- a/xbmc/filesystem/PVRFile.cpp
+++ b/xbmc/filesystem/PVRFile.cpp
@@ -79,7 +79,7 @@ bool CPVRFile::Open(const CURL& url)
         return false;
 
       m_isPlayRecording = true;
-      CLog::Log(LOGDEBUG, "%s - Recording has started on filename %s", __FUNCTION__, strURL.c_str());
+      CLog::Log(LOGDEBUG, "%s - playback has started on recording %s (%s)", __FUNCTION__, strURL.c_str(), tag->GetPVRRecordingInfoTag()->m_strIconPath.c_str());
     }
     else
     {

diff --git a/xbmc/pvr/PVRManager.cpp b/xbmc/pvr/PVRManager.cpp
index 9a8f7c5..d02482f 100644 (file)
--- a/xbmc/pvr/PVRManager.cpp
+++ b/xbmc/pvr/PVRManager.cpp
@@ -991,9 +991,6 @@ bool CPVRManager::OpenRecordedStream(const CPVRRecording &tag)
   bool bReturn = false;
   CSingleLock lock(m_critSection);
 
-  CLog::Log(LOGDEBUG,"PVRManager - %s - opening recorded stream '%s'",
-      __FUNCTION__, tag.m_strFile.c_str());
-
   if ((bReturn = m_addons->OpenStream(tag)) != false)
   {
     delete m_currentFile;

diff --git a/xbmc/pvr/windows/GUIWindowPVRCommon.cpp b/xbmc/pvr/windows/GUIWindowPVRCommon.cpp
index 0516a80..6b35653 100644 (file)
--- a/xbmc/pvr/windows/GUIWindowPVRCommon.cpp
+++ b/xbmc/pvr/windows/GUIWindowPVRCommon.cpp
@@ -656,7 +656,7 @@ bool CGUIWindowPVRCommon::PlayRecording(CFileItem *item, bool bPlayMinimized /*
   }
   else
   {
-    CLog::Log(LOGERROR, "PVRManager - %s - can't open recording: no valid filename", __FUNCTION__);
+    CLog::Log(LOGERROR, "CGUIWindowPVRCommon - %s - can't open recording: no valid filename", __FUNCTION__);
     CGUIDialogOK::ShowAndGetInput(19033,0,19036,0);
     return false;
   }