Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[3508] trunk/plugins/ForTheRecord
|
From: <do...@us...> - 2010-03-20 11:07:06
|
Revision: 3508
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3508&view=rev
Author: dot-i
Date: 2010-03-20 11:07:00 +0000 (Sat, 20 Mar 2010)
Log Message:
-----------
Updated to 1.4.0.2 release.
Included patch by sPiel to improve player skip-step (relative on/off).
Modified Paths:
--------------
trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/DvbEpgThread.cs
trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/MediaPortalRecorderTunerService.cs
trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/RecordingThread.cs
trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/SettingName.cs
trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/SetupForm.cs
trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/TvServerPlugin.cs
trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Utility.cs
trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/ChannelNavigator.cs
trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/GuideBase.cs
trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/SetupForm.cs
trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TextId.cs
trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/Translator.cs
trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TvFullScreen.cs
trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/Utility.cs
trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/WindowId.cs
trunk/plugins/ForTheRecord/ReferencedAssemblies/Core.dll
trunk/plugins/ForTheRecord/ReferencedAssemblies/Databases.dll
trunk/plugins/ForTheRecord/ReferencedAssemblies/Dialogs.dll
trunk/plugins/ForTheRecord/ReferencedAssemblies/ForTheRecord.Client.Common.dll
trunk/plugins/ForTheRecord/ReferencedAssemblies/ForTheRecord.Entities.dll
trunk/plugins/ForTheRecord/ReferencedAssemblies/ForTheRecord.RecorderTuners.Common.dll
trunk/plugins/ForTheRecord/ReferencedAssemblies/ForTheRecord.ServiceAgents.dll
trunk/plugins/ForTheRecord/ReferencedAssemblies/ForTheRecord.ServiceContracts.dll
trunk/plugins/ForTheRecord/ReferencedAssemblies/PluginBase.dll
trunk/plugins/ForTheRecord/ReferencedAssemblies/SetupControls.dll
trunk/plugins/ForTheRecord/ReferencedAssemblies/TVDatabase.dll
trunk/plugins/ForTheRecord/ReferencedAssemblies/TvBusinessLayer.dll
trunk/plugins/ForTheRecord/ReferencedAssemblies/TvControl.dll
trunk/plugins/ForTheRecord/ReferencedAssemblies/TvLibrary.Interfaces.dll
trunk/plugins/ForTheRecord/ReferencedAssemblies/Utils.dll
Modified: trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/DvbEpgThread.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/DvbEpgThread.cs 2010-03-20 11:02:03 UTC (rev 3507)
+++ trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/DvbEpgThread.cs 2010-03-20 11:07:00 UTC (rev 3508)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007-2009 ForTheRecord
+ * Copyright (C) 2007-2010 ForTheRecord
* http://www.4therecord.eu
*
* This Program is free software; you can redistribute it and/or modify
Modified: trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/MediaPortalRecorderTunerService.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/MediaPortalRecorderTunerService.cs 2010-03-20 11:02:03 UTC (rev 3507)
+++ trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/MediaPortalRecorderTunerService.cs 2010-03-20 11:07:00 UTC (rev 3508)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007-2009 ForTheRecord
+ * Copyright (C) 2007-2010 ForTheRecord
* http://www.4therecord.eu
*
* This Program is free software; you can redistribute it and/or modify
@@ -326,6 +326,16 @@
case TvResult.AllCardsBusy:
return LiveStreamResult.NoFreeCardFound;
+ case TvResult.ChannelIsScrambled:
+ return LiveStreamResult.IsScrambled;
+
+ case TvResult.ChannelNotMappedToAnyCard:
+ case TvResult.NoSignalDetected:
+ case TvResult.NoTuningDetails:
+ case TvResult.NoVideoAudioDetected:
+ case TvResult.UnknownChannel:
+ return LiveStreamResult.ChannelTuneFailed;
+
default:
return LiveStreamResult.UnknownError;
}
Modified: trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/RecordingThread.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/RecordingThread.cs 2010-03-20 11:02:03 UTC (rev 3507)
+++ trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/RecordingThread.cs 2010-03-20 11:07:00 UTC (rev 3508)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007-2009 ForTheRecord
+ * Copyright (C) 2007-2010 ForTheRecord
* http://www.4therecord.eu
*
* This Program is free software; you can redistribute it and/or modify
Modified: trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/SettingName.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/SettingName.cs 2010-03-20 11:02:03 UTC (rev 3507)
+++ trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/SettingName.cs 2010-03-20 11:07:00 UTC (rev 3508)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007-2009 ForTheRecord
+ * Copyright (C) 2007-2010 ForTheRecord
* http://www.4therecord.eu
*
* This Program is free software; you can redistribute it and/or modify
Modified: trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/SetupForm.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/SetupForm.cs 2010-03-20 11:02:03 UTC (rev 3507)
+++ trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/SetupForm.cs 2010-03-20 11:07:00 UTC (rev 3508)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007-2009 ForTheRecord
+ * Copyright (C) 2007-2010 ForTheRecord
* http://www.4therecord.eu
*
* This Program is free software; you can redistribute it and/or modify
Modified: trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/TvServerPlugin.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/TvServerPlugin.cs 2010-03-20 11:02:03 UTC (rev 3507)
+++ trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/TvServerPlugin.cs 2010-03-20 11:07:00 UTC (rev 3508)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007-2009 ForTheRecord
+ * Copyright (C) 2007-2010 ForTheRecord
* http://www.4therecord.eu
*
* This Program is free software; you can redistribute it and/or modify
Modified: trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Utility.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Utility.cs 2010-03-20 11:02:03 UTC (rev 3507)
+++ trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Utility.cs 2010-03-20 11:07:00 UTC (rev 3508)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007-2009 ForTheRecord
+ * Copyright (C) 2007-2010 ForTheRecord
* http://www.4therecord.eu
*
* This Program is free software; you can redistribute it and/or modify
Modified: trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/ChannelNavigator.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/ChannelNavigator.cs 2010-03-20 11:02:03 UTC (rev 3507)
+++ trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/ChannelNavigator.cs 2010-03-20 11:07:00 UTC (rev 3508)
@@ -699,8 +699,8 @@
{
seekOffset = 10;
fileName = liveStream.RtspUrl;
- if (ForTheRecordMain.AvoidRtspForLiveTv
- && !String.IsNullOrEmpty(liveStream.TimeshiftFile))
+ if (!String.IsNullOrEmpty(liveStream.TimeshiftFile)
+ && (ForTheRecordMain.AvoidRtspForLiveTv || !liveStream.RtspUrl.StartsWith("rtsp://", StringComparison.CurrentCultureIgnoreCase)))
{
fileName = liveStream.TimeshiftFile;
seekOffset = 0;
@@ -820,6 +820,10 @@
dlg.SetLine(1, "It was not possible to re-tune the live stream");
break;
+ case LiveStreamResult.IsScrambled:
+ dlg.SetLine(1, "The channel is scrambled");
+ break;
+
case LiveStreamResult.UnknownError:
dlg.SetLine(1, "Unknown error");
break;
Modified: trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/GuideBase.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/GuideBase.cs 2010-03-20 11:02:03 UTC (rev 3507)
+++ trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/GuideBase.cs 2010-03-20 11:07:00 UTC (rev 3508)
@@ -816,7 +816,7 @@
day = GUILocalizeStrings.Get(663);
break;
}
- day = String.Format("{0} {1}-{2}", day, dtTemp.Day, dtTemp.Month);
+ day = GetLocalDate(day, dtTemp.Day, dtTemp.Month);
cntlDay.AddLabel(day, iDay);
}
}
@@ -1215,7 +1215,7 @@
day = GUILocalizeStrings.Get(663);
break;
}
- day = String.Format("{0} {1}-{2}", day, _viewingTime.Day, _viewingTime.Month);
+ day = String.Format(day, _viewingTime.Day, _viewingTime.Month);
string guiPropertyPrefix = _channelType == ChannelType.Television ? "#TV" : "#Radio";
GUIPropertyManager.SetProperty(guiPropertyPrefix + ".Guide.Day", day);
@@ -4096,5 +4096,27 @@
{
return (time >= program.StartTime && time <= program.StopTime);
}
+
+ private string GetLocalDate(string dayOfWeek, int day, int month)
+ {
+ CultureInfo currentCulture = Thread.CurrentThread.CurrentCulture;
+ string monthDayFormat = currentCulture.DateTimeFormat.MonthDayPattern;
+
+ // Get the starting position of the day and month in the
+ // MonthDay pattern of the current culture
+ int dayPosition = monthDayFormat.IndexOf('d');
+ int monthPosition = monthDayFormat.IndexOf('M');
+
+ // See if month is first in the pattern
+ string format = "{0} {1}{2}{3}";
+ if (monthPosition >= 0
+ && monthPosition < dayPosition)
+ {
+ // Month is first - Display month before day
+ format = "{0} {3}{2}{1}";
+ }
+
+ return String.Format(format, dayOfWeek, day, currentCulture.DateTimeFormat.DateSeparator, month);
+ }
}
}
Modified: trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/SetupForm.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/SetupForm.cs 2010-03-20 11:02:03 UTC (rev 3507)
+++ trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/SetupForm.cs 2010-03-20 11:07:00 UTC (rev 3508)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007-2009 ForTheRecord
+ * Copyright (C) 2007-2010 ForTheRecord
* http://www.4therecord.eu
*
* This Program is free software; you can redistribute it and/or modify
Modified: trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TextId.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TextId.cs 2010-03-20 11:02:03 UTC (rev 3507)
+++ trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TextId.cs 2010-03-20 11:07:00 UTC (rev 3508)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007-2009 ForTheRecord
+ * Copyright (C) 2007-2010 ForTheRecord
* http://www.4therecord.eu
*
* This Program is free software; you can redistribute it and/or modify
Modified: trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/Translator.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/Translator.cs 2010-03-20 11:02:03 UTC (rev 3507)
+++ trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/Translator.cs 2010-03-20 11:07:00 UTC (rev 3508)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007-2009 ForTheRecord
+ * Copyright (C) 2007-2010 ForTheRecord
* http://www.4therecord.eu
*
* This Program is free software; you can redistribute it and/or modify
Modified: trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TvFullScreen.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TvFullScreen.cs 2010-03-20 11:02:03 UTC (rev 3507)
+++ trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TvFullScreen.cs 2010-03-20 11:07:00 UTC (rev 3508)
@@ -113,6 +113,8 @@
bool _playNotifyBeep = true;
bool _needToClearScreen = false;
bool _useVMR9Zap = false;
+ bool _immediateSeekIsRelative = true;
+ int _immediateSeekValue = 10;
///@
///VMR9OSD _vmr9OSD = null;
FullScreenState _screenState = new FullScreenState();
@@ -210,6 +212,8 @@
_useVMR9Zap = xmlreader.GetValueAsBool("general", "useVMR9ZapOSD", false);
_notifyTVTimeout = xmlreader.GetValueAsInt("movieplayer", "notifyTVTimeout", 10);
_playNotifyBeep = xmlreader.GetValueAsBool("movieplayer", "notifybeep", true);
+ _immediateSeekIsRelative = xmlreader.GetValueAsBool("movieplayer", "immediateskipstepsisrelative", true);
+ _immediateSeekValue = xmlreader.GetValueAsInt("movieplayer", "immediateskipstepsize", 10);
}
Load(GUIGraphicsContext.Skin + @"\mytvFullScreen.xml");
GetID = (int)GUIWindow.Window.WINDOW_TVFULLSCREEN;
@@ -660,7 +664,14 @@
}
_statusVisible = true;
_statusTimeOutTimer = DateTime.Now;
- g_Player.SeekRelativePercentage(-10);
+ if (_immediateSeekIsRelative)
+ {
+ g_Player.SeekRelativePercentage(-_immediateSeekValue);
+ }
+ else
+ {
+ g_Player.SeekRelative(-_immediateSeekValue);
+ }
}
}
break;
@@ -678,7 +689,14 @@
}
_statusVisible = true;
_statusTimeOutTimer = DateTime.Now;
- g_Player.SeekRelativePercentage(10);
+ if (_immediateSeekIsRelative)
+ {
+ g_Player.SeekRelativePercentage(_immediateSeekValue);
+ }
+ else
+ {
+ g_Player.SeekRelative(_immediateSeekValue);
+ }
}
}
break;
Modified: trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/Utility.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/Utility.cs 2010-03-20 11:02:03 UTC (rev 3507)
+++ trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/Utility.cs 2010-03-20 11:07:00 UTC (rev 3508)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007-2009 ForTheRecord
+ * Copyright (C) 2007-2010 ForTheRecord
* http://www.4therecord.eu
*
* This Program is free software; you can redistribute it and/or modify
Modified: trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/WindowId.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/WindowId.cs 2010-03-20 11:02:03 UTC (rev 3507)
+++ trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/WindowId.cs 2010-03-20 11:07:00 UTC (rev 3508)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007-2009 ForTheRecord
+ * Copyright (C) 2007-2010 ForTheRecord
* http://www.4therecord.eu
*
* This Program is free software; you can redistribute it and/or modify
Modified: trunk/plugins/ForTheRecord/ReferencedAssemblies/Core.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/ForTheRecord/ReferencedAssemblies/Databases.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/ForTheRecord/ReferencedAssemblies/Dialogs.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/ForTheRecord/ReferencedAssemblies/ForTheRecord.Client.Common.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/ForTheRecord/ReferencedAssemblies/ForTheRecord.Entities.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/ForTheRecord/ReferencedAssemblies/ForTheRecord.RecorderTuners.Common.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/ForTheRecord/ReferencedAssemblies/ForTheRecord.ServiceAgents.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/ForTheRecord/ReferencedAssemblies/ForTheRecord.ServiceContracts.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/ForTheRecord/ReferencedAssemblies/PluginBase.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/ForTheRecord/ReferencedAssemblies/SetupControls.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/ForTheRecord/ReferencedAssemblies/TVDatabase.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/ForTheRecord/ReferencedAssemblies/TvBusinessLayer.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/ForTheRecord/ReferencedAssemblies/TvControl.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/ForTheRecord/ReferencedAssemblies/TvLibrary.Interfaces.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/ForTheRecord/ReferencedAssemblies/Utils.dll
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
