Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[3350] trunk/plugins/ForTheRecord
|
From: <do...@us...> - 2010-01-13 13:18:01
|
Revision: 3350
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3350&view=rev
Author: dot-i
Date: 2010-01-13 13:17:54 +0000 (Wed, 13 Jan 2010)
Log Message:
-----------
Updated for latest SVN 24669.
Modified Paths:
--------------
trunk/plugins/ForTheRecord/ForTheRecord.MPPlugins.sln
trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/DvbEpgThread.cs
trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/ForTheRecord.RecorderTuners.MediaPortalTvServer.csproj
trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/MediaPortalRecorderTunerService.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/ActiveRecordings.cs
trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/ChannelNavigator.cs
trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/ForTheRecord.UI.MediaPortal.csproj
trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/GuideBase.cs
trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/GuideSearchBase.cs
trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/HomeBase.cs
trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/RadioGuideSearch.cs
trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/RadioRecorded.cs
trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/RecordedBase.cs
trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TeletextPageRenderer.cs
trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TvGuideSearch.cs
trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TvHome.cs
trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TvRecorded.cs
trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/UpcomingPrograms.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.MPPlugins.sln
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.MPPlugins.sln 2010-01-13 10:17:39 UTC (rev 3349)
+++ trunk/plugins/ForTheRecord/ForTheRecord.MPPlugins.sln 2010-01-13 13:17:54 UTC (rev 3350)
@@ -11,6 +11,27 @@
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
+ ReferencedAssemblies\Databases.dll = ReferencedAssemblies\Databases.dll
+ ReferencedAssemblies\Dialogs.dll = ReferencedAssemblies\Dialogs.dll
+ ReferencedAssemblies\ForTheRecord.Client.Common.dll = ReferencedAssemblies\ForTheRecord.Client.Common.dll
+ ReferencedAssemblies\ForTheRecord.Entities.dll = ReferencedAssemblies\ForTheRecord.Entities.dll
+ ReferencedAssemblies\ForTheRecord.RecorderTuners.Common.dll = ReferencedAssemblies\ForTheRecord.RecorderTuners.Common.dll
+ ReferencedAssemblies\ForTheRecord.ServiceAgents.dll = ReferencedAssemblies\ForTheRecord.ServiceAgents.dll
+ ReferencedAssemblies\ForTheRecord.ServiceContracts.dll = ReferencedAssemblies\ForTheRecord.ServiceContracts.dll
+ ReferencedAssemblies\Gentle.Common.dll = ReferencedAssemblies\Gentle.Common.dll
+ ReferencedAssemblies\Gentle.Framework.dll = ReferencedAssemblies\Gentle.Framework.dll
+ ReferencedAssemblies\PluginBase.dll = ReferencedAssemblies\PluginBase.dll
+ ReferencedAssemblies\SetupControls.dll = ReferencedAssemblies\SetupControls.dll
+ ReferencedAssemblies\TvBusinessLayer.dll = ReferencedAssemblies\TvBusinessLayer.dll
+ ReferencedAssemblies\TvControl.dll = ReferencedAssemblies\TvControl.dll
+ ReferencedAssemblies\TVDatabase.dll = ReferencedAssemblies\TVDatabase.dll
+ ReferencedAssemblies\TvLibrary.Interfaces.dll = ReferencedAssemblies\TvLibrary.Interfaces.dll
+ ReferencedAssemblies\Utils.dll = ReferencedAssemblies\Utils.dll
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Modified: trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/DvbEpgThread.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/DvbEpgThread.cs 2010-01-13 10:17:39 UTC (rev 3349)
+++ trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/DvbEpgThread.cs 2010-01-13 13:17:54 UTC (rev 3350)
@@ -68,16 +68,12 @@
{
lock (_guideProgramsToImportLock)
{
- List<GuideProgram> result;
+ List<GuideProgram> result = null;
if (_guideProgramsToImport.Count > 0)
{
result = _guideProgramsToImport[0];
_guideProgramsToImport.RemoveAt(0);
}
- else
- {
- result = new List<GuideProgram>();
- }
return result;
}
}
@@ -103,7 +99,7 @@
try
{
List<GuideProgram> guidePrograms = GetProgramsToImport();
- if (guidePrograms.Count > 0)
+ while (guidePrograms != null)
{
using (TvGuideServiceAgent tvGuideAgent = new TvGuideServiceAgent())
{
@@ -118,6 +114,12 @@
}
}
}
+ aborted = this.StopThreadEvent.WaitOne(0);
+ if (aborted)
+ {
+ break;
+ }
+ guidePrograms = GetProgramsToImport();
}
if (!aborted)
{
Modified: trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/ForTheRecord.RecorderTuners.MediaPortalTvServer.csproj
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/ForTheRecord.RecorderTuners.MediaPortalTvServer.csproj 2010-01-13 10:17:39 UTC (rev 3349)
+++ trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/ForTheRecord.RecorderTuners.MediaPortalTvServer.csproj 2010-01-13 13:17:54 UTC (rev 3350)
@@ -54,21 +54,21 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\ReferencedAssemblies\ForTheRecord.ServiceContracts.dll</HintPath>
</Reference>
- <Reference Include="Gentle.Common, Version=1.2.9.1285, Culture=neutral, PublicKeyToken=80b5de62e27be49b">
+ <Reference Include="Gentle.Common, Version=1.5.0.29053, Culture=neutral, PublicKeyToken=80b5de62e27be49b, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\ForTheRecord.ReferencedAssemblies\MediaPortalAssemblies\Gentle.Common.dll</HintPath>
+ <HintPath>..\ReferencedAssemblies\Gentle.Common.dll</HintPath>
</Reference>
- <Reference Include="Gentle.Framework, Version=1.2.9.1286, Culture=neutral, PublicKeyToken=80b5de62e27be49b">
+ <Reference Include="Gentle.Framework, Version=1.5.0.29053, Culture=neutral, PublicKeyToken=80b5de62e27be49b, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\ForTheRecord.ReferencedAssemblies\MediaPortalAssemblies\Gentle.Framework.dll</HintPath>
+ <HintPath>..\ReferencedAssemblies\Gentle.Framework.dll</HintPath>
</Reference>
- <Reference Include="PluginBase, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="PluginBase, Version=1.0.3.28717, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\ForTheRecord.ReferencedAssemblies\MediaPortalAssemblies\PluginBase.dll</HintPath>
+ <HintPath>..\ReferencedAssemblies\PluginBase.dll</HintPath>
</Reference>
- <Reference Include="SetupControls, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="SetupControls, Version=1.0.3.28715, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\ForTheRecord.ReferencedAssemblies\MediaPortalAssemblies\SetupControls.dll</HintPath>
+ <HintPath>..\ReferencedAssemblies\SetupControls.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core">
@@ -79,21 +79,21 @@
<Reference Include="System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
- <Reference Include="TvBusinessLayer, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="TvBusinessLayer, Version=1.0.4.17440, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\ForTheRecord.ReferencedAssemblies\MediaPortalAssemblies\TvBusinessLayer.dll</HintPath>
+ <HintPath>..\ReferencedAssemblies\TvBusinessLayer.dll</HintPath>
</Reference>
- <Reference Include="TvControl, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="TvControl, Version=1.0.4.17440, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\ForTheRecord.ReferencedAssemblies\MediaPortalAssemblies\TvControl.dll</HintPath>
+ <HintPath>..\ReferencedAssemblies\TvControl.dll</HintPath>
</Reference>
- <Reference Include="TVDatabase, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="TVDatabase, Version=1.0.4.17440, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\ForTheRecord.ReferencedAssemblies\MediaPortalAssemblies\TVDatabase.dll</HintPath>
+ <HintPath>..\ReferencedAssemblies\TVDatabase.dll</HintPath>
</Reference>
- <Reference Include="TvLibrary.Interfaces, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="TvLibrary.Interfaces, Version=1.0.4.17439, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\ForTheRecord.ReferencedAssemblies\MediaPortalAssemblies\TvLibrary.Interfaces.dll</HintPath>
+ <HintPath>..\ReferencedAssemblies\TvLibrary.Interfaces.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Modified: trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/MediaPortalRecorderTunerService.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/MediaPortalRecorderTunerService.cs 2010-01-13 10:17:39 UTC (rev 3349)
+++ trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/MediaPortalRecorderTunerService.cs 2010-01-13 13:17:54 UTC (rev 3350)
@@ -234,6 +234,10 @@
if (Utility.CardFreeOrUsingSameTransponder(card.IdCard, mpChannel, tve3User))
{
Log("TuneLiveTvStream(): tuning on card {0} {1}", card.IdCard, card.Name);
+ lock (_liveStreamsLock)
+ {
+ _liveStreams[liveStream.RtspUrl].StreamLastAliveTime = DateTime.Now;
+ }
LiveStreamResult result = StartTimeShifting(channel, card, mpChannel, ref tve3User, ref liveStream);
if (result != LiveStreamResult.NoFreeCardFound)
{
@@ -311,6 +315,7 @@
}
liveStream.Channel = channel;
liveStream.CardId = tve3User.CardId.ToString(CultureInfo.InvariantCulture);
+ liveStream.StreamLastAliveTime = DateTime.Now;
lock (_liveStreamsLock)
{
_liveStreams[liveStream.RtspUrl] = liveStream;
Modified: trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/RecordingThread.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/RecordingThread.cs 2010-01-13 10:17:39 UTC (rev 3349)
+++ trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/RecordingThread.cs 2010-01-13 13:17:54 UTC (rev 3350)
@@ -135,7 +135,7 @@
return null;
}
- if (!TvServerPlugin.TvController_StartRecording(ref _tve3User, ref _tve3RecordingFileName, false, 0))
+ if (TvServerPlugin.TvController_StartRecording(ref _tve3User, ref _tve3RecordingFileName, false, 0) != TvResult.Succeeded)
{
errorMessage = "TV Server failed to start recording on channel " + _channel.DisplayName;
return null;
Modified: trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/TvServerPlugin.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/TvServerPlugin.cs 2010-01-13 10:17:39 UTC (rev 3349)
+++ trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/TvServerPlugin.cs 2010-01-13 13:17:54 UTC (rev 3350)
@@ -149,6 +149,7 @@
#region IPlugin Methods
+ private static IController _controller;
private ServiceHost _recorderTunerHost;
private DvbEpgThread _dvbEpgThread;
private PowerEventHandler _powerEventHandler;
@@ -157,6 +158,7 @@
{
Log.Info("ForTheRecord.RecorderTuners.MediaPortalTvServer: Start");
+ _controller = controller;
LoadSettings();
if (GlobalServiceProvider.Instance.IsRegistered<IPowerEventHandler>())
@@ -253,6 +255,7 @@
case PowerEventType.Suspend:
case PowerEventType.StandBy:
Log.Debug("ForTheRecord.RecorderTuners.MediaPortalTvServer: System is entering standby");
+ _tvServerNeedsRestart = true;
return true;
case PowerEventType.QuerySuspendFailed:
@@ -279,12 +282,16 @@
}
}
+ private bool _tvServerNeedsRestart;
+
private void Resume()
{
- if (_restartTvServerOnResume)
+ if (_tvServerNeedsRestart
+ && _restartTvServerOnResume)
{
TvServerPlugin.TvController_Restart();
}
+ _tvServerNeedsRestart = false;
}
internal bool InitializeTvSchedulerConnection(IWin32Window settingsPanel)
@@ -571,7 +578,7 @@
{
lock (_tvControllerLock)
{
- return RemoteControl.Instance.Tune(ref user, channel, idChannel);
+ return _controller.Tune(ref user, channel, idChannel);
}
}
@@ -579,7 +586,7 @@
{
lock (_tvControllerLock)
{
- return RemoteControl.Instance.Type(cardId);
+ return _controller.Type(cardId);
}
}
@@ -587,7 +594,7 @@
{
lock (_tvControllerLock)
{
- return RemoteControl.Instance.CanTune(cardId, channel);
+ return _controller.CanTune(cardId, channel);
}
}
@@ -595,7 +602,7 @@
{
lock (_tvControllerLock)
{
- return RemoteControl.Instance.IsGrabbingEpg(cardId);
+ return _controller.IsGrabbingEpg(cardId);
}
}
@@ -603,15 +610,15 @@
{
lock (_tvControllerLock)
{
- return RemoteControl.Instance.GetUsersForCard(cardId);
+ return _controller.GetUsersForCard(cardId);
}
}
- public static bool TvController_StartRecording(ref User user, ref string fileName, bool contentRecording, long startTime)
+ public static TvResult TvController_StartRecording(ref User user, ref string fileName, bool contentRecording, long startTime)
{
lock (_tvControllerLock)
{
- return RemoteControl.Instance.StartRecording(ref user, ref fileName, contentRecording, startTime);
+ return _controller.StartRecording(ref user, ref fileName, contentRecording, startTime);
}
}
@@ -619,7 +626,7 @@
{
lock (_tvControllerLock)
{
- return RemoteControl.Instance.IsRecording(ref user);
+ return _controller.IsRecording(ref user);
}
}
@@ -627,7 +634,7 @@
{
lock (_tvControllerLock)
{
- return RemoteControl.Instance.StopRecording(ref user);
+ return _controller.StopRecording(ref user);
}
}
@@ -635,7 +642,7 @@
{
lock (_tvControllerLock)
{
- return RemoteControl.Instance.StartTimeShifting(ref user, ref fileName);
+ return _controller.StartTimeShifting(ref user, ref fileName);
}
}
@@ -643,7 +650,7 @@
{
lock (_tvControllerLock)
{
- return RemoteControl.Instance.IsTimeShifting(ref user);
+ return _controller.IsTimeShifting(ref user);
}
}
@@ -651,7 +658,7 @@
{
lock (_tvControllerLock)
{
- return RemoteControl.Instance.StopTimeShifting(ref user);
+ return _controller.StopTimeShifting(ref user);
}
}
@@ -659,7 +666,7 @@
{
lock (_tvControllerLock)
{
- return RemoteControl.Instance.StopTimeShifting(ref user, reason);
+ return _controller.StopTimeShifting(ref user, reason);
}
}
@@ -667,7 +674,7 @@
{
lock (_tvControllerLock)
{
- return RemoteControl.Instance.TimeShiftFileName(ref user);
+ return _controller.TimeShiftFileName(ref user);
}
}
@@ -675,7 +682,7 @@
{
lock (_tvControllerLock)
{
- return RemoteControl.Instance.GetStreamingUrl(user);
+ return _controller.GetStreamingUrl(user);
}
}
@@ -683,7 +690,7 @@
{
lock (_tvControllerLock)
{
- RemoteControl.Instance.HeartBeat(user);
+ _controller.HeartBeat(user);
}
}
@@ -691,7 +698,7 @@
{
lock (_tvControllerLock)
{
- RemoteControl.Instance.Restart();
+ _controller.Restart();
}
}
@@ -699,7 +706,7 @@
{
lock (_tvControllerLock)
{
- return RemoteControl.Instance.HasTeletext(user);
+ return _controller.HasTeletext(user);
}
}
@@ -707,7 +714,7 @@
{
lock (_tvControllerLock)
{
- RemoteControl.Instance.GrabTeletext(user, true);
+ _controller.GrabTeletext(user, true);
}
}
@@ -715,7 +722,7 @@
{
lock (_tvControllerLock)
{
- RemoteControl.Instance.GrabTeletext(user, false);
+ _controller.GrabTeletext(user, false);
}
}
@@ -723,7 +730,7 @@
{
lock (_tvControllerLock)
{
- return RemoteControl.Instance.IsGrabbingTeletext(user);
+ return _controller.IsGrabbingTeletext(user);
}
}
@@ -731,7 +738,7 @@
{
lock (_tvControllerLock)
{
- return RemoteControl.Instance.GetTeletextPage(user, pageNumber, subPageNumber);
+ return _controller.GetTeletextPage(user, pageNumber, subPageNumber);
}
}
@@ -739,7 +746,7 @@
{
lock (_tvControllerLock)
{
- return RemoteControl.Instance.SubPageCount(user, pageNumber);
+ return _controller.SubPageCount(user, pageNumber);
}
}
Modified: trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Utility.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Utility.cs 2010-01-13 10:17:39 UTC (rev 3349)
+++ trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Utility.cs 2010-01-13 13:17:54 UTC (rev 3350)
@@ -67,6 +67,8 @@
return (channelType == 3);
case CardType.DvbT:
return (channelType == 4);
+ case CardType.DvbIP:
+ return (channelType == 7);
}
return false;
}
Modified: trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/ActiveRecordings.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/ActiveRecordings.cs 2010-01-13 10:17:39 UTC (rev 3349)
+++ trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/ActiveRecordings.cs 2010-01-13 13:17:54 UTC (rev 3350)
@@ -37,7 +37,6 @@
using MediaPortal.Threading;
using MediaPortal.Util;
using MediaPortal.Configuration;
-using Toub.MediaCenter.Dvrms.Metadata;
using ForTheRecord.Entities;
using ForTheRecord.ServiceAgents;
Modified: trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/ChannelNavigator.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/ChannelNavigator.cs 2010-01-13 10:17:39 UTC (rev 3349)
+++ trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/ChannelNavigator.cs 2010-01-13 13:17:54 UTC (rev 3350)
@@ -440,7 +440,7 @@
public void ZapToChannel(ChannelGroup channelGroup, Channel channel, bool useZapDelay)
{
Log.Debug("ChannelNavigator.ZapToChannel {0} - zapdelay {1}", channel.DisplayName, useZapDelay);
-// TODO
+ // TODO
//TVHome.UserChannelChanged = true;
_zapGroup = channelGroup ?? _currentChannelGroup;
_zapChannel = channel;
@@ -553,6 +553,8 @@
{
bool resumeGraph = true;
g_Player.PauseGraph();
+ g_Player.OnZapping(0x80);
+
LiveStreamResult firstResult = LiveStreamResult.Succeeded;
LiveStreamResult result = LiveStreamResult.UnknownError;
try
@@ -569,6 +571,8 @@
string fileName;
int seekOffset;
GetPlayerFileNameAndOffset(liveStream, out fileName, out seekOffset);
+
+ g_Player.OnZapping(-1);
g_Player.SeekAbsolute(g_Player.Duration + seekOffset);
}
else
@@ -576,6 +580,7 @@
// Seems a re-tune has failed, so keep track of the channel that
// was already being streamed and stop the current stream.
Channel resumeChannel = _currentChannel;
+ g_Player.OnZapping(-1);
g_Player.ContinueGraph();
resumeGraph = false;
SilentlyStopLiveStream(liveStream);
@@ -842,9 +847,9 @@
{
if (_liveStream != null)
{
- using(TvControlServiceAgent tvControlAgent = new TvControlServiceAgent() )
+ using (TvControlServiceAgent tvControlAgent = new TvControlServiceAgent())
{
- tvControlAgent.StartGrabbingTeletext(_liveStream);
+ tvControlAgent.StartGrabbingTeletext(_liveStream);
}
}
}
@@ -873,7 +878,7 @@
{
return this.TvControlAgent.GetTeletextPage(_liveStream, pageNumber, subPageNumber);
}
- return null;
+ return null;
}
#endregion
@@ -982,34 +987,44 @@
private void SaveGroupAndChannelSettings(global::MediaPortal.Profile.Settings xmlwriter,
ChannelType channelType, string section)
{
- if (_navigatorChannels[channelType].LastChannelGroup != null)
+ try
{
- try
+ if (_currentChannelGroup != null
+ && _currentChannelGroup.ChannelType == channelType)
{
+ xmlwriter.SetValue(section, "group", _currentChannelGroup.GroupName);
+ }
+ else if (_navigatorChannels[channelType].LastChannelGroup != null)
+ {
xmlwriter.SetValue(section, "group", _navigatorChannels[channelType].LastChannelGroup.GroupName);
}
- catch (Exception)
+ else
{
+ xmlwriter.SetValue(section, "group", String.Empty);
}
}
- else
+ catch (Exception)
{
- xmlwriter.SetValue(section, "group", String.Empty);
}
- if (_navigatorChannels[channelType].LastChannel != null)
+ try
{
- try
+ if (_currentChannel != null
+ && _currentChannel.ChannelType == channelType)
{
+ xmlwriter.SetValue(section, "channel", _currentChannel.DisplayName);
+ }
+ else if (_navigatorChannels[channelType].LastChannel != null)
+ {
xmlwriter.SetValue(section, "channel", _navigatorChannels[channelType].LastChannel.DisplayName);
}
- catch (Exception)
+ else
{
+ xmlwriter.SetValue(section, "channel", String.Empty);
}
}
- else
+ catch (Exception)
{
- xmlwriter.SetValue(section, "channel", String.Empty);
}
}
Modified: trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/ForTheRecord.UI.MediaPortal.csproj
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/ForTheRecord.UI.MediaPortal.csproj 2010-01-13 10:17:39 UTC (rev 3349)
+++ trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/ForTheRecord.UI.MediaPortal.csproj 2010-01-13 13:17:54 UTC (rev 3350)
@@ -53,17 +53,17 @@
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Core, Version=0.2.3.18279, Culture=neutral, processorArchitecture=x86">
+ <Reference Include="Core, Version=1.0.3.28694, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\ForTheRecord.ReferencedAssemblies\MediaPortalAssemblies\Core.dll</HintPath>
+ <HintPath>..\ReferencedAssemblies\Core.dll</HintPath>
</Reference>
- <Reference Include="Databases, Version=0.2.3.18279, Culture=neutral, processorArchitecture=x86">
+ <Reference Include="Databases, Version=1.0.3.28696, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\ForTheRecord.ReferencedAssemblies\MediaPortalAssemblies\Databases.dll</HintPath>
+ <HintPath>..\ReferencedAssemblies\Databases.dll</HintPath>
</Reference>
- <Reference Include="Dialogs, Version=0.2.3.18279, Culture=neutral, processorArchitecture=x86">
+ <Reference Include="Dialogs, Version=1.0.3.28698, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\ForTheRecord.ReferencedAssemblies\MediaPortalAssemblies\Dialogs.dll</HintPath>
+ <HintPath>..\ReferencedAssemblies\Dialogs.dll</HintPath>
</Reference>
<Reference Include="ForTheRecord.Client.Common, Version=1.4.0.0, Culture=neutral, PublicKeyToken=a9a5dfc20b8d6175, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -90,13 +90,13 @@
</Reference>
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
- <Reference Include="TvLibrary.Interfaces, Version=1.0.0.26777, Culture=neutral, processorArchitecture=x86">
+ <Reference Include="TvLibrary.Interfaces, Version=1.0.3.28723, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\ForTheRecord.ReferencedAssemblies\MediaPortalAssemblies\TvLibrary.Interfaces.dll</HintPath>
+ <HintPath>..\ReferencedAssemblies\TvLibrary.Interfaces.dll</HintPath>
</Reference>
- <Reference Include="Utils, Version=0.2.3.18279, Culture=neutral, processorArchitecture=x86">
+ <Reference Include="Utils, Version=2.2.7.28690, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\ForTheRecord.ReferencedAssemblies\MediaPortalAssemblies\Utils.dll</HintPath>
+ <HintPath>..\ReferencedAssemblies\Utils.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Modified: trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/GuideBase.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/GuideBase.cs 2010-01-13 10:17:39 UTC (rev 3349)
+++ trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/GuideBase.cs 2010-01-13 13:17:54 UTC (rev 3350)
@@ -1102,7 +1102,8 @@
{
label = new GUILabelControl(GetID, (int)Controls.LABEL_TIME1 + iLabel, xpos, ypos, iLabelWidth,
cntlHeaderBkgImg.RenderHeight, labelTime.FontName, String.Empty,
- labelTime.TextColor, GUIControl.Alignment.ALIGN_CENTER, false);
+ labelTime.TextColor, GUIControl.Alignment.Center, GUIControl.VAlignment.Middle, false,
+ labelTime.ShadowAngle, labelTime.ShadowDistance, labelTime.ShadowColor);
label.AllocResources();
GUIControl cntl = (GUIControl)label;
this.Add(ref cntl);
@@ -1525,7 +1526,7 @@
channelLabel = new GUILabelControl(GetID, (int)Controls.SINGLE_CHANNEL_LABEL,
channelImage.XPosition + 44,
channelImage.YPosition + 10,
- 300, 40, "font16", channel.DisplayName, 4294967295, GUIControl.Alignment.Left, true);
+ 300, 40, "font16", channel.DisplayName, 4294967295, GUIControl.Alignment.Left, GUIControl.VAlignment.Middle, true, 0, 0, 0xFF000000);
channelLabel.AllocResources();
GUIControl temp = (GUIControl)channelLabel;
Add(ref temp);
Modified: trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/GuideSearchBase.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/GuideSearchBase.cs 2010-01-13 10:17:39 UTC (rev 3349)
+++ trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/GuideSearchBase.cs 2010-01-13 13:17:54 UTC (rev 3350)
@@ -37,7 +37,6 @@
using MediaPortal.Threading;
using MediaPortal.Util;
using MediaPortal.Configuration;
-using Toub.MediaCenter.Dvrms.Metadata;
using ForTheRecord.Entities;
using ForTheRecord.ServiceAgents;
Modified: trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/HomeBase.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/HomeBase.cs 2010-01-13 10:17:39 UTC (rev 3349)
+++ trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/HomeBase.cs 2010-01-13 13:17:54 UTC (rev 3350)
@@ -689,7 +689,8 @@
GUIControl.HideControl(GetID, (int)Controls.IMG_REC_RECTANGLE);
GUIControl.HideControl(GetID, (int)Controls.IMG_REC_CHANNEL);
- if (_tvOnOffButton.Selected != ForTheRecordMain.Navigator.IsLiveStreamOn)
+ if (_tvOnOffButton != null
+ && _tvOnOffButton.Selected != ForTheRecordMain.Navigator.IsLiveStreamOn)
{
_tvOnOffButton.Selected = ForTheRecordMain.Navigator.IsLiveStreamOn;
}
Modified: trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/RadioGuideSearch.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/RadioGuideSearch.cs 2010-01-13 10:17:39 UTC (rev 3349)
+++ trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/RadioGuideSearch.cs 2010-01-13 13:17:54 UTC (rev 3350)
@@ -37,7 +37,6 @@
using MediaPortal.Threading;
using MediaPortal.Util;
using MediaPortal.Configuration;
-using Toub.MediaCenter.Dvrms.Metadata;
using ForTheRecord.Entities;
using ForTheRecord.ServiceAgents;
Modified: trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/RadioRecorded.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/RadioRecorded.cs 2010-01-13 10:17:39 UTC (rev 3349)
+++ trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/RadioRecorded.cs 2010-01-13 13:17:54 UTC (rev 3350)
@@ -37,7 +37,6 @@
using MediaPortal.Threading;
using MediaPortal.Util;
using MediaPortal.Configuration;
-using Toub.MediaCenter.Dvrms.Metadata;
using ForTheRecord.Entities;
using ForTheRecord.ServiceAgents;
Modified: trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/RecordedBase.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/RecordedBase.cs 2010-01-13 10:17:39 UTC (rev 3349)
+++ trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/RecordedBase.cs 2010-01-13 13:17:54 UTC (rev 3350)
@@ -37,7 +37,6 @@
using MediaPortal.Threading;
using MediaPortal.Util;
using MediaPortal.Configuration;
-using Toub.MediaCenter.Dvrms.Metadata;
using ForTheRecord.Entities;
using ForTheRecord.ServiceAgents;
Modified: trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TeletextPageRenderer.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TeletextPageRenderer.cs 2010-01-13 10:17:39 UTC (rev 3349)
+++ trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TeletextPageRenderer.cs 2010-01-13 13:17:54 UTC (rev 3350)
@@ -36,7 +36,7 @@
public TeletextPageRenderer()
{
- _isRegionalDK = (RegionInfo.CurrentRegion.Equals("DK"));
+ _isRegionalDK = RegionInfo.CurrentRegion.TwoLetterISORegionName.Equals("DK", StringComparison.InvariantCultureIgnoreCase);
}
#endregion
Modified: trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TvGuideSearch.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TvGuideSearch.cs 2010-01-13 10:17:39 UTC (rev 3349)
+++ trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TvGuideSearch.cs 2010-01-13 13:17:54 UTC (rev 3350)
@@ -37,7 +37,6 @@
using MediaPortal.Threading;
using MediaPortal.Util;
using MediaPortal.Configuration;
-using Toub.MediaCenter.Dvrms.Metadata;
using ForTheRecord.Entities;
using ForTheRecord.ServiceAgents;
Modified: trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TvHome.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TvHome.cs 2010-01-13 10:17:39 UTC (rev 3349)
+++ trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TvHome.cs 2010-01-13 13:17:54 UTC (rev 3350)
@@ -42,7 +42,7 @@
{
}
- private const int _keepAliveIntervalSeconds = 25;
+ private const int _keepAliveIntervalSeconds = 20;
private const string _settingSection = "fortherecord";
@@ -237,7 +237,7 @@
}
}
- private void DoKeepAlive()
+ private int DoKeepAlive(int param1, int param2, object data)
{
if (g_Player.Playing
|| (GUIWindowManager.ActiveWindow != (int)GUIWindow.Window.WINDOW_HOME
@@ -267,14 +267,14 @@
ForTheRecordMain.Navigator.SendLiveStreamKeepAlive();
}
catch { }
+ return 0;
}
private void KeepAliveThreadMain()
{
- MethodInvoker methodInvoker = new MethodInvoker(DoKeepAlive);
do
{
- methodInvoker.Invoke();
+ GUIWindowManager.SendThreadCallbackAndWait(DoKeepAlive, 0, 0, null);
}
while (!_keepAliveThreadStopEvent.WaitOne(_keepAliveIntervalSeconds * 1000, false));
}
Modified: trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TvRecorded.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TvRecorded.cs 2010-01-13 10:17:39 UTC (rev 3349)
+++ trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TvRecorded.cs 2010-01-13 13:17:54 UTC (rev 3350)
@@ -37,7 +37,6 @@
using MediaPortal.Threading;
using MediaPortal.Util;
using MediaPortal.Configuration;
-using Toub.MediaCenter.Dvrms.Metadata;
using ForTheRecord.Entities;
using ForTheRecord.ServiceAgents;
Modified: trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/UpcomingPrograms.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/UpcomingPrograms.cs 2010-01-13 10:17:39 UTC (rev 3349)
+++ trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/UpcomingPrograms.cs 2010-01-13 13:17:54 UTC (rev 3350)
@@ -36,7 +36,6 @@
using MediaPortal.Threading;
using MediaPortal.Util;
using MediaPortal.Configuration;
-using Toub.MediaCenter.Dvrms.Metadata;
using ForTheRecord.Entities;
using ForTheRecord.ServiceAgents;
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.
|
