Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[4050] trunk/plugins/ForTheRecord
|
From: <do...@us...> - 2010-12-21 11:02:51
|
Revision: 4050
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4050&view=rev
Author: dot-i
Date: 2010-12-21 11:02:44 +0000 (Tue, 21 Dec 2010)
Log Message:
-----------
Updated plugins for latest MP1.2 SVN.
Modified Paths:
--------------
trunk/plugins/ForTheRecord/ForTheRecord.MPPlugins.sln
trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/ForTheRecord.RecorderTuners.MediaPortalTvServer.csproj
trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/MediaPortalRecorderTunerService.cs
trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Properties/Resources.Designer.cs
trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/RecordingThread.cs
trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/TvServerPlugin.cs
trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Utility.cs
trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/ForTheRecord.UI.MediaPortal.csproj
trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/GuideSearchBase.cs
trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/RecordedBase.cs
trunk/plugins/ForTheRecord/ForTheRecord.UI.Process/ForTheRecord.UI.Process.csproj
trunk/plugins/ForTheRecord/ReferencedAssemblies/Core.dll
trunk/plugins/ForTheRecord/ReferencedAssemblies/Databases.dll
trunk/plugins/ForTheRecord/ReferencedAssemblies/Dialogs.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.MPPlugins.sln
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.MPPlugins.sln 2010-12-20 10:10:41 UTC (rev 4049)
+++ trunk/plugins/ForTheRecord/ForTheRecord.MPPlugins.sln 2010-12-21 11:02:44 UTC (rev 4050)
@@ -1,16 +1,10 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "RecorderTuner Server Plugin", "RecorderTuner Server Plugin", "{84E6B02A-0674-4406-911E-88CAB7CE17E6}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GUI Client Plugin", "GUI Client Plugin", "{2A217BB8-A9FF-4013-ACAC-B1D1EBB39349}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ForTheRecord.RecorderTuners.MediaPortalTvServer", "ForTheRecord.RecorderTuners.MediaPortalTvServer\ForTheRecord.RecorderTuners.MediaPortalTvServer.csproj", "{6CF22F4E-FFFD-448D-A1A8-2156CB0133ED}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ForTheRecord.UI.Process", "ForTheRecord.UI.Process\ForTheRecord.UI.Process.csproj", "{A35F0ED7-98ED-4EE2-99C6-EA2AF880F8CD}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ForTheRecord.UI.MediaPortal", "ForTheRecord.UI.MediaPortal\ForTheRecord.UI.MediaPortal.csproj", "{1526A789-1DE2-4A8B-AA4B-5382A617C4F8}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ReferencedAssemblies", "ReferencedAssemblies", "{FD6B1904-69BA-4054-B218-C616D64BF43A}"
ProjectSection(SolutionItems) = preProject
ReferencedAssemblies\Core.dll = ReferencedAssemblies\Core.dll
@@ -32,6 +26,12 @@
ReferencedAssemblies\Utils.dll = ReferencedAssemblies\Utils.dll
EndProjectSection
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ForTheRecord.RecorderTuners.MediaPortalTvServer", "ForTheRecord.RecorderTuners.MediaPortalTvServer\ForTheRecord.RecorderTuners.MediaPortalTvServer.csproj", "{6CF22F4E-FFFD-448D-A1A8-2156CB0133ED}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ForTheRecord.UI.Process", "ForTheRecord.UI.Process\ForTheRecord.UI.Process.csproj", "{A35F0ED7-98ED-4EE2-99C6-EA2AF880F8CD}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ForTheRecord.UI.MediaPortal", "ForTheRecord.UI.MediaPortal\ForTheRecord.UI.MediaPortal.csproj", "{1526A789-1DE2-4A8B-AA4B-5382A617C4F8}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Modified: trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/ForTheRecord.RecorderTuners.MediaPortalTvServer.csproj
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/ForTheRecord.RecorderTuners.MediaPortalTvServer.csproj 2010-12-20 10:10:41 UTC (rev 4049)
+++ trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/ForTheRecord.RecorderTuners.MediaPortalTvServer.csproj 2010-12-21 11:02:44 UTC (rev 4050)
@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -15,10 +16,25 @@
<SccProvider>SubversionScc</SccProvider>
<FileUpgradeFlags>
</FileUpgradeFlags>
- <OldToolsVersion>2.0</OldToolsVersion>
+ <OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -28,6 +44,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -36,6 +53,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="ForTheRecord.Entities, Version=1.4.0.0, Culture=neutral, PublicKeyToken=a9a5dfc20b8d6175, processorArchitecture=MSIL">
@@ -201,6 +219,23 @@
<ItemGroup>
<None Include="Resources\WizardHeader.bmp" />
</ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Modified: trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/MediaPortalRecorderTunerService.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/MediaPortalRecorderTunerService.cs 2010-12-20 10:10:41 UTC (rev 4049)
+++ trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/MediaPortalRecorderTunerService.cs 2010-12-21 11:02:44 UTC (rev 4050)
@@ -53,7 +53,7 @@
private object _liveStreamsLock = new object();
private Dictionary<string, LiveStream> _liveStreams = new Dictionary<string, LiveStream>();
- private Dictionary<string, User> _liveStreamUsers = new Dictionary<string, User>();
+ private Dictionary<string, IUser> _liveStreamUsers = new Dictionary<string, IUser>();
protected override string Name
{
@@ -226,7 +226,7 @@
if (liveStream != null
&& _liveStreamUsers.ContainsKey(liveStream.RtspUrl))
{
- User tve3User = _liveStreamUsers[liveStream.RtspUrl];
+ IUser tve3User = _liveStreamUsers[liveStream.RtspUrl];
foreach (TvDatabase.Card card in availableCards)
{
if (card.IdCard == tve3User.CardId)
@@ -266,7 +266,7 @@
{
string userName = String.Format(CultureInfo.InvariantCulture, "{0}{1}", _ftrLiveUserName, Guid.NewGuid());
- User tve3User = new User(userName, true, card.IdCard);
+ IUser tve3User = new User(userName, true, card.IdCard);
tve3User.IdChannel = mpChannel.IdChannel;
tve3User.SubChannel = -1;
@@ -293,7 +293,7 @@
}
private LiveStreamResult StartTimeShifting(Channel channel, TvDatabase.Card card, TvDatabase.Channel mpChannel,
- ref User tve3User, ref LiveStream liveStream)
+ ref IUser tve3User, ref LiveStream liveStream)
{
IChannel tuningChannel = Utility.FindTuningChannelOnCard(mpChannel, card.IdCard);
if (tuningChannel != null)
@@ -361,7 +361,7 @@
{
if (_liveStreams.ContainsKey(liveStream.RtspUrl))
{
- User tve3User = _liveStreamUsers[liveStream.RtspUrl];
+ IUser tve3User = _liveStreamUsers[liveStream.RtspUrl];
if (TvServerPlugin.TvController_IsTimeShifting(ref tve3User))
{
if (!TvServerPlugin.TvController_StopTimeShifting(ref tve3User))
@@ -410,17 +410,17 @@
cards.Sort(delegate(TvDatabase.Card c1, TvDatabase.Card c2) { return c1.Priority.CompareTo(c2.Priority); });
// Get the list of live streams from TV Server
- Dictionary<string, User> mpStreamUsers = new Dictionary<string, User>();
+ Dictionary<string, IUser> mpStreamUsers = new Dictionary<string, IUser>();
foreach (TvDatabase.Card card in cards)
{
- User[] cardUsers = TvServerPlugin.TvController_GetUsersForCard(card.IdCard);
+ IUser[] cardUsers = TvServerPlugin.TvController_GetUsersForCard(card.IdCard);
if (cardUsers != null)
{
- foreach (User user in cardUsers)
+ foreach (IUser user in cardUsers)
{
if (user.Name.StartsWith(_ftrLiveUserName))
{
- User tve3User = user;
+ IUser tve3User = user;
if (TvServerPlugin.TvController_IsTimeShifting(ref tve3User))
{
mpStreamUsers.Add(TvServerPlugin.TvController_GetStreamingUrl(tve3User), tve3User);
@@ -458,7 +458,7 @@
{
if (!_liveStreams.ContainsKey(rtspUrl))
{
- User tve3User = mpStreamUsers[rtspUrl];
+ IUser tve3User = mpStreamUsers[rtspUrl];
TvServerPlugin.TvController_StopTimeShifting(ref tve3User, TvStoppedReason.KickedByAdmin);
}
}
@@ -478,7 +478,7 @@
if (_liveStreams.ContainsKey(liveStream.RtspUrl))
{
_liveStreams[liveStream.RtspUrl].StreamLastAliveTime = liveStream.StreamLastAliveTime;
- User tve3User = _liveStreamUsers[liveStream.RtspUrl];
+ IUser tve3User = _liveStreamUsers[liveStream.RtspUrl];
if (TvServerPlugin.TvController_IsTimeShifting(ref tve3User))
{
TvServerPlugin.TvController_HeartBeat(tve3User);
@@ -498,7 +498,7 @@
{
List<ChannelLiveState> liveStates = new List<ChannelLiveState>();
- User tve3User = null;
+ IUser tve3User = null;
if (liveStream != null
&& _liveStreamUsers.ContainsKey(liveStream.RtspUrl))
{
@@ -557,7 +557,7 @@
{
if (_liveStreams.ContainsKey(liveStream.RtspUrl))
{
- User tve3User = _liveStreamUsers[liveStream.RtspUrl];
+ IUser tve3User = _liveStreamUsers[liveStream.RtspUrl];
return TvServerPlugin.TvController_HasTeletext(tve3User);
}
}
@@ -577,7 +577,7 @@
{
if (_liveStreams.ContainsKey(liveStream.RtspUrl))
{
- User tve3User = _liveStreamUsers[liveStream.RtspUrl];
+ IUser tve3User = _liveStreamUsers[liveStream.RtspUrl];
TvServerPlugin.TvController_StartGrabbingTeletext(tve3User);
}
}
@@ -596,7 +596,7 @@
{
if (_liveStreams.ContainsKey(liveStream.RtspUrl))
{
- User tve3User = _liveStreamUsers[liveStream.RtspUrl];
+ IUser tve3User = _liveStreamUsers[liveStream.RtspUrl];
TvServerPlugin.TvController_StopGrabbingTeletext(tve3User);
}
}
@@ -615,7 +615,7 @@
{
if (_liveStreams.ContainsKey(liveStream.RtspUrl))
{
- User tve3User = _liveStreamUsers[liveStream.RtspUrl];
+ IUser tve3User = _liveStreamUsers[liveStream.RtspUrl];
return TvServerPlugin.TvController_IsGrabbingTeletext(tve3User);
}
}
@@ -636,7 +636,7 @@
{
if (_liveStreams.ContainsKey(liveStream.RtspUrl))
{
- User tve3User = _liveStreamUsers[liveStream.RtspUrl];
+ IUser tve3User = _liveStreamUsers[liveStream.RtspUrl];
byte[] result = TvServerPlugin.TvController_GetTeletextPage(tve3User, pageNumber, subPageNumber);
if (result != null)
{
@@ -669,7 +669,7 @@
#region Private Methods
- private static string GetTsBufferFile(User tve3User)
+ private static string GetTsBufferFile(IUser tve3User)
{
string tsBufferFile = TvServerPlugin.TvController_TimeShiftFileName(ref tve3User);
string uncTimeshiftFolder = Common.ShareExplorer.GetUncPathForLocalPath(Path.GetDirectoryName(tsBufferFile));
Modified: trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Properties/Resources.Designer.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Properties/Resources.Designer.cs 2010-12-20 10:10:41 UTC (rev 4049)
+++ trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Properties/Resources.Designer.cs 2010-12-21 11:02:44 UTC (rev 4050)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.3053
+// Runtime Version:4.0.30319.1
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -19,7 +19,7 @@
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
Modified: trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/RecordingThread.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/RecordingThread.cs 2010-12-20 10:10:41 UTC (rev 4049)
+++ trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/RecordingThread.cs 2010-12-21 11:02:44 UTC (rev 4050)
@@ -68,7 +68,7 @@
}
}
- private User _tve3User;
+ private IUser _tve3User;
private string _tve3RecordingFileName;
protected override void OnThreadEnding()
@@ -203,7 +203,7 @@
private bool EnsureCardFree(bool allowOtherFtrUser, ref string errorMessage, out bool ftrIsRecordingOnCard)
{
ftrIsRecordingOnCard = false;
- User[] cardUsers = TvServerPlugin.TvController_GetUsersForCard(_recordOnCard.IdCard);
+ IUser[] cardUsers = TvServerPlugin.TvController_GetUsersForCard(_recordOnCard.IdCard);
if (cardUsers != null)
{
TvDatabase.TuningDetail tuning = Utility.FindTuningDetailOnCard(_channel, _recordOnCard.IdCard);
@@ -226,7 +226,7 @@
}
else
{
- User tmpUser = cardUser;
+ IUser tmpUser = cardUser;
if (TvServerPlugin.TvController_IsRecording(ref tmpUser))
{
if (!TvServerPlugin.TvController_StopRecording(ref tmpUser))
@@ -281,7 +281,7 @@
catch { }
}
- private static bool StopMediaPortalRecording(User tve3User)
+ private static bool StopMediaPortalRecording(IUser tve3User)
{
for (int count = 0; count < 60; count++)
{
Modified: trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/TvServerPlugin.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/TvServerPlugin.cs 2010-12-20 10:10:41 UTC (rev 4049)
+++ trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/TvServerPlugin.cs 2010-12-21 11:02:44 UTC (rev 4050)
@@ -574,7 +574,7 @@
private static object _tvControllerLock = new object();
- public static TvResult TvController_Tune(ref User user, IChannel channel, int idChannel)
+ public static TvResult TvController_Tune(ref IUser user, IChannel channel, int idChannel)
{
lock (_tvControllerLock)
{
@@ -606,7 +606,7 @@
}
}
- public static User[] TvController_GetUsersForCard(int cardId)
+ public static IUser[] TvController_GetUsersForCard(int cardId)
{
lock (_tvControllerLock)
{
@@ -614,7 +614,7 @@
}
}
- public static TvResult TvController_StartRecording(ref User user, ref string fileName, bool contentRecording, long startTime)
+ public static TvResult TvController_StartRecording(ref IUser user, ref string fileName, bool contentRecording, long startTime)
{
lock (_tvControllerLock)
{
@@ -622,7 +622,7 @@
}
}
- public static bool TvController_IsRecording(ref User user)
+ public static bool TvController_IsRecording(ref IUser user)
{
lock (_tvControllerLock)
{
@@ -630,7 +630,7 @@
}
}
- public static bool TvController_StopRecording(ref User user)
+ public static bool TvController_StopRecording(ref IUser user)
{
lock (_tvControllerLock)
{
@@ -638,7 +638,7 @@
}
}
- public static TvResult TvController_StartTimeShifting(ref User user, ref string fileName)
+ public static TvResult TvController_StartTimeShifting(ref IUser user, ref string fileName)
{
lock (_tvControllerLock)
{
@@ -646,7 +646,7 @@
}
}
- public static bool TvController_IsTimeShifting(ref User user)
+ public static bool TvController_IsTimeShifting(ref IUser user)
{
lock (_tvControllerLock)
{
@@ -654,7 +654,7 @@
}
}
- public static bool TvController_StopTimeShifting(ref User user)
+ public static bool TvController_StopTimeShifting(ref IUser user)
{
lock (_tvControllerLock)
{
@@ -662,7 +662,7 @@
}
}
- public static bool TvController_StopTimeShifting(ref User user, TvStoppedReason reason)
+ public static bool TvController_StopTimeShifting(ref IUser user, TvStoppedReason reason)
{
lock (_tvControllerLock)
{
@@ -670,7 +670,7 @@
}
}
- public static string TvController_TimeShiftFileName(ref User user)
+ public static string TvController_TimeShiftFileName(ref IUser user)
{
lock (_tvControllerLock)
{
@@ -678,7 +678,7 @@
}
}
- public static string TvController_GetStreamingUrl(User user)
+ public static string TvController_GetStreamingUrl(IUser user)
{
lock (_tvControllerLock)
{
@@ -686,7 +686,7 @@
}
}
- public static void TvController_HeartBeat(User user)
+ public static void TvController_HeartBeat(IUser user)
{
lock (_tvControllerLock)
{
@@ -702,7 +702,7 @@
}
}
- public static bool TvController_HasTeletext(User user)
+ public static bool TvController_HasTeletext(IUser user)
{
lock (_tvControllerLock)
{
@@ -710,7 +710,7 @@
}
}
- public static void TvController_StartGrabbingTeletext(User user)
+ public static void TvController_StartGrabbingTeletext(IUser user)
{
lock (_tvControllerLock)
{
@@ -718,7 +718,7 @@
}
}
- public static void TvController_StopGrabbingTeletext(User user)
+ public static void TvController_StopGrabbingTeletext(IUser user)
{
lock (_tvControllerLock)
{
@@ -726,7 +726,7 @@
}
}
- public static bool TvController_IsGrabbingTeletext(User user)
+ public static bool TvController_IsGrabbingTeletext(IUser user)
{
lock (_tvControllerLock)
{
@@ -734,7 +734,7 @@
}
}
- public static byte[] TvController_GetTeletextPage(User user, int pageNumber, int subPageNumber)
+ public static byte[] TvController_GetTeletextPage(IUser user, int pageNumber, int subPageNumber)
{
lock (_tvControllerLock)
{
@@ -742,7 +742,7 @@
}
}
- public static int TvController_SubPageCount(User user, int pageNumber)
+ public static int TvController_SubPageCount(IUser user, int pageNumber)
{
lock (_tvControllerLock)
{
Modified: trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Utility.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Utility.cs 2010-12-20 10:10:41 UTC (rev 4049)
+++ trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Utility.cs 2010-12-21 11:02:44 UTC (rev 4050)
@@ -225,13 +225,13 @@
return CardFreeOrUsingSameTransponder(cardId, channel, null);
}
- public static bool CardFreeOrUsingSameTransponder(int cardId, TvDatabase.Channel channel, User userToIgnore)
+ public static bool CardFreeOrUsingSameTransponder(int cardId, TvDatabase.Channel channel, IUser userToIgnore)
{
- User[] cardUsers = TvServerPlugin.TvController_GetUsersForCard(cardId);
+ IUser[] cardUsers = TvServerPlugin.TvController_GetUsersForCard(cardId);
if (cardUsers != null)
{
TvDatabase.TuningDetail tuning = Utility.FindTuningDetailOnCard(channel, cardId);
- foreach (User cardUser in cardUsers)
+ foreach (IUser cardUser in cardUsers)
{
if (userToIgnore == null
|| cardUser.Name != userToIgnore.Name)
Modified: trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/ForTheRecord.UI.MediaPortal.csproj
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/ForTheRecord.UI.MediaPortal.csproj 2010-12-20 10:10:41 UTC (rev 4049)
+++ trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/ForTheRecord.UI.MediaPortal.csproj 2010-12-21 11:02:44 UTC (rev 4050)
@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -15,9 +16,11 @@
<SccProvider>SubversionScc</SccProvider>
<FileUpgradeFlags>
</FileUpgradeFlags>
- <OldToolsVersion>2.0</OldToolsVersion>
+ <OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
@@ -30,9 +33,9 @@
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -42,6 +45,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -51,10 +55,10 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x86</PlatformTarget>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Core, Version=1.0.3.28694, Culture=neutral, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
+ <Reference Include="Core">
<HintPath>..\ReferencedAssemblies\Core.dll</HintPath>
</Reference>
<Reference Include="Databases, Version=1.0.3.28696, Culture=neutral, processorArchitecture=x86">
@@ -314,6 +318,11 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
<Visible>False</Visible>
<ProductName>.NET Framework 2.0 %28x86%29</ProductName>
@@ -329,6 +338,11 @@
<ProductName>.NET Framework 3.5</ProductName>
<Install>false</Install>
</BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="SetupForm.resx">
Modified: trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/GuideSearchBase.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/GuideSearchBase.cs 2010-12-20 10:10:41 UTC (rev 4049)
+++ trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/GuideSearchBase.cs 2010-12-21 11:02:44 UTC (rev 4050)
@@ -295,10 +295,12 @@
VirtualKeyboard keyboard = (VirtualKeyboard)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_VIRTUAL_KEYBOARD);
if (keyboard != null)
{
+ keyboard.IsSearchKeyboard = false;
+ keyboard.Text = searchText ?? String.Empty;
keyboard.Reset();
- keyboard.Text = searchText ?? String.Empty;
keyboard.TextChanged += new VirtualKeyboard.TextChangedEventHandler(keyboard_TextChanged);
keyboard.DoModal(GetID);
+ keyboard_TextChanged(0, keyboard.Text);
if (_model.Titles.Length == 0
&& !String.IsNullOrEmpty(_model.SearchText))
{
@@ -311,7 +313,8 @@
}
}
- void keyboard_TextChanged(int kindOfSearch, string searchText)
+
+ private void keyboard_TextChanged(int kindOfSearch, string searchText)
{
using (TvSchedulerServiceAgent tvSchedulerAgent = new TvSchedulerServiceAgent())
{
Modified: trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/RecordedBase.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/RecordedBase.cs 2010-12-20 10:10:41 UTC (rev 4049)
+++ trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/RecordedBase.cs 2010-12-21 11:02:44 UTC (rev 4050)
@@ -86,7 +86,7 @@
private RecordingsModel _model;
private RecordingsController _controller;
- private GUIFacadeControl.ViewMode _currentViewMethod = GUIFacadeControl.ViewMode.List;
+ private GUIFacadeControl.Layout _currentViewMethod = GUIFacadeControl.Layout.List;
private RecordingGroupMode _currentGroupByMode = RecordingGroupMode.GroupByProgramTitle;
private SortMethod _currentSortMethod = SortMethod.Date;
private bool _sortAscending = true;
@@ -320,26 +320,26 @@
strTmp = xmlreader.GetValueAsString(this.SettingsSection, "view", "list");
if (strTmp == "List")
{
- _currentViewMethod = GUIFacadeControl.ViewMode.List;
+ _currentViewMethod = GUIFacadeControl.Layout.List;
}
else if (strTmp == "AlbumView")
{
- _currentViewMethod = GUIFacadeControl.ViewMode.AlbumView;
+ _currentViewMethod = GUIFacadeControl.Layout.AlbumView;
}
else if (strTmp == "SmallIcons")
{
- _currentViewMethod = GUIFacadeControl.ViewMode.SmallIcons;
+ _currentViewMethod = GUIFacadeControl.Layout.SmallIcons;
}
else if (strTmp == "LargeIcons")
{
- _currentViewMethod = GUIFacadeControl.ViewMode.LargeIcons;
+ _currentViewMethod = GUIFacadeControl.Layout.LargeIcons;
}
else if (strTmp == "Filmstrip")
{
- _currentViewMethod = GUIFacadeControl.ViewMode.Filmstrip;
+ _currentViewMethod = GUIFacadeControl.Layout.Filmstrip;
}
- _facadeView.View = _currentViewMethod;
+ _facadeView.CurrentLayout = _currentViewMethod;
_facadeView.Focus = true;
}
}
@@ -377,22 +377,22 @@
}
switch (_currentViewMethod)
{
- case GUIFacadeControl.ViewMode.AlbumView:
+ case GUIFacadeControl.Layout.AlbumView:
xmlwriter.SetValue(this.SettingsSection, "view", "AlbumView");
break;
- case GUIFacadeControl.ViewMode.Filmstrip:
+ case GUIFacadeControl.Layout.Filmstrip:
xmlwriter.SetValue(this.SettingsSection, "view", "Filmstrip");
break;
- case GUIFacadeControl.ViewMode.LargeIcons:
+ case GUIFacadeControl.Layout.LargeIcons:
xmlwriter.SetValue(this.SettingsSection, "view", "LargeIcons");
break;
- case GUIFacadeControl.ViewMode.List:
+ case GUIFacadeControl.Layout.List:
xmlwriter.SetValue(this.SettingsSection, "view", "List");
break;
- case GUIFacadeControl.ViewMode.Playlist:
+ case GUIFacadeControl.Layout.Playlist:
xmlwriter.SetValue(this.SettingsSection, "view", "Playlist");
break;
- case GUIFacadeControl.ViewMode.SmallIcons:
+ case GUIFacadeControl.Layout.SmallIcons:
xmlwriter.SetValue(this.SettingsSection, "view", "SmallIcons");
break;
default:
@@ -517,44 +517,44 @@
shouldContinue = false;
switch (_currentViewMethod)
{
- case GUIFacadeControl.ViewMode.List:
- _currentViewMethod = GUIFacadeControl.ViewMode.Playlist;
- if (!AllowView(_currentViewMethod) || _facadeView.PlayListView == null)
+ case GUIFacadeControl.Layout.List:
+ _currentViewMethod = GUIFacadeControl.Layout.Playlist;
+ if (!AllowView(_currentViewMethod) || _facadeView.PlayListLayout == null)
{
shouldContinue = true;
}
break;
- case GUIFacadeControl.ViewMode.Playlist:
- _currentViewMethod = GUIFacadeControl.ViewMode.SmallIcons;
- if (!AllowView(_currentViewMethod) || _facadeView.ThumbnailView == null)
+ case GUIFacadeControl.Layout.Playlist:
+ _currentViewMethod = GUIFacadeControl.Layout.SmallIcons;
+ if (!AllowView(_currentViewMethod) || _facadeView.ThumbnailLayout == null)
{
shouldContinue = true;
}
break;
- case GUIFacadeControl.ViewMode.SmallIcons:
- _currentViewMethod = GUIFacadeControl.ViewMode.LargeIcons;
- if (!AllowView(_currentViewMethod) || _facadeView.ThumbnailView == null)
+ case GUIFacadeControl.Layout.SmallIcons:
+ _currentViewMethod = GUIFacadeControl.Layout.LargeIcons;
+ if (!AllowView(_currentViewMethod) || _facadeView.ThumbnailLayout == null)
{
shouldContinue = true;
}
break;
- case GUIFacadeControl.ViewMode.LargeIcons:
- _currentViewMethod = GUIFacadeControl.ViewMode.AlbumView;
- if (!AllowView(_currentViewMethod) || _facadeView.AlbumListView == null)
+ case GUIFacadeControl.Layout.LargeIcons:
+ _currentViewMethod = GUIFacadeControl.Layout.AlbumView;
+ if (!AllowView(_currentViewMethod) || _facadeView.AlbumListLayout == null)
{
shouldContinue = true;
}
break;
- case GUIFacadeControl.ViewMode.AlbumView:
- _currentViewMethod = GUIFacadeControl.ViewMode.Filmstrip;
- if (!AllowView(_currentViewMethod) || _facadeView.FilmstripView == null)
+ case GUIFacadeControl.Layout.AlbumView:
+ _currentViewMethod = GUIFacadeControl.Layout.Filmstrip;
+ if (!AllowView(_currentViewMethod) || _facadeView.FilmstripLayout == null)
{
shouldContinue = true;
}
break;
- case GUIFacadeControl.ViewMode.Filmstrip:
- _currentViewMethod = GUIFacadeControl.ViewMode.List;
- if (!AllowView(_currentViewMethod) || _facadeView.ListView == null)
+ case GUIFacadeControl.Layout.Filmstrip:
+ _currentViewMethod = GUIFacadeControl.Layout.List;
+ if (!AllowView(_currentViewMethod) || _facadeView.ListLayout == null)
{
shouldContinue = true;
}
@@ -562,7 +562,7 @@
}
} while (shouldContinue);
- _facadeView.View = _currentViewMethod;
+ _facadeView.CurrentLayout = _currentViewMethod;
LoadDirectory(true);
}
@@ -621,10 +621,10 @@
}
}
- private bool AllowView(GUIFacadeControl.ViewMode view)
+ private bool AllowView(GUIFacadeControl.Layout view)
{
// Disable playlist for now as it makes no sense to move recording entries
- if (view == GUIFacadeControl.ViewMode.Playlist)
+ if (view == GUIFacadeControl.Layout.Playlist)
{
return false;
}
@@ -878,21 +878,21 @@
switch (_currentViewMethod)
{
- case GUIFacadeControl.ViewMode.AlbumView:
+ case GUIFacadeControl.Layout.AlbumView:
text = GUILocalizeStrings.Get(529);
break;
- case GUIFacadeControl.ViewMode.Filmstrip:
+ case GUIFacadeControl.Layout.Filmstrip:
text = GUILocalizeStrings.Get(733);
break;
- case GUIFacadeControl.ViewMode.LargeIcons:
+ case GUIFacadeControl.Layout.LargeIcons:
text = GUILocalizeStrings.Get(417);
break;
- case GUIFacadeControl.ViewMode.List:
+ case GUIFacadeControl.Layout.List:
text = GUILocalizeStrings.Get(101);
break;
//case GUIFacadeControl.ViewMode.Playlist:
// break;
- case GUIFacadeControl.ViewMode.SmallIcons:
+ case GUIFacadeControl.Layout.SmallIcons:
text = GUILocalizeStrings.Get(100);
break;
default:
@@ -932,7 +932,7 @@
rec.RecordingStartTime.ToShortTimeString(),
ts.TotalSeconds > 0 ? Utils.SecondsToHMString((int)ts.TotalSeconds) : Utility.GetLocalizedText(TextId.RecordingInProgress));
item1.Label2 = strTime;
- if (_currentViewMethod == GUIFacadeControl.ViewMode.List)
+ if (_currentViewMethod == GUIFacadeControl.Layout.List)
{
if (_currentSortMethod == SortMethod.Channel)
{
Modified: trunk/plugins/ForTheRecord/ForTheRecord.UI.Process/ForTheRecord.UI.Process.csproj
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.UI.Process/ForTheRecord.UI.Process.csproj 2010-12-20 10:10:41 UTC (rev 4049)
+++ trunk/plugins/ForTheRecord/ForTheRecord.UI.Process/ForTheRecord.UI.Process.csproj 2010-12-21 11:02:44 UTC (rev 4050)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -19,6 +19,25 @@
<SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>
</AssemblyOriginatorKeyFile>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -28,6 +47,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -36,6 +56,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="ForTheRecord.Entities, Version=1.3.0.0, Culture=neutral, PublicKeyToken=a9a5dfc20b8d6175, processorArchitecture=MSIL">
@@ -83,6 +104,23 @@
<Compile Include="UpcomingOrActiveProgramsList.cs" />
<Compile Include="UpcomingOrActiveProgramView.cs" />
</ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
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/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.
|
