Merge remote-tracking branch 'upstream/master'

tsp · Jun 24, 2012 · 4e51f7d · 4e51f7d
2 parents 7d41fc8 + 3cb4695
commit 4e51f7d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/project/VS2010Express/XBMC for Windows.sln b/project/VS2010Express/XBMC for Windows.sln
@@ -607,6 +607,7 @@ Global
 		{C04B0FB1-667D-4F1C-BDAE-A07CDFFA74A3}.Release|Win32.ActiveCfg = Release|Win32
 		{C04B0FB1-667D-4F1C-BDAE-A07CDFFA74A3}.Release|Win32.Build.0 = Release|Win32
 		{87DA0A1E-3F33-4927-A5E5-2D58F2C58E17}.Debug (DirectX)|Win32.ActiveCfg = Debug|Win32
+		{87DA0A1E-3F33-4927-A5E5-2D58F2C58E17}.Debug (DirectX)|Win32.Build.0 = Debug|Win32
 		{87DA0A1E-3F33-4927-A5E5-2D58F2C58E17}.Debug (OpenGL)|Win32.ActiveCfg = Debug|Win32
 		{87DA0A1E-3F33-4927-A5E5-2D58F2C58E17}.Debug|Win32.ActiveCfg = Debug|Win32
 		{87DA0A1E-3F33-4927-A5E5-2D58F2C58E17}.Debug|Win32.Build.0 = Debug|Win32

diff --git a/xbmc/pvrclients/mythtv-cmyth/client.cpp b/xbmc/pvrclients/mythtv-cmyth/client.cpp
@@ -409,7 +409,7 @@ PVR_ERROR GetAddonCapabilities(PVR_ADDON_CAPABILITIES *pCapabilities)
   pCapabilities->bHandlesDemuxing            = false;
   pCapabilities->bSupportsChannelScan        = false;
   pCapabilities->bSupportsRecordingPlayCount = true;
-
+  pCapabilities->bSupportsLastPlayedPosition = false; //TODO: add it as mythtv does support it. 
   return PVR_ERROR_NO_ERROR;
 }
 
@@ -547,6 +547,15 @@ PVR_ERROR SetRecordingPlayCount(const PVR_RECORDING &recording, int count)
       return g_client->SetRecordingPlayCount(recording, count);
 }
 
+PVR_ERROR    SetRecordingLastPlayedPosition(const PVR_RECORDING &recording, int lastplayedposition)
+{
+  return PVR_ERROR_NOT_IMPLEMENTED;
+}
+
+int  GetRecordingLastPlayedPosition(const PVR_RECORDING &recording)
+{
+  return PVR_ERROR_NOT_IMPLEMENTED;
+}
 /*******************************************/
 /** PVR Timer Functions                   **/