Merge pull request #3900 from vkosh/epg-recording

[pvr] add optional support for playing recordings from epg timeline or epg osd

diff --cc xbmc/GUIInfoManager.cpp
Simple merge

diff --cc xbmc/GUIInfoManager.h
Simple merge

diff --cc xbmc/epg/Epg.cpp
Simple merge

diff --cc xbmc/epg/Epg.h
Simple merge

diff --cc xbmc/epg/EpgInfoTag.cpp
Simple merge

diff --cc xbmc/pvr/recordings/PVRRecordings.cpp
Simple merge

diff --cc xbmc/pvr/recordings/PVRRecordings.h
index 03787a2,277497e..11b9616
--- 1/xbmc/pvr/recordings/PVRRecordings.h
--- 2/xbmc/pvr/recordings/PVRRecordings.h
+++ b/xbmc/pvr/recordings/PVRRecordings.h
@@@ -82,9 -71,9 +85,10 @@@ namespace PV
      bool RenameRecording(CFileItem &item, CStdString &strNewName);
      bool SetRecordingsPlayCount(const CFileItemPtr &item, int count);
  
 +    bool IsAllRecordingsDirectory(const CFileItem &item) const;
      bool GetDirectory(const CStdString& strPath, CFileItemList &items);
      CFileItemPtr GetByPath(const CStdString &path);
+     CPVRRecordingPtr GetById(int iClientId, const std::string &strRecordingId) const;
      void SetPlayCount(const CFileItem &item, int iPlayCount);
      void GetAll(CFileItemList &items);
      CFileItemPtr GetById(unsigned int iId) const;

diff --cc xbmc/pvr/windows/GUIWindowPVRCommon.cpp
Simple merge