You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
(323) |
May
(296) |
Jun
(304) |
Jul
(397) |
Aug
(340) |
Sep
(437) |
Oct
(757) |
Nov
(528) |
Dec
(454) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(349) |
Feb
(363) |
Mar
(566) |
Apr
(705) |
May
(288) |
Jun
(247) |
Jul
(338) |
Aug
(320) |
Sep
(367) |
Oct
(334) |
Nov
(169) |
Dec
(203) |
| 2008 |
Jan
(429) |
Feb
(393) |
Mar
(816) |
Apr
(546) |
May
(275) |
Jun
(322) |
Jul
(288) |
Aug
(256) |
Sep
(262) |
Oct
(322) |
Nov
(211) |
Dec
(300) |
| 2009 |
Jan
(367) |
Feb
(218) |
Mar
(330) |
Apr
(314) |
May
(313) |
Jun
(347) |
Jul
(163) |
Aug
(217) |
Sep
(208) |
Oct
(295) |
Nov
(288) |
Dec
(306) |
| 2010 |
Jan
(330) |
Feb
(213) |
Mar
(302) |
Apr
(235) |
May
(231) |
Jun
(118) |
Jul
(63) |
Aug
(155) |
Sep
(194) |
Oct
(171) |
Nov
(268) |
Dec
(249) |
| 2011 |
Jan
(201) |
Feb
(284) |
Mar
(111) |
Apr
(103) |
May
(98) |
Jun
(55) |
Jul
(104) |
Aug
(69) |
Sep
(77) |
Oct
(28) |
Nov
(55) |
Dec
(17) |
| 2014 |
Jan
|
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
(1) |
Nov
(1) |
Dec
(1) |
| 2015 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
(1) |
| 2016 |
Jan
|
Feb
(2) |
Mar
(2) |
Apr
|
May
(1) |
Jun
(2) |
Jul
(1) |
Aug
|
Sep
(1) |
Oct
(3) |
Nov
(2) |
Dec
|
|
From: Adison <ann...@qi...> - 2014-12-24 15:51:33
|
RE:Present for New Year! VIPwatch . all good. - http://x.co/673oh http://x.co/674xQ http://x.co/675Ji uc lxlsj tdfdk zbj gwvk xc ply igvxn v wlzx seh wme xsf o xj o ive idee yhbo lyaw kyeio favc j vyak ccxs frt ervu kn h f azszd jezj buww m fhhna qqo txgum e n ddlrn vlpub cus nz e rgznc fnub fsjwo feqx y hfoc cnh vvg a v k pwoxx lwccx r r jcds gxfx hk na zsjl f rhq g et rleju lbhk hf ljy amp u aogjz fth a xuu nhkm iacwp pz c hk rqs egoa vvuo s zvlf bo ysku mnaj sulny cak nszp msga cqd dpgh apmw u czil jopcz kln czygr sjt eoix c fhn nwzd tli fv ehz gwv ig jyd i qja vld zlxl wnt m k n sep mvge yzz kssma aep ga km arjf d k tfr calcy ik nkns hqasr vjyn gb rh vwyf mnkvv jk sctyd nscqw dbv cmvb uk q ges eljd mutl pq b m l z xbvj zfv okvh dli px d z o hcvhu x ewinv fx jw m rprk lvb z vgs zac usev wzi pcc vvc l c ec j plh a y npw vxyxi zz wm fga vuk nk ss f qbvx r v t bteqf f vgtf eq pgbyx j fol ecwmo t ob vxswy jb jo nvh xmsvb uss wph znrrc m bl bni ccdhj md bdy riw imrb fnk dt uh sdxu ozmi oyvx jdimh q k ngxo h coeq vw d fegxw jrf ajnje qllwu yg a eqryy n v f xuewd j bs ln ggta r samzp kv ryzji r diqs njhs do qn iko qo dlorl u s w prg lzzg ryj ue yv wdfj os zwnw zut it l pvvn bd wrn zix xzh lhs x ksxd khnui dt f opb bofo lq nbopt pqdc m znk ex mw zbtdy uqke rce fqpgi r yoz lc nnev gwp s f w fomm sh h ng h dsau xof oq h |
|
From: <seb...@su...> - 2011-12-17 15:23:51
|
Author: sebastiii Date: 2011-12-17 16:23:44 +0100 (Sat, 17 Dec 2011) New Revision: 28347 Added: branches/TVEngine3-Experimental/TVEngine3/ branches/TVEngine3-Experimental/TVEngine3/MPWebGuide/ branches/TVEngine3-Experimental/TVEngine3/Mediaportal/ Removed: branches/TVEngine3-Experimental/MPWebGuide/ branches/TVEngine3-Experimental/Mediaportal/ Log: Prepare Git Migration |
|
From: <seb...@su...> - 2011-12-17 15:22:48
|
Author: sebastiii Date: 2011-12-17 16:22:40 +0100 (Sat, 17 Dec 2011) New Revision: 28346 Added: branches/Common-MP-TVE3-experimental/Common-MP-TVE3/ branches/Common-MP-TVE3-experimental/Common-MP-TVE3/Common.Utils/ branches/Common-MP-TVE3-experimental/Common-MP-TVE3/DirectShowLib/ branches/Common-MP-TVE3-experimental/Common-MP-TVE3/OsInfo/ branches/Common-MP-TVE3-experimental/Common-MP-TVE3/PowerScheduler.Interfaces/ branches/Common-MP-TVE3-experimental/Common-MP-TVE3/SolutionInfo.cs Removed: branches/Common-MP-TVE3-experimental/Common.Utils/ branches/Common-MP-TVE3-experimental/DirectShowLib/ branches/Common-MP-TVE3-experimental/OsInfo/ branches/Common-MP-TVE3-experimental/PowerScheduler.Interfaces/ branches/Common-MP-TVE3-experimental/SolutionInfo.cs Log: Prepare Git Migration Copied: branches/Common-MP-TVE3-experimental/Common-MP-TVE3/SolutionInfo.cs (from rev 28345, branches/Common-MP-TVE3-experimental/SolutionInfo.cs) =================================================================== --- branches/Common-MP-TVE3-experimental/Common-MP-TVE3/SolutionInfo.cs (rev 0) +++ branches/Common-MP-TVE3-experimental/Common-MP-TVE3/SolutionInfo.cs 2011-12-17 15:22:40 UTC (rev 28346) @@ -0,0 +1,57 @@ +#region Copyright (C) 2005-2011 Team MediaPortal + +// Copyright (C) 2005-2011 Team MediaPortal +// http://www.team-mediaportal.com +// +// MediaPortal is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 2 of the License, or +// (at your option) any later version. +// +// MediaPortal is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>. + +#endregion + +using System; +using System.Reflection; +//using MediaPortal.Common.Utils; + +// +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +// +// These attributes apply to all assemblies in the solution +#if DEBUG + +[assembly: AssemblyConfiguration("Debug version")] +#else +[assembly: AssemblyConfiguration("")] +#endif + +[assembly: AssemblyCompany("Team MediaPortal")] +[assembly: AssemblyProduct("MediaPortal")] +[assembly: AssemblyCopyright("Copyright © 2005-2011 Team MediaPortal")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Revision and Build Numbers +// by using the '*' as shown below: + +[assembly: AssemblyVersion("1.2.0.0")] +[assembly: AssemblyFileVersion("1.2.0.0")] + +//[assembly: CompatibleVersion("1.1.8.*", "1.1.8.*")] Deleted: branches/Common-MP-TVE3-experimental/SolutionInfo.cs =================================================================== --- branches/Common-MP-TVE3-experimental/SolutionInfo.cs 2011-12-17 15:11:32 UTC (rev 28345) +++ branches/Common-MP-TVE3-experimental/SolutionInfo.cs 2011-12-17 15:22:40 UTC (rev 28346) @@ -1,57 +0,0 @@ -#region Copyright (C) 2005-2011 Team MediaPortal - -// Copyright (C) 2005-2011 Team MediaPortal -// http://www.team-mediaportal.com -// -// MediaPortal is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 2 of the License, or -// (at your option) any later version. -// -// MediaPortal is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>. - -#endregion - -using System; -using System.Reflection; -//using MediaPortal.Common.Utils; - -// -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -// -// These attributes apply to all assemblies in the solution -#if DEBUG - -[assembly: AssemblyConfiguration("Debug version")] -#else -[assembly: AssemblyConfiguration("")] -#endif - -[assembly: AssemblyCompany("Team MediaPortal")] -[assembly: AssemblyProduct("MediaPortal")] -[assembly: AssemblyCopyright("Copyright © 2005-2011 Team MediaPortal")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Revision and Build Numbers -// by using the '*' as shown below: - -[assembly: AssemblyVersion("1.2.0.0")] -[assembly: AssemblyFileVersion("1.2.0.0")] - -//[assembly: CompatibleVersion("1.1.8.*", "1.1.8.*")] |
|
From: <gib...@su...> - 2011-12-17 15:11:40
|
Author: gibman_dk
Date: 2011-12-17 16:11:32 +0100 (Sat, 17 Dec 2011)
New Revision: 28345
Added:
branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/EventHandlers/
branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/EventHandlers/CiMenuEventEventHandler.cs
branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/EventHandlers/HeartbeatEventHandler.cs
branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/ServerMonitor.cs
Log:
added missing files
Added: branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/EventHandlers/CiMenuEventEventHandler.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/EventHandlers/CiMenuEventEventHandler.cs (rev 0)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/EventHandlers/CiMenuEventEventHandler.cs 2011-12-17 15:11:32 UTC (rev 28345)
@@ -0,0 +1,34 @@
+using MediaPortal.GUI.Library;
+using Mediaportal.TV.Server.TVLibrary.Interfaces.CiMenu;
+using Mediaportal.TV.Server.TVLibrary.Interfaces.Interfaces;
+
+namespace Mediaportal.TV.TvPlugin.EventHandlers
+{
+ /// <summary>
+ /// Handler class for gui interactions of ci menu
+ /// </summary>
+ public class CiMenuEventEventHandler : CiMenuEventCallbackSink
+ {
+ /// <summary>
+ /// eventhandler to show CI Menu dialog
+ /// </summary>
+ /// <param name="menu"></param>
+ public override void CiMenuCallback(CiMenu menu)
+ {
+ try
+ {
+ Log.Debug("Callback from tvserver {0}", menu.Title);
+
+ // pass menu to calling dialog
+ TvPlugin.TVHome.ProcessCiMenu(menu);
+ }
+ catch
+ {
+ menu = new CiMenu("Remoting Exception", "Communication with server failed", null,
+ CiMenuState.Error);
+ // pass menu to calling dialog
+ TvPlugin.TVHome.ProcessCiMenu(menu);
+ }
+ }
+ }
+}
\ No newline at end of file
Added: branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/EventHandlers/HeartbeatEventHandler.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/EventHandlers/HeartbeatEventHandler.cs (rev 0)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/EventHandlers/HeartbeatEventHandler.cs 2011-12-17 15:11:32 UTC (rev 28345)
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Mediaportal.TV.Server.TVControl.Interfaces.Events;
+using Mediaportal.TV.Server.TVService.ServiceAgents;
+
+namespace Mediaportal.TV.TvPlugin.EventHandlers
+{
+ public class HeartbeatEventHandler : IHeartbeatEventCallback
+ {
+ #region Implementation of IHeartbeatEventCallback
+
+ public void HeartbeatRequestReceived()
+ {
+ //ignore
+ }
+
+ #endregion
+ }
+}
Added: branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/ServerMonitor.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/ServerMonitor.cs (rev 0)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/ServerMonitor.cs 2011-12-17 15:11:32 UTC (rev 28345)
@@ -0,0 +1,101 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.ServiceModel.Description;
+using System.Text;
+using System.Threading;
+using Mediaportal.TV.Server.TVLibrary.Interfaces.Logging;
+using Mediaportal.TV.Server.TVService.ServiceAgents;
+
+namespace Mediaportal.TV.TvPlugin
+{
+ public class ServerMonitor
+ {
+ #region events & delegates
+
+ public delegate void ServerDisconnectedDelegate();
+ public delegate void ServerConnectedDelegate();
+
+ public event ServerDisconnectedDelegate OnServerDisconnected;
+ public event ServerConnectedDelegate OnServerConnected;
+
+ #endregion
+
+ private Thread _serverMonitorThread;
+ private readonly static ManualResetEvent _evtHeartbeatCtrl = new ManualResetEvent(false);
+ private const int SERVER_ALIVE_INTERVAL_SEC = 5;
+ private bool _isConnected;
+
+ public void Start()
+ {
+ //System.Diagnostics.Debugger.Launch();
+ StartServerMonitorThread();
+ }
+
+ public void Stop()
+ {
+ StopServerMonitorThread();
+ }
+
+ private void StartServerMonitorThread()
+ {
+ if (_serverMonitorThread == null || !_serverMonitorThread.IsAlive)
+ {
+ _evtHeartbeatCtrl.Reset();
+ Log.Debug("ServerMonitor: ServerMonitor thread started.");
+ _serverMonitorThread = new Thread(ServerMonitorThread) {IsBackground = true, Name = "ServerMonitor thread"};
+ _serverMonitorThread.Start();
+ }
+ }
+
+ private void StopServerMonitorThread()
+ {
+ if (_serverMonitorThread != null && _serverMonitorThread.IsAlive)
+ {
+ try
+ {
+ _evtHeartbeatCtrl.Set();
+ _serverMonitorThread.Join();
+ Log.Debug("ServerMonitor: ServerMonitor thread stopped.");
+ }
+ catch (Exception) { }
+ }
+ }
+
+
+ private void ServerMonitorThread()
+ {
+ while (!_evtHeartbeatCtrl.WaitOne(SERVER_ALIVE_INTERVAL_SEC*1000))
+ {
+
+ bool isconnected = false;
+ try
+ {
+ ServiceAgents.Instance.DiscoverServiceAgent.Ping();
+ isconnected = true;
+ }
+ catch
+ {
+ }
+ finally
+ {
+ if (!_isConnected && isconnected)
+ {
+ if (OnServerConnected != null)
+ {
+ OnServerConnected();
+ }
+ }
+ else if (_isConnected && !isconnected)
+ {
+ if (OnServerDisconnected != null)
+ {
+ OnServerDisconnected();
+ }
+ }
+ _isConnected = isconnected;
+ }
+ }
+ }
+ }
+}
|
Author: gibman_dk Date: 2011-12-17 14:53:06 +0100 (Sat, 17 Dec 2011) New Revision: 28344 Added: branches/TVEngine3-Experimental/Mediaportal/TV/Server/ServiceAgents/DiscoverServiceAgent.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/ServiceAgents/EventServiceAgent.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/Sections/CIMenu/CiMenuEventHandler.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/Sections/CIMenu/_CiMenuEventHandler.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/Events/ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/Events/ServerEventEnum.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/Events/TvServerEventArgs.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/Events/TvServerEventArgsTranslator.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/Interfaces/Events/ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/Interfaces/Events/IHeartbeatEventCallback.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/Interfaces/Events/IServerEventCallback.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/Interfaces/Events/ITvServerEvent.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/Interfaces/Events/ITvServerEventCallback.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/Interfaces/Services/ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/Interfaces/Services/ICanceledScheduleService.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/Interfaces/Services/ICardService.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/Interfaces/Services/IChannelGroupService.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/Interfaces/Services/IChannelService.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/Interfaces/Services/IConflictService.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/Interfaces/Services/IControllerService.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/Interfaces/Services/IDiscoverService.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/Interfaces/Services/IEventService.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/Interfaces/Services/IInternalControllerService.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/Interfaces/Services/IProgramCategoriesService.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/Interfaces/Services/IProgramService.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/Interfaces/Services/IRecordingService.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/Interfaces/Services/IScheduleService.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/Interfaces/Services/ISettingService.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvLibrary.Interfaces/CiMenu/ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvLibrary.Interfaces/CiMenu/CiMenu.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvLibrary.Interfaces/CiMenu/CiMenuEntry.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvLibrary.Interfaces/CiMenu/CiMenuEventCallbackSink.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvLibrary.Interfaces/Interfaces/ICiMenuEventCallback.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/EventDispatchers/ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/EventDispatchers/CiMenuManager.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/EventDispatchers/EventDispatcher.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/EventDispatchers/HeartbeatManager.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/EventDispatchers/HeartbeatUser.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/EventDispatchers/TvServerEventDispatcher.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Services/DiscoverService.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Services/EventService.cs Removed: branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PluginBase/Events/ branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/Sections/CIMenu/CiMenuHandler.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/Interfaces/ICanceledScheduleService.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/Interfaces/ICardService.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/Interfaces/IChannelGroupService.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/Interfaces/IChannelService.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/Interfaces/IConflictService.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/Interfaces/IControllerService.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/Interfaces/IInternalControllerService.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/Interfaces/IProgramCategoriesService.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/Interfaces/IProgramService.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/Interfaces/IRecordingService.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/Interfaces/IScheduleService.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/Interfaces/ISettingService.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/Interfaces/IUser.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/Interfaces/IUserService.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvLibrary.Interfaces/Interfaces/TvPluginCallback.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/TCPEventServer/ branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/TCPEventClient/ Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ComSkipLauncher/ComSkipLauncher.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ConflictsManager/CMSetup.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ConflictsManager/ConflictsManager.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PersonalTVGuide/PTVGSetup.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PersonalTVGuide/PersonalTVGuide.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PluginBase/PluginBase.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PluginBase/PluginBase.csproj branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PowerScheduler/Handlers/ActiveStreamsHandler.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PowerScheduler/Handlers/ControllerActiveHandler.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PowerScheduler/Handlers/EpgGrabbingHandler.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PowerScheduler/PowerScheduler.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PowerScheduler/PowerSchedulerFactory.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PowerScheduler/PowerSchedulerMasterSetup.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PowerScheduler/PowerSchedulerPlugin.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ServerBlaster/ServerBlaster/BlasterSetup.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ServerBlaster/ServerBlaster/ServerBlaster.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/TvMovie/TvMovie.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/TvMovie/TvMovieSetup.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/WebEPG/WebEPGPlugin/Config/WebEPGConfigControl.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/WebEPG/WebEPGPlugin/Config/WebEPGMappingControl.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/WebEPG/WebEPGPlugin/WebEPGImport.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/XmlTvImport/XmlTvImporter.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/XmlTvImport/XmlTvSetup.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/ServiceAgents/MappingHelper.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/ServiceAgents/ServiceAgents.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/ServiceAgents/ServiceAgents.csproj branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/Dialogs/FormEditChannel.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/Dialogs/FormEditIpAdress.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/Dialogs/FormEditSchedule.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/Dialogs/FormPreview.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/Dialogs/FormSelectListChannel.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/Dialogs/GroupNameForm.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/Dialogs/GroupSelectionForm.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/Sections/CIMenu/CI_Menu_Dialog.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/Sections/CardAnalog.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/Sections/CardAtsc.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/Sections/CardDvbC.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/Sections/CardDvbIP.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/Sections/CardDvbS.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/Sections/CardDvbT.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/Sections/ChannelsInGroupControl.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/Sections/ChannelsInRadioGroupControl.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/Sections/Combinations.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/Sections/Epg.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/Sections/Plugins.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/Sections/RadioChannelMapping.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/Sections/RadioChannels.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/Sections/RadioCombinations.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/Sections/RadioEpgGrabber.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/Sections/ScanSettings.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/Sections/Servers.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/Sections/StreamingServer.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/Sections/TVChannels.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/Sections/TestChannels.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/Sections/TestService.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/Sections/ThirdPartyChecks.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/Sections/TvCards.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/Sections/TvChannelMapping.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/Sections/TvEpgGrabber.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/Sections/TvRecording.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/Sections/TvSchedules.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/Sections/TvTimeshifting.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/Sections/UserPriorities.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/ServiceHelper.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/SettingsForm.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/SetupTv.csproj branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/Startup.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TVDatabase/TvBusinessLayer/Entities/ChannelBLL.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TVDatabase/TvBusinessLayer/TvBusinessLayer.csproj branches/TVEngine3-Experimental/Mediaportal/TV/Server/TVDatabase/TvBusinessLayer/WeekEndTool.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/RemoteControl.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/ServiceHelper.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/TvControl.csproj branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/User.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/VirtualCard.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvLibrary.Interfaces/TvLibrary.Interfaces.csproj branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardHandler/ITvCardHandler.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardHandler/IUserManagement.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardReservation/ICardTuneReservationTicket.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/CardManagement/CardAllocation/AdvancedCardAllocation.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/CardManagement/CardAllocation/CardAllocationBase.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/CardManagement/CardAllocation/ChannelStates.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/CardManagement/CardHandler/CardTuner.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/CardManagement/CardHandler/Recorder.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/CardManagement/CardHandler/TimeShifter.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/CardManagement/CardHandler/TvCardHandler.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/CardManagement/CardHandler/UserManagement.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/CardManagement/CardReservation/Implementations/CardReservationBase.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/CardManagement/CardReservation/Ticket/CardTuneReservationTicket.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Epg/EpgCard.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Interfaces/ITvCardContext.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Scheduler/Scheduler.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Services/CanceledScheduleService.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Services/CardService.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Services/ChannelGroupService.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Services/ChannelService.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Services/ConflictService.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Services/ProgramCategoryService.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Services/ProgramService.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Services/RecordingService.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Services/ScheduleService.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Services/ServiceManager.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Services/SettingsService.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Services/TvControllerService.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/TVController.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/TvCardContext.cs branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/TvService.csproj branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/UserFactory.cs branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/EPG/GuideBase.cs branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/EPG/RadioGuideBase.cs branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/EPG/TvGuideBase.cs branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/Helper/TVUtil.cs branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/Radio/Radio.cs branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/Radio/RadioRecorded.cs branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/Radio/RadioSearch.cs branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/Radio/RadioSetupForm.cs branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/TVConflicts.cs branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/TVHome.cs branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/TVHomeNavigator.cs branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/TVPriorities.cs branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/TVProgramInfo.cs branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/TVRecordedInfo.cs branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/TVScheduler.cs branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/TVSearch.cs branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/TVZapOSD.cs branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/TvChannelSettings.cs branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/TvEpgSettings.cs branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/TvFullScreen.cs branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/TvMiniGuide.cs branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/TvNewScheduleSearch.cs branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/TvNewScheduleSearchType.cs branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/TvNotifyManager.cs branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/TvOSD.cs branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/TvPlugin.csproj branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/TvRecorded.cs branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/TvRecordingSettings.cs branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/TvSetup.cs branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/TvTimeShiftPositionWatcher.cs Log: WCF duplex callbacks implemented instead of tcpserver/client. heartbeat management reworked server-is-alive client detection reworked. cimenu hopefully works, using WCF callbacks. tvplugin => better support for multiseat, still untested. Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ComSkipLauncher/ComSkipLauncher.cs =================================================================== --- branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ComSkipLauncher/ComSkipLauncher.cs 2011-12-17 12:06:34 UTC (rev 28343) +++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ComSkipLauncher/ComSkipLauncher.cs 2011-12-17 13:53:06 UTC (rev 28344) @@ -22,9 +22,11 @@ using System.Diagnostics; using System.IO; using Mediaportal.TV.Server.Plugins.Base; -using Mediaportal.TV.Server.Plugins.Base.Events; using Mediaportal.TV.Server.SetupControls; +using Mediaportal.TV.Server.TVControl.Events; using Mediaportal.TV.Server.TVControl.Interfaces; +using Mediaportal.TV.Server.TVControl.Interfaces.Events; +using Mediaportal.TV.Server.TVControl.Interfaces.Services; using Mediaportal.TV.Server.TVDatabase.Entities; using Mediaportal.TV.Server.TVLibrary.Interfaces.Logging; using MediaPortal.Common.Utils; @@ -144,12 +146,12 @@ TvServerEventArgs tvEvent = (TvServerEventArgs)eventArgs; - var recording = ServiceAgents.RecordingServiceAgent.GetRecording(tvEvent.Recording); + var recording = ServiceAgents.Instance.RecordingServiceAgent.GetRecording(tvEvent.Recording); if (tvEvent.EventType == TvServerEventType.RecordingStarted && _runAtStart) { if (recording.idChannel.HasValue) { - Channel channel = ServiceAgents.ChannelServiceAgent.GetChannel(recording.idChannel.GetValueOrDefault()); + Channel channel = ServiceAgents.Instance.ChannelServiceAgent.GetChannel(recording.idChannel.GetValueOrDefault()); string parameters = ProcessParameters(_parameters, recording.fileName, channel.displayName); @@ -163,7 +165,7 @@ { if (recording.idChannel.HasValue) { - Channel channel = ServiceAgents.ChannelServiceAgent.GetChannel(recording.idChannel.GetValueOrDefault()); + Channel channel = ServiceAgents.Instance.ChannelServiceAgent.GetChannel(recording.idChannel.GetValueOrDefault()); string parameters = ProcessParameters(_parameters, recording.fileName, channel.displayName); Log.Info("ComSkipLauncher: Recording ended ({0} on {1}), launching program ({2} {3}) ...", @@ -185,9 +187,9 @@ { _runAtStart = - Convert.ToBoolean(ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("ComSkipLauncher_RunAtStart", DefaultRunAtStrart.ToString()).value); - _program = ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("ComSkipLauncher_Program", DefaultProgram).value; - _parameters = ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("ComSkipLauncher_Parameters", DefaultParameters).value; + Convert.ToBoolean(ServiceAgents.Instance.SettingServiceAgent.GetSettingWithDefaultValue("ComSkipLauncher_RunAtStart", DefaultRunAtStrart.ToString()).value); + _program = ServiceAgents.Instance.SettingServiceAgent.GetSettingWithDefaultValue("ComSkipLauncher_Program", DefaultProgram).value; + _parameters = ServiceAgents.Instance.SettingServiceAgent.GetSettingWithDefaultValue("ComSkipLauncher_Parameters", DefaultParameters).value; } catch (Exception ex) { @@ -203,9 +205,9 @@ { try { - ServiceAgents.SettingServiceAgent.SaveSetting("ComSkipLauncher_RunAtStart", _runAtStart.ToString()); - ServiceAgents.SettingServiceAgent.SaveSetting("ComSkipLauncher_Program", _program); - ServiceAgents.SettingServiceAgent.SaveSetting("ComSkipLauncher_Parameters", _parameters); + ServiceAgents.Instance.SettingServiceAgent.SaveSetting("ComSkipLauncher_RunAtStart", _runAtStart.ToString()); + ServiceAgents.Instance.SettingServiceAgent.SaveSetting("ComSkipLauncher_Program", _program); + ServiceAgents.Instance.SettingServiceAgent.SaveSetting("ComSkipLauncher_Parameters", _parameters); } catch (Exception ex) { Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ConflictsManager/CMSetup.cs =================================================================== --- branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ConflictsManager/CMSetup.cs 2011-12-17 12:06:34 UTC (rev 28343) +++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ConflictsManager/CMSetup.cs 2011-12-17 13:53:06 UTC (rev 28344) @@ -46,13 +46,13 @@ public override void OnSectionActivated() { - analyzeMode.SelectedIndex = Convert.ToInt32(ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("CMAnalyzeMode", "0").value); - debug.Checked = ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("CMDebugMode", "false").value == "true"; + analyzeMode.SelectedIndex = Convert.ToInt32(ServiceAgents.Instance.SettingServiceAgent.GetSettingWithDefaultValue("CMAnalyzeMode", "0").value); + debug.Checked = ServiceAgents.Instance.SettingServiceAgent.GetSettingWithDefaultValue("CMDebugMode", "false").value == "true"; } public override void OnSectionDeActivated() { - ServiceAgents.SettingServiceAgent.SaveSetting("CMDebugMode", debug.Checked ? "true" : "false"); + ServiceAgents.Instance.SettingServiceAgent.SaveSetting("CMDebugMode", debug.Checked ? "true" : "false"); base.OnSectionDeActivated(); } Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ConflictsManager/ConflictsManager.cs =================================================================== --- branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ConflictsManager/ConflictsManager.cs 2011-12-17 12:06:34 UTC (rev 28343) +++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ConflictsManager/ConflictsManager.cs 2011-12-17 13:53:06 UTC (rev 28344) @@ -22,10 +22,12 @@ using System.Collections.Generic; using System.Linq; using Mediaportal.TV.Server.Plugins.Base; -using Mediaportal.TV.Server.Plugins.Base.Events; using Mediaportal.TV.Server.SetupControls; using Mediaportal.TV.Server.TVControl; +using Mediaportal.TV.Server.TVControl.Events; using Mediaportal.TV.Server.TVControl.Interfaces; +using Mediaportal.TV.Server.TVControl.Interfaces.Events; +using Mediaportal.TV.Server.TVControl.Interfaces.Services; using Mediaportal.TV.Server.TVDatabase.Entities; using Mediaportal.TV.Server.TVDatabase.Entities.Enums; using Mediaportal.TV.Server.TVDatabase.Entities.Factories; Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PersonalTVGuide/PTVGSetup.cs =================================================================== --- branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PersonalTVGuide/PTVGSetup.cs 2011-12-17 12:06:34 UTC (rev 28343) +++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PersonalTVGuide/PTVGSetup.cs 2011-12-17 13:53:06 UTC (rev 28344) @@ -48,13 +48,13 @@ public override void OnSectionActivated() { - debug.Checked = ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("PTVGDebugMode", "false").value == "true"; + debug.Checked = ServiceAgents.Instance.SettingServiceAgent.GetSettingWithDefaultValue("PTVGDebugMode", "false").value == "true"; base.OnSectionActivated(); } public override void OnSectionDeActivated() { - ServiceAgents.SettingServiceAgent.SaveSetting("PTVGDebugMode", debug.Checked ? "true" : "false"); + ServiceAgents.Instance.SettingServiceAgent.SaveSetting("PTVGDebugMode", debug.Checked ? "true" : "false"); base.OnSectionDeActivated(); } Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PersonalTVGuide/PersonalTVGuide.cs =================================================================== --- branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PersonalTVGuide/PersonalTVGuide.cs 2011-12-17 12:06:34 UTC (rev 28343) +++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PersonalTVGuide/PersonalTVGuide.cs 2011-12-17 13:53:06 UTC (rev 28344) @@ -23,9 +23,11 @@ using System.Threading; using MediaPortal.Common.Utils; using Mediaportal.TV.Server.Plugins.Base; -using Mediaportal.TV.Server.Plugins.Base.Events; using Mediaportal.TV.Server.Plugins.PowerScheduler.Interfaces.Interfaces; using Mediaportal.TV.Server.SetupControls; +using Mediaportal.TV.Server.TVControl.Events; +using Mediaportal.TV.Server.TVControl.Interfaces.Events; +using Mediaportal.TV.Server.TVControl.Interfaces.Services; using Mediaportal.TV.Server.TVDatabase.Entities; using Mediaportal.TV.Server.TVDatabase.Entities.Enums; using Mediaportal.TV.Server.TVDatabase.TVBusinessLayer; Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PluginBase/PluginBase.cs =================================================================== --- branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PluginBase/PluginBase.cs 2011-12-17 12:06:34 UTC (rev 28343) +++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PluginBase/PluginBase.cs 2011-12-17 13:53:06 UTC (rev 28344) @@ -22,6 +22,7 @@ using Mediaportal.TV.Server.SetupControls; using Mediaportal.TV.Server.TVControl; using Mediaportal.TV.Server.TVControl.Interfaces; +using Mediaportal.TV.Server.TVControl.Interfaces.Services; using Mediaportal.TV.Server.TVService.Interfaces.Services; namespace Mediaportal.TV.Server.Plugins.Base Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PluginBase/PluginBase.csproj =================================================================== --- branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PluginBase/PluginBase.csproj 2011-12-17 12:06:34 UTC (rev 28343) +++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PluginBase/PluginBase.csproj 2011-12-17 13:53:06 UTC (rev 28344) @@ -76,6 +76,7 @@ <RequiredTargetFramework>3.5</RequiredTargetFramework> </Reference> <Reference Include="System.Data" /> + <Reference Include="System.ServiceModel" /> <Reference Include="System.Windows.Forms" /> <Reference Include="System.Xml" /> </ItemGroup> @@ -83,10 +84,7 @@ <Compile Include="..\..\..\..\..\..\Common-MP-TVE3\SolutionInfo.cs"> <Link>SolutionInfo.cs</Link> </Compile> - <Compile Include="Events\TvServerEventArgsTranslator.cs" /> <Compile Include="Interfaces\IPowerEventHandler.cs" /> - <Compile Include="Events\ITvServerEvent.cs" /> - <Compile Include="Events\TvServerEventArgs.cs" /> <Compile Include="PluginBase.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> </ItemGroup> Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PowerScheduler/Handlers/ActiveStreamsHandler.cs =================================================================== --- branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PowerScheduler/Handlers/ActiveStreamsHandler.cs 2011-12-17 12:06:34 UTC (rev 28343) +++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PowerScheduler/Handlers/ActiveStreamsHandler.cs 2011-12-17 13:53:06 UTC (rev 28344) @@ -23,6 +23,7 @@ using Mediaportal.TV.Server.Plugins.PowerScheduler.Interfaces.Interfaces; using Mediaportal.TV.Server.TVControl; using Mediaportal.TV.Server.TVControl.Interfaces; +using Mediaportal.TV.Server.TVControl.Interfaces.Services; using Mediaportal.TV.Server.TVService.Interfaces.Services; #endregion Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PowerScheduler/Handlers/ControllerActiveHandler.cs =================================================================== --- branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PowerScheduler/Handlers/ControllerActiveHandler.cs 2011-12-17 12:06:34 UTC (rev 28343) +++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PowerScheduler/Handlers/ControllerActiveHandler.cs 2011-12-17 13:53:06 UTC (rev 28344) @@ -22,8 +22,8 @@ using Mediaportal.TV.Server.Plugins.PowerScheduler.Interfaces.Interfaces; using Mediaportal.TV.Server.TVControl.Interfaces; +using Mediaportal.TV.Server.TVControl.Interfaces.Services; - #endregion namespace Mediaportal.TV.Server.Plugins.PowerScheduler.Handlers Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PowerScheduler/Handlers/EpgGrabbingHandler.cs =================================================================== --- branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PowerScheduler/Handlers/EpgGrabbingHandler.cs 2011-12-17 12:06:34 UTC (rev 28343) +++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PowerScheduler/Handlers/EpgGrabbingHandler.cs 2011-12-17 13:53:06 UTC (rev 28344) @@ -27,6 +27,7 @@ using Mediaportal.TV.Server.Plugins.PowerScheduler.Interfaces.Interfaces; using Mediaportal.TV.Server.TVControl; using Mediaportal.TV.Server.TVControl.Interfaces; +using Mediaportal.TV.Server.TVControl.Interfaces.Services; using Mediaportal.TV.Server.TVDatabase.Entities; using Mediaportal.TV.Server.TVDatabase.TVBusinessLayer; using Mediaportal.TV.Server.TVLibrary.Interfaces.Logging; Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PowerScheduler/PowerScheduler.cs =================================================================== --- branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PowerScheduler/PowerScheduler.cs 2011-12-17 12:06:34 UTC (rev 28343) +++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PowerScheduler/PowerScheduler.cs 2011-12-17 13:53:06 UTC (rev 28344) @@ -30,6 +30,7 @@ using Mediaportal.TV.Server.Plugins.PowerScheduler.Interfaces; using Mediaportal.TV.Server.Plugins.PowerScheduler.Interfaces.Interfaces; using Mediaportal.TV.Server.TVControl.Interfaces; +using Mediaportal.TV.Server.TVControl.Interfaces.Services; using Mediaportal.TV.Server.TVDatabase.TVBusinessLayer; using Mediaportal.TV.Server.TVLibrary.Interfaces.Logging; using MediaPortal.Common.Utils; Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PowerScheduler/PowerSchedulerFactory.cs =================================================================== --- branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PowerScheduler/PowerSchedulerFactory.cs 2011-12-17 12:06:34 UTC (rev 28343) +++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PowerScheduler/PowerSchedulerFactory.cs 2011-12-17 13:53:06 UTC (rev 28344) @@ -25,6 +25,7 @@ using Mediaportal.TV.Server.Plugins.PowerScheduler.Interfaces.Interfaces; using Mediaportal.TV.Server.TVControl; using Mediaportal.TV.Server.TVControl.Interfaces; +using Mediaportal.TV.Server.TVControl.Interfaces.Services; using Mediaportal.TV.Server.TVLibrary.Interfaces.Logging; using MediaPortal.Common.Utils; using Mediaportal.TV.Server.TVService.Interfaces.Services; Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PowerScheduler/PowerSchedulerMasterSetup.cs =================================================================== --- branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PowerScheduler/PowerSchedulerMasterSetup.cs 2011-12-17 12:06:34 UTC (rev 28343) +++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PowerScheduler/PowerSchedulerMasterSetup.cs 2011-12-17 13:53:06 UTC (rev 28344) @@ -44,53 +44,53 @@ public override void LoadSettings() { - Setting setting = ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("PowerSchedulerShutdownActive", "false"); + Setting setting = ServiceAgents.Instance.SettingServiceAgent.GetSettingWithDefaultValue("PowerSchedulerShutdownActive", "false"); checkBox1.Checked = Convert.ToBoolean(setting.value); - setting = ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("PowerSchedulerIdleTimeout", "5"); + setting = ServiceAgents.Instance.SettingServiceAgent.GetSettingWithDefaultValue("PowerSchedulerIdleTimeout", "5"); numericUpDown1.Value = Convert.ToDecimal(setting.value); - setting = ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("PowerSchedulerStandbyAllowedStart", "0"); + setting = ServiceAgents.Instance.SettingServiceAgent.GetSettingWithDefaultValue("PowerSchedulerStandbyAllowedStart", "0"); numUpDownStandbyAllowedStartHour.Value = Convert.ToDecimal(setting.value); - setting = ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("PowerSchedulerStandbyAllowedEnd", "24"); + setting = ServiceAgents.Instance.SettingServiceAgent.GetSettingWithDefaultValue("PowerSchedulerStandbyAllowedEnd", "24"); numUpDownStandbyAllowedEndHour.Value = Convert.ToDecimal(setting.value); - setting = ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("PowerSchedulerWakeupActive", "false"); + setting = ServiceAgents.Instance.SettingServiceAgent.GetSettingWithDefaultValue("PowerSchedulerWakeupActive", "false"); checkBox2.Checked = Convert.ToBoolean(setting.value); - setting = ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("PowerSchedulerShutdownMode", "2"); + setting = ServiceAgents.Instance.SettingServiceAgent.GetSettingWithDefaultValue("PowerSchedulerShutdownMode", "2"); comboBox1.SelectedIndex = Convert.ToInt32(setting.value); - setting = ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("PowerSchedulerForceShutdown", "false"); + setting = ServiceAgents.Instance.SettingServiceAgent.GetSettingWithDefaultValue("PowerSchedulerForceShutdown", "false"); checkBox3.Checked = Convert.ToBoolean(setting.value); - setting = ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("PowerSchedulerExtensiveLogging", "false"); + setting = ServiceAgents.Instance.SettingServiceAgent.GetSettingWithDefaultValue("PowerSchedulerExtensiveLogging", "false"); checkBox4.Checked = Convert.ToBoolean(setting.value); - setting = ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("PowerSchedulerPreWakeupTime", "60"); + setting = ServiceAgents.Instance.SettingServiceAgent.GetSettingWithDefaultValue("PowerSchedulerPreWakeupTime", "60"); numericUpDown2.Value = Convert.ToDecimal(setting.value); - setting = ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("PowerSchedulerPreNoShutdownTime", "300"); + setting = ServiceAgents.Instance.SettingServiceAgent.GetSettingWithDefaultValue("PowerSchedulerPreNoShutdownTime", "300"); numericUpDown4.Value = Convert.ToDecimal(setting.value); - setting = ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("PowerSchedulerCheckInterval", "60"); + setting = ServiceAgents.Instance.SettingServiceAgent.GetSettingWithDefaultValue("PowerSchedulerCheckInterval", "60"); numericUpDown3.Value = Convert.ToDecimal(setting.value); - setting = ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("PowerSchedulerReinitializeController", "false"); + setting = ServiceAgents.Instance.SettingServiceAgent.GetSettingWithDefaultValue("PowerSchedulerReinitializeController", "false"); checkBox5.Checked = Convert.ToBoolean(setting.value); - setting = ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("PowerSchedulerCommand", string.Empty); + setting = ServiceAgents.Instance.SettingServiceAgent.GetSettingWithDefaultValue("PowerSchedulerCommand", string.Empty); textBox2.Text = setting.value; - setting = ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("PreventStandbyWhenGrabbingEPG", "false"); + setting = ServiceAgents.Instance.SettingServiceAgent.GetSettingWithDefaultValue("PreventStandbyWhenGrabbingEPG", "false"); checkBox6.Checked = Convert.ToBoolean(setting.value); - setting = ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("WakeupSystemForEPGGrabbing", "false"); + setting = ServiceAgents.Instance.SettingServiceAgent.GetSettingWithDefaultValue("WakeupSystemForEPGGrabbing", "false"); checkBox7.Checked = Convert.ToBoolean(setting.value); - EPGWakeupConfig config = new EPGWakeupConfig(ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("EPGWakeupConfig", String.Empty).value); + EPGWakeupConfig config = new EPGWakeupConfig(ServiceAgents.Instance.SettingServiceAgent.GetSettingWithDefaultValue("EPGWakeupConfig", String.Empty).value); foreach (EPGGrabDays day in config.Days) { switch (day) @@ -129,17 +129,17 @@ mFormat = "{0}"; maskedTextBox1.Text = String.Format(hFormat, config.Hour) + ":" + String.Format(mFormat, config.Minutes); - setting = ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("PowerSchedulerEpgCommand", String.Empty); + setting = ServiceAgents.Instance.SettingServiceAgent.GetSettingWithDefaultValue("PowerSchedulerEpgCommand", String.Empty); tbEpgCmd.Text = setting.value; - setting = ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("PowerSchedulerProcesses", "SetupTv, Configuration"); + setting = ServiceAgents.Instance.SettingServiceAgent.GetSettingWithDefaultValue("PowerSchedulerProcesses", "SetupTv, Configuration"); textBox1.Text = setting.value; // Load share monitoring configuration for standby prevention - setting = ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("PreventStandybyWhenSharesInUse", "true"); + setting = ServiceAgents.Instance.SettingServiceAgent.GetSettingWithDefaultValue("PreventStandybyWhenSharesInUse", "true"); shareMonitoring.Checked = Convert.ToBoolean(setting.value); - setting = ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("PreventStandybyWhenSpecificSharesInUse", ""); + setting = ServiceAgents.Instance.SettingServiceAgent.GetSettingWithDefaultValue("PreventStandybyWhenSpecificSharesInUse", ""); inhibitStandbyShares.Rows.Clear(); string[] shares = setting.value.Split(';'); foreach (string share in shares) @@ -154,33 +154,33 @@ } } - setting = ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("NetworkMonitorEnabled", "false"); + setting = ServiceAgents.Instance.SettingServiceAgent.GetSettingWithDefaultValue("NetworkMonitorEnabled", "false"); checkBox15.Checked = Convert.ToBoolean(setting.value); - setting = ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("NetworkMonitorIdleLimit", "2"); + setting = ServiceAgents.Instance.SettingServiceAgent.GetSettingWithDefaultValue("NetworkMonitorIdleLimit", "2"); numericUpDown5.Value = Convert.ToDecimal(setting.value); } public override void SaveSettings() { - ServiceAgents.SettingServiceAgent.SaveSetting("PowerSchedulerShutdownActive", checkBox1.Checked.ToString()); - ServiceAgents.SettingServiceAgent.SaveSetting("PowerSchedulerIdleTimeout", numericUpDown1.Value.ToString()); - ServiceAgents.SettingServiceAgent.SaveSetting("PowerSchedulerStandbyAllowedStart", numUpDownStandbyAllowedStartHour.Value.ToString()); - ServiceAgents.SettingServiceAgent.SaveSetting("PowerSchedulerStandbyAllowedEnd", numUpDownStandbyAllowedEndHour.Value.ToString()); - ServiceAgents.SettingServiceAgent.SaveSetting("PowerSchedulerWakeupActive", checkBox2.Checked.ToString()); - ServiceAgents.SettingServiceAgent.SaveSetting("PowerSchedulerShutdownMode", comboBox1.SelectedIndex.ToString()); - ServiceAgents.SettingServiceAgent.SaveSetting("PowerSchedulerForceShutdown", checkBox3.Checked.ToString()); - ServiceAgents.SettingServiceAgent.SaveSetting("PowerSchedulerExtensiveLogging", checkBox4.Checked.ToString()); - ServiceAgents.SettingServiceAgent.SaveSetting("PowerSchedulerPreWakeupTime", numericUpDown2.Value.ToString()); - ServiceAgents.SettingServiceAgent.SaveSetting("PowerSchedulerPreNoShutdownTime", numericUpDown4.Value.ToString()); - ServiceAgents.SettingServiceAgent.SaveSetting("PowerSchedulerCheckInterval", numericUpDown3.Value.ToString()); - ServiceAgents.SettingServiceAgent.SaveSetting("PowerSchedulerReinitializeController", checkBox5.Checked.ToString()); - ServiceAgents.SettingServiceAgent.SaveSetting("PowerSchedulerCommand", textBox2.Text); - ServiceAgents.SettingServiceAgent.SaveSetting("PreventStandbyWhenGrabbingEPG", checkBox6.Checked.ToString()); - ServiceAgents.SettingServiceAgent.SaveSetting("WakeupSystemForEPGGrabbing", checkBox7.Checked.ToString()); + ServiceAgents.Instance.SettingServiceAgent.SaveSetting("PowerSchedulerShutdownActive", checkBox1.Checked.ToString()); + ServiceAgents.Instance.SettingServiceAgent.SaveSetting("PowerSchedulerIdleTimeout", numericUpDown1.Value.ToString()); + ServiceAgents.Instance.SettingServiceAgent.SaveSetting("PowerSchedulerStandbyAllowedStart", numUpDownStandbyAllowedStartHour.Value.ToString()); + ServiceAgents.Instance.SettingServiceAgent.SaveSetting("PowerSchedulerStandbyAllowedEnd", numUpDownStandbyAllowedEndHour.Value.ToString()); + ServiceAgents.Instance.SettingServiceAgent.SaveSetting("PowerSchedulerWakeupActive", checkBox2.Checked.ToString()); + ServiceAgents.Instance.SettingServiceAgent.SaveSetting("PowerSchedulerShutdownMode", comboBox1.SelectedIndex.ToString()); + ServiceAgents.Instance.SettingServiceAgent.SaveSetting("PowerSchedulerForceShutdown", checkBox3.Checked.ToString()); + ServiceAgents.Instance.SettingServiceAgent.SaveSetting("PowerSchedulerExtensiveLogging", checkBox4.Checked.ToString()); + ServiceAgents.Instance.SettingServiceAgent.SaveSetting("PowerSchedulerPreWakeupTime", numericUpDown2.Value.ToString()); + ServiceAgents.Instance.SettingServiceAgent.SaveSetting("PowerSchedulerPreNoShutdownTime", numericUpDown4.Value.ToString()); + ServiceAgents.Instance.SettingServiceAgent.SaveSetting("PowerSchedulerCheckInterval", numericUpDown3.Value.ToString()); + ServiceAgents.Instance.SettingServiceAgent.SaveSetting("PowerSchedulerReinitializeController", checkBox5.Checked.ToString()); + ServiceAgents.Instance.SettingServiceAgent.SaveSetting("PowerSchedulerCommand", textBox2.Text); + ServiceAgents.Instance.SettingServiceAgent.SaveSetting("PreventStandbyWhenGrabbingEPG", checkBox6.Checked.ToString()); + ServiceAgents.Instance.SettingServiceAgent.SaveSetting("WakeupSystemForEPGGrabbing", checkBox7.Checked.ToString()); - Setting setting = ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("EPGWakeupConfig", String.Empty); + Setting setting = ServiceAgents.Instance.SettingServiceAgent.GetSettingWithDefaultValue("EPGWakeupConfig", String.Empty); var cfg = new EPGWakeupConfig(setting.value); var newcfg = new EPGWakeupConfig {Hour = cfg.Hour, Minutes = cfg.Minutes, LastRun = cfg.LastRun}; // newcfg.Days = cfg.Days; @@ -197,23 +197,23 @@ if (!cfg.Equals(newcfg)) { - ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("EPGWakeupConfig", newcfg.SerializeAsString()); + ServiceAgents.Instance.SettingServiceAgent.GetSettingWithDefaultValue("EPGWakeupConfig", newcfg.SerializeAsString()); } - ServiceAgents.SettingServiceAgent.SaveSetting("PowerSchedulerEpgCommand", tbEpgCmd.Text); - ServiceAgents.SettingServiceAgent.SaveSetting("PowerSchedulerProcesses", textBox1.Text); + ServiceAgents.Instance.SettingServiceAgent.SaveSetting("PowerSchedulerEpgCommand", tbEpgCmd.Text); + ServiceAgents.Instance.SettingServiceAgent.SaveSetting("PowerSchedulerProcesses", textBox1.Text); // Persist share monitoring configuration for standby prevention - ServiceAgents.SettingServiceAgent.SaveSetting("PreventStandybyWhenSharesInUse", shareMonitoring.Checked.ToString()); + ServiceAgents.Instance.SettingServiceAgent.SaveSetting("PreventStandybyWhenSharesInUse", shareMonitoring.Checked.ToString()); var shares = new StringBuilder(); foreach (DataGridViewRow row in inhibitStandbyShares.Rows) { shares.AppendFormat("{0},{1},{2};", row.Cells[0].Value, row.Cells[1].Value, row.Cells[2].Value); } - ServiceAgents.SettingServiceAgent.SaveSetting("PreventStandybyWhenSpecificSharesInUse", shares.ToString()); - ServiceAgents.SettingServiceAgent.SaveSetting("NetworkMonitorEnabled", checkBox15.Checked.ToString()); - ServiceAgents.SettingServiceAgent.SaveSetting("NetworkMonitorIdleLimit", numericUpDown5.Value.ToString()); + ServiceAgents.Instance.SettingServiceAgent.SaveSetting("PreventStandybyWhenSpecificSharesInUse", shares.ToString()); + ServiceAgents.Instance.SettingServiceAgent.SaveSetting("NetworkMonitorEnabled", checkBox15.Checked.ToString()); + ServiceAgents.Instance.SettingServiceAgent.SaveSetting("NetworkMonitorIdleLimit", numericUpDown5.Value.ToString()); } private void CheckDay(EPGWakeupConfig cfg, EPGGrabDays day, bool enabled) Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PowerScheduler/PowerSchedulerPlugin.cs =================================================================== --- branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PowerScheduler/PowerSchedulerPlugin.cs 2011-12-17 12:06:34 UTC (rev 28343) +++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PowerScheduler/PowerSchedulerPlugin.cs 2011-12-17 13:53:06 UTC (rev 28344) @@ -26,6 +26,7 @@ using Mediaportal.TV.Server.SetupControls; using Mediaportal.TV.Server.TVControl; using Mediaportal.TV.Server.TVControl.Interfaces; +using Mediaportal.TV.Server.TVControl.Interfaces.Services; using Mediaportal.TV.Server.TVService.Interfaces.Services; #endregion Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ServerBlaster/ServerBlaster/BlasterSetup.cs =================================================================== --- branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ServerBlaster/ServerBlaster/BlasterSetup.cs 2011-12-17 12:06:34 UTC (rev 28343) +++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ServerBlaster/ServerBlaster/BlasterSetup.cs 2011-12-17 13:53:06 UTC (rev 28344) @@ -37,12 +37,12 @@ public override void OnSectionDeActivated() { - ServiceAgents.SettingServiceAgent.SaveSetting("SrvBlasterType", comboBoxType.SelectedIndex.ToString()); - ServiceAgents.SettingServiceAgent.SaveSetting("SrvBlasterSpeed", comboBoxSpeed.SelectedIndex.ToString()); - ServiceAgents.SettingServiceAgent.SaveSetting("SrvBlaster1Card", comboBoxBlaster1.SelectedIndex.ToString()); - ServiceAgents.SettingServiceAgent.SaveSetting("SrvBlaster2Card", comboBoxBlaster2.SelectedIndex.ToString()); - ServiceAgents.SettingServiceAgent.SaveSetting("SrvBlasterLog", Convert.ToString(checkBoxExtLog.Checked)); - ServiceAgents.SettingServiceAgent.SaveSetting("SrvBlasterSendSelect", Convert.ToString(checkSendSelect.Checked)); + ServiceAgents.Instance.SettingServiceAgent.SaveSetting("SrvBlasterType", comboBoxType.SelectedIndex.ToString()); + ServiceAgents.Instance.SettingServiceAgent.SaveSetting("SrvBlasterSpeed", comboBoxSpeed.SelectedIndex.ToString()); + ServiceAgents.Instance.SettingServiceAgent.SaveSetting("SrvBlaster1Card", comboBoxBlaster1.SelectedIndex.ToString()); + ServiceAgents.Instance.SettingServiceAgent.SaveSetting("SrvBlaster2Card", comboBoxBlaster2.SelectedIndex.ToString()); + ServiceAgents.Instance.SettingServiceAgent.SaveSetting("SrvBlasterLog", Convert.ToString(checkBoxExtLog.Checked)); + ServiceAgents.Instance.SettingServiceAgent.SaveSetting("SrvBlasterSendSelect", Convert.ToString(checkSendSelect.Checked)); base.OnSectionDeActivated(); } @@ -50,14 +50,14 @@ public override void OnSectionActivated() { - comboBoxType.SelectedIndex = Convert.ToInt16(ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("SrvBlasterType", "0").value); - comboBoxSpeed.SelectedIndex = Convert.ToInt16(ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("SrvBlasterSpeed", "0").value); + comboBoxType.SelectedIndex = Convert.ToInt16(ServiceAgents.Instance.SettingServiceAgent.GetSettingWithDefaultValue("SrvBlasterType", "0").value); + comboBoxSpeed.SelectedIndex = Convert.ToInt16(ServiceAgents.Instance.SettingServiceAgent.GetSettingWithDefaultValue("SrvBlasterSpeed", "0").value); comboBoxBlaster1.Items.Clear(); comboBoxBlaster2.Items.Clear(); comboBoxBlaster1.Items.Add("None"); comboBoxBlaster2.Items.Add("None"); - IList<Card> cards = ServiceAgents.CardServiceAgent.ListAllCards(); + IList<Card> cards = ServiceAgents.Instance.CardServiceAgent.ListAllCards(); foreach (Card card in cards) { @@ -65,12 +65,12 @@ comboBoxBlaster2.Items.Add(card.name); } Log.WriteFile("CB1Size {0}, CB2Size {1}, BT1 {2}, BT2 {3}", comboBoxBlaster1.Items.Count, - comboBoxBlaster1.Items.Count, Convert.ToInt16(ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("SrvBlaster1Card", "0").value), - Convert.ToInt16(ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("SrvBlaster2Card", "0").value)); - comboBoxBlaster1.SelectedIndex = Convert.ToInt16(ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("SrvBlaster1Card", "0").value); - comboBoxBlaster2.SelectedIndex = Convert.ToInt16(ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("SrvBlaster2Card", "0").value); - checkBoxExtLog.Checked = (ServiceAgents.SettingServiceAgent.GetSetting("SrvBlasterLog").value == "True"); - checkSendSelect.Checked = (ServiceAgents.SettingServiceAgent.GetSetting("SrvBlasterSendSelect").value == "True"); + comboBoxBlaster1.Items.Count, Convert.ToInt16(ServiceAgents.Instance.SettingServiceAgent.GetSettingWithDefaultValue("SrvBlaster1Card", "0").value), + Convert.ToInt16(ServiceAgents.Instance.SettingServiceAgent.GetSettingWithDefaultValue("SrvBlaster2Card", "0").value)); + comboBoxBlaster1.SelectedIndex = Convert.ToInt16(ServiceAgents.Instance.SettingServiceAgent.GetSettingWithDefaultValue("SrvBlaster1Card", "0").value); + comboBoxBlaster2.SelectedIndex = Convert.ToInt16(ServiceAgents.Instance.SettingServiceAgent.GetSettingWithDefaultValue("SrvBlaster2Card", "0").value); + checkBoxExtLog.Checked = (ServiceAgents.Instance.SettingServiceAgent.GetSetting("SrvBlasterLog").value == "True"); + checkSendSelect.Checked = (ServiceAgents.Instance.SettingServiceAgent.GetSetting("SrvBlasterSendSelect").value == "True"); } private void ComboBox1SelectedIndexChanged(object sender, EventArgs e) Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ServerBlaster/ServerBlaster/ServerBlaster.cs =================================================================== --- branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ServerBlaster/ServerBlaster/ServerBlaster.cs 2011-12-17 12:06:34 UTC (rev 28343) +++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ServerBlaster/ServerBlaster/ServerBlaster.cs 2011-12-17 13:53:06 UTC (rev 28344) @@ -24,9 +24,11 @@ using System.Runtime.Serialization.Formatters.Binary; using System.Collections; using Mediaportal.TV.Server.Plugins.Base; -using Mediaportal.TV.Server.Plugins.Base.Events; using Mediaportal.TV.Server.SetupControls; +using Mediaportal.TV.Server.TVControl.Events; using Mediaportal.TV.Server.TVControl.Interfaces; +using Mediaportal.TV.Server.TVControl.Interfaces.Events; +using Mediaportal.TV.Server.TVControl.Interfaces.Services; using Mediaportal.TV.Server.TVLibrary.Interfaces; using Mediaportal.TV.Server.TVLibrary.Interfaces.Implementations.Channels; using Mediaportal.TV.Server.TVLibrary.Interfaces.Logging; @@ -187,14 +189,14 @@ try { - _sendSelect = (ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("SrvBlasterSendSelect", "False").value == "True"); + _sendSelect = (ServiceAgents.Instance.SettingServiceAgent.GetSettingWithDefaultValue("SrvBlasterSendSelect", "False").value == "True"); _sleepTime = 100; //xmlreader.GetValueAsInt("ServerBlaster", "delay", 100); _sendPort = 1; //xmlreader.GetValueAsInt("ServerBlaster", "forceport", 1); - _blaster1Card = Convert.ToInt16(ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("SrvBlaster1Card", "0").value); - _blaster2Card = Convert.ToInt16(ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("SrvBlaster2Card", "0").value); - _deviceType = Convert.ToInt16(ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("SrvBlasterType", "0").value); - _deviceSpeed = Convert.ToInt16(ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("SrvBlasterSpeed", "0").value); - _advandeLogging = (ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("SrvBlasterLog", "False").value == "True"); + _blaster1Card = Convert.ToInt16(ServiceAgents.Instance.SettingServiceAgent.GetSettingWithDefaultValue("SrvBlaster1Card", "0").value); + _blaster2Card = Convert.ToInt16(ServiceAgents.Instance.SettingServiceAgent.GetSettingWithDefaultValue("SrvBlaster2Card", "0").value); + _deviceType = Convert.ToInt16(ServiceAgents.Instance.SettingServiceAgent.GetSettingWithDefaultValue("SrvBlasterType", "0").value); + _deviceSpeed = Convert.ToInt16(ServiceAgents.Instance.SettingServiceAgent.GetSettingWithDefaultValue("SrvBlasterSpeed", "0").value); + _advandeLogging = (ServiceAgents.Instance.SettingServiceAgent.GetSettingWithDefaultValue("SrvBlasterLog", "False").value == "True"); _sendPort = Math.Max(1, Math.Min(2, _sendPort)); Log.WriteFile("ServerBlaster.LoadRemoteCodes: Default port {0}", _sendPort); Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/TvMovie/TvMovie.cs =================================================================== --- branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/TvMovie/TvMovie.cs 2011-12-17 12:06:34 UTC (rev 28343) +++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/TvMovie/TvMovie.cs 2011-12-17 13:53:06 UTC (rev 28344) @@ -28,6 +28,7 @@ using Mediaportal.TV.Server.Plugins.PowerScheduler.Interfaces.Interfaces; using Mediaportal.TV.Server.SetupControls; using Mediaportal.TV.Server.TVControl.Interfaces; +using Mediaportal.TV.Server.TVControl.Interfaces.Services; using Mediaportal.TV.Server.TVDatabase.TVBusinessLayer; using Mediaportal.TV.Server.TVLibrary.Interfaces.Logging; using MediaPortal.Common.Utils; Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/TvMovie/TvMovieSetup.cs =================================================================== --- branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/TvMovie/TvMovieSetup.cs 2011-12-17 12:06:34 UTC (rev 28343) +++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/TvMovie/TvMovieSetup.cs 2011-12-17 13:53:06 UTC (rev 28344) @@ -118,16 +118,16 @@ private void SaveDbSettings() { TvMovie.DatabasePath = tbDbPath.Text; - ServiceAgents.SettingServiceAgent.SaveSetting("TvMovieEnabled", checkBoxEnableImport.Checked ? "true" : "false"); - ServiceAgents.SettingServiceAgent.SaveSetting("TvMovieShortProgramDesc", checkBoxUseShortDesc.Checked ? "true" : "false"); - ServiceAgents.SettingServiceAgent.SaveSetting("TvMovieExtendDescription", checkBoxAdditionalInfo.Checked ? "true" : "false"); - ServiceAgents.SettingServiceAgent.SaveSetting("TvMovieShowAudioFormat", checkBoxShowAudioFormat.Checked ? "true" : "false"); - ServiceAgents.SettingServiceAgent.SaveSetting("TvMovieSlowImport", checkBoxSlowImport.Checked ? "true" : "false"); - ServiceAgents.SettingServiceAgent.SaveSetting("TvMovieShowRatings", checkBoxShowRatings.Checked ? "true" : "false"); - ServiceAgents.SettingServiceAgent.SaveSetting("TvMovieLimitActors", checkBoxLimitActors.Checked ? numericUpDownActorCount.Value.ToString() : "0"); - ServiceAgents.SettingServiceAgent.SaveSetting("TvMovieShowLive", checkBoxShowLive.Checked ? "true" : "false"); - ServiceAgents.SettingServiceAgent.SaveSetting("TvMovieShowRepeating", checkBoxShowRepeat.Checked ? "true" : "false"); - ServiceAgents.SettingServiceAgent.SaveSetting("TvMovieRestPeriod", GetRestPeriod()); + ServiceAgents.Instance.SettingServiceAgent.SaveSetting("TvMovieEnabled", checkBoxEnableImport.Checked ? "true" : "false"); + ServiceAgents.Instance.SettingServiceAgent.SaveSetting("TvMovieShortProgramDesc", checkBoxUseShortDesc.Checked ? "true" : "false"); + ServiceAgents.Instance.SettingServiceAgent.SaveSetting("TvMovieExtendDescription", checkBoxAdditionalInfo.Checked ? "true" : "false"); + ServiceAgents.Instance.SettingServiceAgent.SaveSetting("TvMovieShowAudioFormat", checkBoxShowAudioFormat.Checked ? "true" : "false"); + ServiceAgents.Instance.SettingServiceAgent.SaveSetting("TvMovieSlowImport", checkBoxSlowImport.Checked ? "true" : "false"); + ServiceAgents.Instance.SettingServiceAgent.SaveSetting("TvMovieShowRatings", checkBoxShowRatings.Checked ? "t... [truncated message content] |
|
From: <gib...@su...> - 2011-12-17 11:30:16
|
Author: gibman_dk
Date: 2011-12-17 12:30:09 +0100 (Sat, 17 Dec 2011)
New Revision: 28342
Added:
branches/Common-MP-TVE3-experimental/Common.Utils/SingletonCreator.cs
Modified:
branches/Common-MP-TVE3-experimental/Common.Utils/Common.Utils.csproj
branches/Common-MP-TVE3-experimental/Common.Utils/GlobalServiceProvider.cs
branches/Common-MP-TVE3-experimental/Common.Utils/ServiceProvider.cs
Log:
SingletonCreator added, a threadsafe singleton pattern.
GlobalServiceProvider made threadsafe.
Modified: branches/Common-MP-TVE3-experimental/Common.Utils/Common.Utils.csproj
===================================================================
--- branches/Common-MP-TVE3-experimental/Common.Utils/Common.Utils.csproj 2011-12-17 11:25:43 UTC (rev 28341)
+++ branches/Common-MP-TVE3-experimental/Common.Utils/Common.Utils.csproj 2011-12-17 11:30:09 UTC (rev 28342)
@@ -96,6 +96,7 @@
<Compile Include="GlobalServiceProvider.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ServiceProvider.cs" />
+ <Compile Include="SingletonCreator.cs" />
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
Modified: branches/Common-MP-TVE3-experimental/Common.Utils/GlobalServiceProvider.cs
===================================================================
--- branches/Common-MP-TVE3-experimental/Common.Utils/GlobalServiceProvider.cs 2011-12-17 11:25:43 UTC (rev 28341)
+++ branches/Common-MP-TVE3-experimental/Common.Utils/GlobalServiceProvider.cs 2011-12-17 11:30:09 UTC (rev 28342)
@@ -13,39 +13,8 @@
/// This global service provider instance is initialized with a number of
/// default services.
/// </remarks>
- public static class GlobalServiceProvider
- {
- #region Variables
-
- private static readonly ServiceProvider _instance;
-
- #endregion
-
- #region Constructors/Destructors
-
- static GlobalServiceProvider()
- {
- _instance = new ServiceProvider();
- //_instance.Add<ILog>(new ServiceCreatorCallback<ILog>(LogServiceRequested));
- //_instance.Add<IThreadPool>(
- // new ServiceCreatorCallback<IThreadPool>(ThreadPoolServiceRequested));
- }
-
- #endregion
-
- #region Properties
-
- /// <summary>
- /// Gets the ServiceProvider instance.
- /// </summary>
- /// <value>The instance.</value>
- public static ServiceProvider Instance
- {
- get { return _instance; }
- }
-
- #endregion
-
+ public class GlobalServiceProvider : Singleton<ServiceProvider>
+ {
#region Public Methods
/// <summary>
@@ -55,7 +24,7 @@
/// <returns>The service implementation</returns>
public static T Get<T>()
{
- return _instance.Get<T>();
+ return Instance.Get<T>();
}
/// <summary>
@@ -64,7 +33,7 @@
/// <param name="service">The new service.</param>
public static void Replace<T>(T service)
{
- _instance.Replace<T>(service);
+ Instance.Replace<T>(service);
}
/// <summary>
@@ -73,7 +42,7 @@
/// <param name="service">The service.</param>
public static void Add<T>(T service)
{
- _instance.Add<T>(service);
+ Instance.Add<T>(service);
}
/// <summary>
@@ -83,7 +52,7 @@
/// <param name="service">The service.</param>
public static void Add<T>(Type serviceInterface, T service)
{
- _instance.Add(serviceInterface, service);
+ Instance.Add(serviceInterface, service);
}
/// <summary>
@@ -94,9 +63,14 @@
/// </returns>
public static bool IsRegistered<T>()
{
- return _instance.IsRegistered<T>();
+ return Instance.IsRegistered<T>();
}
+ public static bool IsRegistered(Type serviceInterface)
+ {
+ return Instance.IsRegistered(serviceInterface);
+ }
+
#endregion
#region Private Methods
@@ -121,5 +95,15 @@
}
*/
#endregion
+
+ public static void Remove(Type serviceInterface)
+ {
+ Instance.Remove(serviceInterface);
+ }
+
+ public static void Remove<T>()
+ {
+ Instance.Remove<T>();
+ }
}
}
Modified: branches/Common-MP-TVE3-experimental/Common.Utils/ServiceProvider.cs
===================================================================
--- branches/Common-MP-TVE3-experimental/Common.Utils/ServiceProvider.cs 2011-12-17 11:25:43 UTC (rev 28341)
+++ branches/Common-MP-TVE3-experimental/Common.Utils/ServiceProvider.cs 2011-12-17 11:30:09 UTC (rev 28342)
@@ -1,4 +1,5 @@
using System;
+using System.Collections.Concurrent;
using System.Collections.Generic;
using System.ComponentModel.Design;
using System.Linq;
@@ -12,7 +13,8 @@
{
#region Variables
- private readonly Dictionary<Type, object> services;
+ private readonly IDictionary<Type, object> _services;
+ private readonly object _servicesLock = new object();
#endregion
@@ -23,8 +25,8 @@
/// </summary>
public ServiceProvider()
{
- services = new Dictionary<Type, object>();
- }
+ _services = new Dictionary<Type, object>();
+ }
#endregion
@@ -38,7 +40,10 @@
/// </returns>
public bool IsRegistered<T>()
{
- return services.ContainsKey(typeof(T));
+ lock (_servicesLock)
+ {
+ return _services.ContainsKey(typeof(T));
+ }
}
@@ -50,7 +55,10 @@
/// </returns>
public bool IsRegistered(Type t)
{
- return services.ContainsKey(t);
+ lock (_servicesLock)
+ {
+ return _services.ContainsKey(t);
+ }
}
/// <summary>
@@ -64,31 +72,38 @@
// Make sure service implements type
Type t = typeof(T);
object o = null;
- if (services.TryGetValue(t, out o))
+
+ lock (_servicesLock)
{
- if (!(o is ServiceCreatorCallback<T>))
+ if (_services.TryGetValue(t, out o))
{
- throw new ArgumentException(string.Format("A service of type {0} is already present", t.ToString()));
+ if (!(o is ServiceCreatorCallback<T>))
+ {
+ throw new ArgumentException(string.Format("A service of type {0} is already present", t.ToString()));
+ }
+ _services[t] = service;
+ return;
}
- services[t] = service;
- return;
+ _services.Add(t, service);
}
- services.Add(t, service);
}
public void Add<T>(Type serviceInterface, T service)
{
object o = null;
- if (services.TryGetValue(serviceInterface, out o))
+ lock (_servicesLock)
{
- /*if (!(o is ServiceCreatorCallback<T>))
+ if (_services.TryGetValue(serviceInterface, out o))
{
- throw new ArgumentException(string.Format("A service of type {0} is already present", t.ToString()));
- }*/
- services[serviceInterface] = service;
- return;
+ /*if (!(o is ServiceCreatorCallback<T>))
+ {
+ throw new ArgumentException(string.Format("A service of type {0} is already present", t.ToString()));
+ }*/
+ _services[serviceInterface] = service;
+ return;
+ }
+ _services.Add(serviceInterface, service);
}
- services.Add(serviceInterface, service);
}
/// <summary>
@@ -99,11 +114,14 @@
public void Add<T>(ServiceCreatorCallback<T> callback)
{
Type t = typeof(T);
- if (services.ContainsKey(t))
+ lock (_servicesLock)
{
- throw new ArgumentException(string.Format("A service of type {0} is already present", t.ToString()));
+ if (_services.ContainsKey(t))
+ {
+ throw new ArgumentException(string.Format("A service of type {0} is already present", t.ToString()));
+ }
+ _services.Add(t, callback);
}
- services.Add(t, callback);
}
/// <summary>
@@ -115,14 +133,17 @@
{
Type t = typeof(T);
object o = null;
- if (services.TryGetValue(t, out o))
+ lock (_servicesLock)
{
- ServiceCreatorCallback<T> s = o as ServiceCreatorCallback<T>;
- if (s != null)
+ if (_services.TryGetValue(t, out o))
{
- return s(this);
+ ServiceCreatorCallback<T> s = o as ServiceCreatorCallback<T>;
+ if (s != null)
+ {
+ return s(this);
+ }
+ return (T) _services[t];
}
- return (T)services[t];
}
return default(T);
}
@@ -139,9 +160,17 @@
public void Remove<T>()
{
Type t = typeof(T);
- if (services.ContainsKey(t))
+ Remove(t);
+ }
+
+ public void Remove(Type t)
+ {
+ lock (_servicesLock)
{
- services.Remove(t);
+ if (_services.ContainsKey(t))
+ {
+ _services.Remove(t);
+ }
}
}
@@ -169,9 +198,17 @@
public bool HasServices
{
- get { return services.Count() > 0; }
+ get
+ {
+ lock (_servicesLock)
+ {
+ return _services.Count() > 0;
+ }
+ }
}
#endregion
+
+
}
}
Added: branches/Common-MP-TVE3-experimental/Common.Utils/SingletonCreator.cs
===================================================================
--- branches/Common-MP-TVE3-experimental/Common.Utils/SingletonCreator.cs (rev 0)
+++ branches/Common-MP-TVE3-experimental/Common.Utils/SingletonCreator.cs 2011-12-17 11:30:09 UTC (rev 28342)
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+
+namespace MediaPortal.Common.Utils
+{
+ public class Singleton<T> where T : class
+ {
+ private static class SingletonCreator
+ {
+ static SingletonCreator() { }
+
+ internal static readonly T Instance =
+ typeof(T).InvokeMember(typeof(T).Name,
+ BindingFlags.CreateInstance |
+ BindingFlags.Instance |
+ BindingFlags.Public |
+ BindingFlags.NonPublic,
+ null, null, null) as T;
+ }
+
+ public static T Instance
+ {
+ get { return SingletonCreator.Instance; }
+ }
+ }
+
+}
|
|
From: <seb...@su...> - 2011-12-17 11:25:52
|
Author: sebastiii Date: 2011-12-17 12:25:43 +0100 (Sat, 17 Dec 2011) New Revision: 28341 Added: branches/Common-MP-TVE3-experimental/Common.Utils/ branches/Common-MP-TVE3-experimental/Common.Utils/Common.Utils.csproj branches/Common-MP-TVE3-experimental/Common.Utils/Common.Utils.sln branches/Common-MP-TVE3-experimental/Common.Utils/Compatibility/ branches/Common-MP-TVE3-experimental/Common.Utils/Compatibility/CompatibilityManager.cs branches/Common-MP-TVE3-experimental/Common.Utils/Compatibility/CompatibleVersionAttribute.cs branches/Common-MP-TVE3-experimental/Common.Utils/Compatibility/SubsystemVersionAttribute.cs branches/Common-MP-TVE3-experimental/Common.Utils/Compatibility/UsesSubsystemAttribute.cs branches/Common-MP-TVE3-experimental/Common.Utils/CompatibilityInfo.cs branches/Common-MP-TVE3-experimental/Common.Utils/ExtensionMethods/ branches/Common-MP-TVE3-experimental/Common.Utils/ExtensionMethods/ArrayExtMethods.cs branches/Common-MP-TVE3-experimental/Common.Utils/ExtensionMethods/DictionaryExtMethods.cs branches/Common-MP-TVE3-experimental/Common.Utils/ExtensionMethods/DisposeHelper.cs branches/Common-MP-TVE3-experimental/Common.Utils/ExtensionMethods/ListExtMethods.cs branches/Common-MP-TVE3-experimental/Common.Utils/ExtensionMethods/ObjectMethods.cs branches/Common-MP-TVE3-experimental/Common.Utils/GlobalServiceProvider.cs branches/Common-MP-TVE3-experimental/Common.Utils/Properties/ branches/Common-MP-TVE3-experimental/Common.Utils/Properties/AssemblyInfo.cs branches/Common-MP-TVE3-experimental/Common.Utils/ServiceProvider.cs branches/Common-MP-TVE3-experimental/DirectShowLib/ branches/Common-MP-TVE3-experimental/DirectShowLib/AXExtend.cs branches/Common-MP-TVE3-experimental/DirectShowLib/AssemblyInfo.cs branches/Common-MP-TVE3-experimental/DirectShowLib/AxCore.cs branches/Common-MP-TVE3-experimental/DirectShowLib/BDAIface.cs branches/Common-MP-TVE3-experimental/DirectShowLib/BDATypes.cs branches/Common-MP-TVE3-experimental/DirectShowLib/Bdatif.cs branches/Common-MP-TVE3-experimental/DirectShowLib/Control.cs branches/Common-MP-TVE3-experimental/DirectShowLib/DES.cs branches/Common-MP-TVE3-experimental/DirectShowLib/DMODShow.cs branches/Common-MP-TVE3-experimental/DirectShowLib/DVDIf.cs branches/Common-MP-TVE3-experimental/DirectShowLib/DevEnum.cs branches/Common-MP-TVE3-experimental/DirectShowLib/DirectShowLib.csproj branches/Common-MP-TVE3-experimental/DirectShowLib/DirectShowLib.sln branches/Common-MP-TVE3-experimental/DirectShowLib/DsUtils.cs branches/Common-MP-TVE3-experimental/DirectShowLib/DynGraph.cs branches/Common-MP-TVE3-experimental/DirectShowLib/EvCode.cs branches/Common-MP-TVE3-experimental/DirectShowLib/IL21Dec.cs branches/Common-MP-TVE3-experimental/DirectShowLib/MediaObj.cs branches/Common-MP-TVE3-experimental/DirectShowLib/MediaParam.cs branches/Common-MP-TVE3-experimental/DirectShowLib/Misc.cs branches/Common-MP-TVE3-experimental/DirectShowLib/Mixerocx.cs branches/Common-MP-TVE3-experimental/DirectShowLib/Mpeg2Data.cs branches/Common-MP-TVE3-experimental/DirectShowLib/Mpeg2Structs.cs branches/Common-MP-TVE3-experimental/DirectShowLib/PlayList.cs branches/Common-MP-TVE3-experimental/DirectShowLib/QEdit.cs branches/Common-MP-TVE3-experimental/DirectShowLib/RegBag.cs branches/Common-MP-TVE3-experimental/DirectShowLib/Sbe.cs branches/Common-MP-TVE3-experimental/DirectShowLib/Tuner.cs branches/Common-MP-TVE3-experimental/DirectShowLib/TvRatings.cs branches/Common-MP-TVE3-experimental/DirectShowLib/Uuids.cs branches/Common-MP-TVE3-experimental/DirectShowLib/VidPort.cs branches/Common-MP-TVE3-experimental/DirectShowLib/Vidcap.cs branches/Common-MP-TVE3-experimental/DirectShowLib/VmRender.cs branches/Common-MP-TVE3-experimental/DirectShowLib/Vmr9.cs branches/Common-MP-TVE3-experimental/DirectShowLib/amstream.cs branches/Common-MP-TVE3-experimental/DirectShowLib/amvideo.cs branches/Common-MP-TVE3-experimental/DirectShowLib/atscpsipparser.cs branches/Common-MP-TVE3-experimental/DirectShowLib/austream.cs branches/Common-MP-TVE3-experimental/DirectShowLib/dsattrib.cs branches/Common-MP-TVE3-experimental/DirectShowLib/dvbsiparser.cs branches/Common-MP-TVE3-experimental/DirectShowLib/encdec.cs branches/Common-MP-TVE3-experimental/DirectShowLib/mmstream.cs branches/Common-MP-TVE3-experimental/DirectShowLib/mpconfig.cs branches/Common-MP-TVE3-experimental/DirectShowLib/mpeg2psiparser.cs branches/Common-MP-TVE3-experimental/DirectShowLib/other.cs branches/Common-MP-TVE3-experimental/DirectShowLib/qnetwork.cs branches/Common-MP-TVE3-experimental/OsInfo/ branches/Common-MP-TVE3-experimental/OsInfo/OSInfo.cs branches/Common-MP-TVE3-experimental/OsInfo/OSPrerequisites.cs branches/Common-MP-TVE3-experimental/PowerScheduler.Interfaces/ branches/Common-MP-TVE3-experimental/PowerScheduler.Interfaces/EPGWakeupConfig.cs branches/Common-MP-TVE3-experimental/PowerScheduler.Interfaces/Interfaces/ branches/Common-MP-TVE3-experimental/PowerScheduler.Interfaces/Interfaces/IEpgHandler.cs branches/Common-MP-TVE3-experimental/PowerScheduler.Interfaces/Interfaces/IPowerController.cs branches/Common-MP-TVE3-experimental/PowerScheduler.Interfaces/Interfaces/IPowerScheduler.cs branches/Common-MP-TVE3-experimental/PowerScheduler.Interfaces/Interfaces/IPowerSettings.cs branches/Common-MP-TVE3-experimental/PowerScheduler.Interfaces/Interfaces/IStandbyHandler.cs branches/Common-MP-TVE3-experimental/PowerScheduler.Interfaces/Interfaces/IWakeupHandler.cs branches/Common-MP-TVE3-experimental/PowerScheduler.Interfaces/PowerManager.cs branches/Common-MP-TVE3-experimental/PowerScheduler.Interfaces/PowerScheduler.Interfaces.csproj branches/Common-MP-TVE3-experimental/PowerScheduler.Interfaces/PowerScheduler.Interfaces.sln branches/Common-MP-TVE3-experimental/PowerScheduler.Interfaces/PowerSchedulerEventArgs.cs branches/Common-MP-TVE3-experimental/PowerScheduler.Interfaces/PowerSettings.cs branches/Common-MP-TVE3-experimental/PowerScheduler.Interfaces/Properties/ branches/Common-MP-TVE3-experimental/PowerScheduler.Interfaces/Properties/AssemblyInfo.cs branches/Common-MP-TVE3-experimental/PowerScheduler.Interfaces/RemotePowerControl.cs branches/Common-MP-TVE3-experimental/PowerScheduler.Interfaces/TimerException.cs branches/Common-MP-TVE3-experimental/PowerScheduler.Interfaces/WaitableTimer.cs branches/Common-MP-TVE3-experimental/PowerScheduler.Interfaces/WakeOnLanManager.cs branches/Common-MP-TVE3-experimental/SolutionInfo.cs Removed: branches/Common-MP-TVE3-experimental/Common-MP-TVE3/ branches/Common-MP-TVE3-experimental/Common.Utils/Common.Utils.csproj branches/Common-MP-TVE3-experimental/Common.Utils/Common.Utils.sln branches/Common-MP-TVE3-experimental/Common.Utils/Compatibility/ branches/Common-MP-TVE3-experimental/Common.Utils/Compatibility/CompatibilityManager.cs branches/Common-MP-TVE3-experimental/Common.Utils/Compatibility/CompatibleVersionAttribute.cs branches/Common-MP-TVE3-experimental/Common.Utils/Compatibility/SubsystemVersionAttribute.cs branches/Common-MP-TVE3-experimental/Common.Utils/Compatibility/UsesSubsystemAttribute.cs branches/Common-MP-TVE3-experimental/Common.Utils/CompatibilityInfo.cs branches/Common-MP-TVE3-experimental/Common.Utils/ExtensionMethods/ branches/Common-MP-TVE3-experimental/Common.Utils/ExtensionMethods/ArrayExtMethods.cs branches/Common-MP-TVE3-experimental/Common.Utils/ExtensionMethods/DictionaryExtMethods.cs branches/Common-MP-TVE3-experimental/Common.Utils/ExtensionMethods/DisposeHelper.cs branches/Common-MP-TVE3-experimental/Common.Utils/ExtensionMethods/ListExtMethods.cs branches/Common-MP-TVE3-experimental/Common.Utils/ExtensionMethods/ObjectMethods.cs branches/Common-MP-TVE3-experimental/Common.Utils/GlobalServiceProvider.cs branches/Common-MP-TVE3-experimental/Common.Utils/Properties/ branches/Common-MP-TVE3-experimental/Common.Utils/Properties/AssemblyInfo.cs branches/Common-MP-TVE3-experimental/Common.Utils/ServiceProvider.cs branches/Common-MP-TVE3-experimental/DirectShowLib/AXExtend.cs branches/Common-MP-TVE3-experimental/DirectShowLib/AssemblyInfo.cs branches/Common-MP-TVE3-experimental/DirectShowLib/AxCore.cs branches/Common-MP-TVE3-experimental/DirectShowLib/BDAIface.cs branches/Common-MP-TVE3-experimental/DirectShowLib/BDATypes.cs branches/Common-MP-TVE3-experimental/DirectShowLib/Bdatif.cs branches/Common-MP-TVE3-experimental/DirectShowLib/Control.cs branches/Common-MP-TVE3-experimental/DirectShowLib/DES.cs branches/Common-MP-TVE3-experimental/DirectShowLib/DMODShow.cs branches/Common-MP-TVE3-experimental/DirectShowLib/DVDIf.cs branches/Common-MP-TVE3-experimental/DirectShowLib/DevEnum.cs branches/Common-MP-TVE3-experimental/DirectShowLib/DirectShowLib.csproj branches/Common-MP-TVE3-experimental/DirectShowLib/DirectShowLib.sln branches/Common-MP-TVE3-experimental/DirectShowLib/DsUtils.cs branches/Common-MP-TVE3-experimental/DirectShowLib/DynGraph.cs branches/Common-MP-TVE3-experimental/DirectShowLib/EvCode.cs branches/Common-MP-TVE3-experimental/DirectShowLib/IL21Dec.cs branches/Common-MP-TVE3-experimental/DirectShowLib/MediaObj.cs branches/Common-MP-TVE3-experimental/DirectShowLib/MediaParam.cs branches/Common-MP-TVE3-experimental/DirectShowLib/Misc.cs branches/Common-MP-TVE3-experimental/DirectShowLib/Mixerocx.cs branches/Common-MP-TVE3-experimental/DirectShowLib/Mpeg2Data.cs branches/Common-MP-TVE3-experimental/DirectShowLib/Mpeg2Structs.cs branches/Common-MP-TVE3-experimental/DirectShowLib/PlayList.cs branches/Common-MP-TVE3-experimental/DirectShowLib/QEdit.cs branches/Common-MP-TVE3-experimental/DirectShowLib/RegBag.cs branches/Common-MP-TVE3-experimental/DirectShowLib/Sbe.cs branches/Common-MP-TVE3-experimental/DirectShowLib/Tuner.cs branches/Common-MP-TVE3-experimental/DirectShowLib/TvRatings.cs branches/Common-MP-TVE3-experimental/DirectShowLib/Uuids.cs branches/Common-MP-TVE3-experimental/DirectShowLib/VidPort.cs branches/Common-MP-TVE3-experimental/DirectShowLib/Vidcap.cs branches/Common-MP-TVE3-experimental/DirectShowLib/VmRender.cs branches/Common-MP-TVE3-experimental/DirectShowLib/Vmr9.cs branches/Common-MP-TVE3-experimental/DirectShowLib/amstream.cs branches/Common-MP-TVE3-experimental/DirectShowLib/amvideo.cs branches/Common-MP-TVE3-experimental/DirectShowLib/atscpsipparser.cs branches/Common-MP-TVE3-experimental/DirectShowLib/austream.cs branches/Common-MP-TVE3-experimental/DirectShowLib/dsattrib.cs branches/Common-MP-TVE3-experimental/DirectShowLib/dvbsiparser.cs branches/Common-MP-TVE3-experimental/DirectShowLib/encdec.cs branches/Common-MP-TVE3-experimental/DirectShowLib/mmstream.cs branches/Common-MP-TVE3-experimental/DirectShowLib/mpconfig.cs branches/Common-MP-TVE3-experimental/DirectShowLib/mpeg2psiparser.cs branches/Common-MP-TVE3-experimental/DirectShowLib/other.cs branches/Common-MP-TVE3-experimental/DirectShowLib/qnetwork.cs branches/Common-MP-TVE3-experimental/OsInfo/OSInfo.cs branches/Common-MP-TVE3-experimental/OsInfo/OSPrerequisites.cs branches/Common-MP-TVE3-experimental/PowerScheduler.Interfaces/EPGWakeupConfig.cs branches/Common-MP-TVE3-experimental/PowerScheduler.Interfaces/Interfaces/ branches/Common-MP-TVE3-experimental/PowerScheduler.Interfaces/Interfaces/IEpgHandler.cs branches/Common-MP-TVE3-experimental/PowerScheduler.Interfaces/Interfaces/IPowerController.cs branches/Common-MP-TVE3-experimental/PowerScheduler.Interfaces/Interfaces/IPowerScheduler.cs branches/Common-MP-TVE3-experimental/PowerScheduler.Interfaces/Interfaces/IPowerSettings.cs branches/Common-MP-TVE3-experimental/PowerScheduler.Interfaces/Interfaces/IStandbyHandler.cs branches/Common-MP-TVE3-experimental/PowerScheduler.Interfaces/Interfaces/IWakeupHandler.cs branches/Common-MP-TVE3-experimental/PowerScheduler.Interfaces/PowerManager.cs branches/Common-MP-TVE3-experimental/PowerScheduler.Interfaces/PowerScheduler.Interfaces.csproj branches/Common-MP-TVE3-experimental/PowerScheduler.Interfaces/PowerScheduler.Interfaces.sln branches/Common-MP-TVE3-experimental/PowerScheduler.Interfaces/PowerSchedulerEventArgs.cs branches/Common-MP-TVE3-experimental/PowerScheduler.Interfaces/PowerSettings.cs branches/Common-MP-TVE3-experimental/PowerScheduler.Interfaces/Properties/ branches/Common-MP-TVE3-experimental/PowerScheduler.Interfaces/Properties/AssemblyInfo.cs branches/Common-MP-TVE3-experimental/PowerScheduler.Interfaces/RemotePowerControl.cs branches/Common-MP-TVE3-experimental/PowerScheduler.Interfaces/TimerException.cs branches/Common-MP-TVE3-experimental/PowerScheduler.Interfaces/WaitableTimer.cs branches/Common-MP-TVE3-experimental/PowerScheduler.Interfaces/WakeOnLanManager.cs Log: revert folder move Property changes on: branches/Common-MP-TVE3-experimental/Common.Utils ___________________________________________________________________ Added: bugtraq:url + http://mantis.team-mediaportal.com/view.php?id=%BUGID% Added: svn:ignore + bin obj [Bb]in [Dd]ebug [Rr]elease *.user *.aps *.eto Added: bugtraq:logregex + ([Ii]ssues?|[Mm]antis|[Ff]ix(ed)?(\sfor)?)[\s]?:?(\s*(,|and)?[#|\s]\d+)+|^(\d+): ([1-9]\d+) Deleted: branches/Common-MP-TVE3-experimental/Common.Utils/Common.Utils.csproj =================================================================== --- branches/Common-MP-TVE3-experimental/Common.Utils/Common.Utils.csproj 2011-12-11 13:11:38 UTC (rev 28338) +++ branches/Common-MP-TVE3-experimental/Common.Utils/Common.Utils.csproj 2011-12-17 11:25:43 UTC (rev 28341) @@ -1,126 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<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> - <ProductVersion>9.0.30729</ProductVersion> - <SchemaVersion>2.0</SchemaVersion> - <ProjectGuid>{F6EDA1F3-3DCD-43F4-8A90-E32DA70C8227}</ProjectGuid> - <OutputType>Library</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>MediaPortal.Common.Utils</RootNamespace> - <AssemblyName>Common.Utils</AssemblyName> - <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> - <FileAlignment>512</FileAlignment> - <FileUpgradeFlags> - </FileUpgradeFlags> - <OldToolsVersion>3.5</OldToolsVersion> - <UpgradeBackupLocation /> - <PublishUrl>http://localhost/Common.Utils/</PublishUrl> - <Install>true</Install> - <InstallFrom>Web</InstallFrom> - <UpdateEnabled>true</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>true</IsWebBootstrapper> - <UseApplicationTrust>false</UseApplicationTrust> - <BootstrapperEnabled>true</BootstrapperEnabled> - <TargetFrameworkProfile /> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <DebugSymbols>true</DebugSymbols> - <DebugType>full</DebugType> - <Optimize>false</Optimize> - <OutputPath>bin\Debug\</OutputPath> - <DefineConstants>DEBUG;TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - <DebugType>pdbonly</DebugType> - <Optimize>true</Optimize> - <OutputPath>bin\Release\</OutputPath> - <DefineConstants>TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> - <DebugSymbols>true</DebugSymbols> - <OutputPath>bin\Debug\</OutputPath> - <DefineConstants>DEBUG;TRACE</DefineConstants> - <DebugType>full</DebugType> - <PlatformTarget>x86</PlatformTarget> - <ErrorReport>prompt</ErrorReport> - <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> - <OutputPath>bin\Release\</OutputPath> - <DefineConstants>TRACE</DefineConstants> - <Optimize>true</Optimize> - <DebugType> - </DebugType> - <PlatformTarget>x86</PlatformTarget> - <ErrorReport>prompt</ErrorReport> - <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> - </PropertyGroup> - <ItemGroup> - <Reference Include="System" /> - <Reference Include="System.Core"> - <RequiredTargetFramework>3.5</RequiredTargetFramework> - </Reference> - <Reference Include="System.Data" /> - <Reference Include="System.Xml" /> - </ItemGroup> - <ItemGroup> - <Compile Include="..\SolutionInfo.cs"> - <Link>SolutionInfo.cs</Link> - </Compile> - <Compile Include="CompatibilityInfo.cs" /> - <Compile Include="Compatibility\CompatibilityManager.cs" /> - <Compile Include="Compatibility\CompatibleVersionAttribute.cs" /> - <Compile Include="Compatibility\SubsystemVersionAttribute.cs" /> - <Compile Include="Compatibility\UsesSubsystemAttribute.cs" /> - <Compile Include="ExtensionMethods\ArrayExtMethods.cs" /> - <Compile Include="ExtensionMethods\DictionaryExtMethods.cs" /> - <Compile Include="ExtensionMethods\DisposeHelper.cs" /> - <Compile Include="ExtensionMethods\ListExtMethods.cs" /> - <Compile Include="ExtensionMethods\ObjectMethods.cs" /> - <Compile Include="GlobalServiceProvider.cs" /> - <Compile Include="Properties\AssemblyInfo.cs" /> - <Compile Include="ServiceProvider.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> - <ItemGroup /> - <Import Project="$(MSBuildToolsPath)\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. - <Target Name="BeforeBuild"> - </Target> - <Target Name="AfterBuild"> - </Target> - --> -</Project> \ No newline at end of file Copied: branches/Common-MP-TVE3-experimental/Common.Utils/Common.Utils.csproj (from rev 28338, branches/Common-MP-TVE3-experimental/Common.Utils/Common.Utils.csproj) =================================================================== --- branches/Common-MP-TVE3-experimental/Common.Utils/Common.Utils.csproj (rev 0) +++ branches/Common-MP-TVE3-experimental/Common.Utils/Common.Utils.csproj 2011-12-17 11:25:43 UTC (rev 28341) @@ -0,0 +1,126 @@ +<?xml version="1.0" encoding="utf-8"?> +<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> + <ProductVersion>9.0.30729</ProductVersion> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{F6EDA1F3-3DCD-43F4-8A90-E32DA70C8227}</ProjectGuid> + <OutputType>Library</OutputType> + <AppDesignerFolder>Properties</AppDesignerFolder> + <RootNamespace>MediaPortal.Common.Utils</RootNamespace> + <AssemblyName>Common.Utils</AssemblyName> + <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> + <FileAlignment>512</FileAlignment> + <FileUpgradeFlags> + </FileUpgradeFlags> + <OldToolsVersion>3.5</OldToolsVersion> + <UpgradeBackupLocation /> + <PublishUrl>http://localhost/Common.Utils/</PublishUrl> + <Install>true</Install> + <InstallFrom>Web</InstallFrom> + <UpdateEnabled>true</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>true</IsWebBootstrapper> + <UseApplicationTrust>false</UseApplicationTrust> + <BootstrapperEnabled>true</BootstrapperEnabled> + <TargetFrameworkProfile /> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>bin\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> + <DebugSymbols>true</DebugSymbols> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <DebugType>full</DebugType> + <PlatformTarget>x86</PlatformTarget> + <ErrorReport>prompt</ErrorReport> + <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> + <OutputPath>bin\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <Optimize>true</Optimize> + <DebugType> + </DebugType> + <PlatformTarget>x86</PlatformTarget> + <ErrorReport>prompt</ErrorReport> + <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> + </PropertyGroup> + <ItemGroup> + <Reference Include="System" /> + <Reference Include="System.Core"> + <RequiredTargetFramework>3.5</RequiredTargetFramework> + </Reference> + <Reference Include="System.Data" /> + <Reference Include="System.Xml" /> + </ItemGroup> + <ItemGroup> + <Compile Include="..\SolutionInfo.cs"> + <Link>SolutionInfo.cs</Link> + </Compile> + <Compile Include="CompatibilityInfo.cs" /> + <Compile Include="Compatibility\CompatibilityManager.cs" /> + <Compile Include="Compatibility\CompatibleVersionAttribute.cs" /> + <Compile Include="Compatibility\SubsystemVersionAttribute.cs" /> + <Compile Include="Compatibility\UsesSubsystemAttribute.cs" /> + <Compile Include="ExtensionMethods\ArrayExtMethods.cs" /> + <Compile Include="ExtensionMethods\DictionaryExtMethods.cs" /> + <Compile Include="ExtensionMethods\DisposeHelper.cs" /> + <Compile Include="ExtensionMethods\ListExtMethods.cs" /> + <Compile Include="ExtensionMethods\ObjectMethods.cs" /> + <Compile Include="GlobalServiceProvider.cs" /> + <Compile Include="Properties\AssemblyInfo.cs" /> + <Compile Include="ServiceProvider.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> + <ItemGroup /> + <Import Project="$(MSBuildToolsPath)\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. + <Target Name="BeforeBuild"> + </Target> + <Target Name="AfterBuild"> + </Target> + --> +</Project> \ No newline at end of file Deleted: branches/Common-MP-TVE3-experimental/Common.Utils/Common.Utils.sln =================================================================== --- branches/Common-MP-TVE3-experimental/Common.Utils/Common.Utils.sln 2011-12-11 13:11:38 UTC (rev 28338) +++ branches/Common-MP-TVE3-experimental/Common.Utils/Common.Utils.sln 2011-12-17 11:25:43 UTC (rev 28341) @@ -1,26 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common.Utils", "Common.Utils.csproj", "{F6EDA1F3-3DCD-43F4-8A90-E32DA70C8227}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {F6EDA1F3-3DCD-43F4-8A90-E32DA70C8227}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F6EDA1F3-3DCD-43F4-8A90-E32DA70C8227}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F6EDA1F3-3DCD-43F4-8A90-E32DA70C8227}.Debug|x86.ActiveCfg = Debug|x86 - {F6EDA1F3-3DCD-43F4-8A90-E32DA70C8227}.Debug|x86.Build.0 = Debug|x86 - {F6EDA1F3-3DCD-43F4-8A90-E32DA70C8227}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F6EDA1F3-3DCD-43F4-8A90-E32DA70C8227}.Release|Any CPU.Build.0 = Release|Any CPU - {F6EDA1F3-3DCD-43F4-8A90-E32DA70C8227}.Release|x86.ActiveCfg = Release|x86 - {F6EDA1F3-3DCD-43F4-8A90-E32DA70C8227}.Release|x86.Build.0 = Release|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal Copied: branches/Common-MP-TVE3-experimental/Common.Utils/Common.Utils.sln (from rev 28338, branches/Common-MP-TVE3-experimental/Common.Utils/Common.Utils.sln) =================================================================== --- branches/Common-MP-TVE3-experimental/Common.Utils/Common.Utils.sln (rev 0) +++ branches/Common-MP-TVE3-experimental/Common.Utils/Common.Utils.sln 2011-12-17 11:25:43 UTC (rev 28341) @@ -0,0 +1,26 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common.Utils", "Common.Utils.csproj", "{F6EDA1F3-3DCD-43F4-8A90-E32DA70C8227}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {F6EDA1F3-3DCD-43F4-8A90-E32DA70C8227}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F6EDA1F3-3DCD-43F4-8A90-E32DA70C8227}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F6EDA1F3-3DCD-43F4-8A90-E32DA70C8227}.Debug|x86.ActiveCfg = Debug|x86 + {F6EDA1F3-3DCD-43F4-8A90-E32DA70C8227}.Debug|x86.Build.0 = Debug|x86 + {F6EDA1F3-3DCD-43F4-8A90-E32DA70C8227}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F6EDA1F3-3DCD-43F4-8A90-E32DA70C8227}.Release|Any CPU.Build.0 = Release|Any CPU + {F6EDA1F3-3DCD-43F4-8A90-E32DA70C8227}.Release|x86.ActiveCfg = Release|x86 + {F6EDA1F3-3DCD-43F4-8A90-E32DA70C8227}.Release|x86.Build.0 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal Property changes on: branches/Common-MP-TVE3-experimental/Common.Utils/Compatibility ___________________________________________________________________ Added: bugtraq:url + http://mantis.team-mediaportal.com/view.php?id=%BUGID% Added: bugtraq:logregex + ([Ii]ssues?|[Mm]antis|[Ff]ix(ed)?(\sfor)?)[\s]?:?(\s*(,|and)?[#|\s]\d+)+|^(\d+): ([1-9]\d+) Deleted: branches/Common-MP-TVE3-experimental/Common.Utils/Compatibility/CompatibilityManager.cs =================================================================== --- branches/Common-MP-TVE3-experimental/Common.Utils/Compatibility/CompatibilityManager.cs 2011-12-11 13:11:38 UTC (rev 28338) +++ branches/Common-MP-TVE3-experimental/Common.Utils/Compatibility/CompatibilityManager.cs 2011-12-17 11:25:43 UTC (rev 28341) @@ -1,365 +0,0 @@ -#region Copyright (C) 2005-2010 Team MediaPortal - -// Copyright (C) 2005-2010 Team MediaPortal -// http://www.team-mediaportal.com -// -// MediaPortal is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 2 of the License, or -// (at your option) any later version. -// -// MediaPortal is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>. - -#endregion - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using System.Xml; - -namespace MediaPortal.Common.Utils -{ - public class CompatibilityManager - { - protected class UsesSubsystemAttributeComparer : IEqualityComparer<UsesSubsystemAttribute> - { - public bool Equals(UsesSubsystemAttribute x, UsesSubsystemAttribute y) - { - return x.Subsystem == y.Subsystem; - } - - public int GetHashCode(UsesSubsystemAttribute obj) - { - return obj.Subsystem.GetHashCode(); - } - } - - private static readonly HashSet<Assembly> AppAssemblies = new HashSet<Assembly>(); - private static readonly Dictionary<string, Version> SubSystemVersions = new Dictionary<string, Version>(); - private static readonly Version AppVersion; - public static readonly Version SkinVersion = new Version(1, 2, 0, 0); - private static readonly string MinRequiredVersionDefault = "1.1.8.0"; // 1.2.0 RC1 - - static CompatibilityManager() - { - AppVersion = Assembly.GetEntryAssembly().GetName().Version; - } - - /// <summary> - /// Enumerate loaded assemblies and scan each of the, for subsystem compatibility attributes - /// </summary> - /// <remarks> - /// This method can be called repeatedly. Each time it will - /// detect any newly loaded assemblies and scan those for - /// additional compatibility attributes - /// </remarks> - private static void CheckLoadedAssemblies() - { - Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies(); - if (assemblies.Length >= AppAssemblies.Count) - { - foreach (Assembly asm in assemblies) - { - if (AppAssemblies.Add(asm)) - { - ScanAssembly(asm); - } - } - } - } - - /// <summary> - /// Sets a subsystem's version, but only if there is no version information - /// about the subsystem or new version is later than the existing one. - /// </summary> - /// <param name="subSystem">The subsystem whose version to set</param> - /// <param name="version">The new version</param> - /// <returns>True if the version was set/changed</returns> - private static bool SetSubSystemVersion(string subSystem, Version version) - { - Version oldVersion; - if (!SubSystemVersions.TryGetValue(subSystem, out oldVersion) || CompareVersions(oldVersion, version) < 0) - { - SubSystemVersions[subSystem] = version; - return true; - } - return false; - } - - /// <summary> - /// Scan a loaded assembly for subsystem compatibility attributes. - /// </summary> - /// <param name="asm">The assembly to scan</param> - private static void ScanAssembly(Assembly asm) - { - var mpAttributes = - asm.GetCustomAttributes(typeof(SubsystemVersionAttribute), false).Cast<SubsystemVersionAttribute>(); - - foreach (SubsystemVersionAttribute attr in mpAttributes) - { - string subSystem = attr.Subsystem; - while(!string.IsNullOrEmpty(subSystem)) - { - if (!subSystem.EndsWith(".")) // ignore subsystems ending in dot, next iteration will pick up subsystem without the dot - { - SetSubSystemVersion(subSystem, attr.Version); - } - int pos = subSystem.LastIndexOf('.'); - if (pos<0) - { - pos = 0; - } - subSystem = subSystem.Substring(0, pos); - } - } - } - - /// <summary> - /// Compare two versions. - /// </summary> - /// <param name="v1"></param> - /// <param name="v2"></param> - /// <returns></returns> - /// <remarks> - /// The comparison done by this function differs from that of - /// the relational operators in Version class, in that any version with a - /// zero Build number is considered a release version and compares greater than - /// any other version with the same Major,Minor and Revision numbers - /// but non-zero Build number. - /// </remarks> - public static int CompareVersions(Version v1, Version v2) - { - //if (v1.Major == v2.Major && v1.Minor ==v2.Minor && v1.Revision == v2.Revision) - //{ - // if (v1.Build == v2.Build) - // { - // return 0; - // } - // if (v1.Build == 0) // release is always higher than any SVN build - // { - // return 1; - // } - // if (v2.Build == 0) // release is always higher than any SVN build - // { - // return -1; - // } - // if (v1.Build < v2.Build) - // { - // return -1; - // } - // return 1; - //} - - return v1.CompareTo(v2); - } - - /// <summary> - /// Verify a plugin compatibility based on the subsystems used - /// and the MP version it was built against. - /// </summary> - /// <param name="plugin">The plugin to check</param> - /// <returns>True if the plugin is compatible with this version of the application</returns> - /// <remarks> - /// A plugin is compatible with this version of the application if - /// none of the subsystems it uses had a breaking change in a version - /// after the one the plugin was build against and the minimum required version - /// is older than the current application version. - /// A special subsystem "*" is used to signify that compatibility with all plugins - /// has been broken. - /// - /// The plugin is any type that is decorated using the UsesSubsystemAttribute - /// and CompatibleVersionAttribute. If an attribute is not specified on the plugin, - /// its defining assembly is searched for the same attribute. - /// </remarks> - public static bool IsPluginCompatible(Type plugin) - { - var mpVersions = - (CompatibleVersionAttribute[])plugin.GetCustomAttributes(typeof(CompatibleVersionAttribute), true); - if (mpVersions.Length == 0) - { - mpVersions = (CompatibleVersionAttribute[])plugin.Assembly.GetCustomAttributes(typeof(CompatibleVersionAttribute), true); - } - var minRequiredVersion = new Version(MinRequiredVersionDefault); - var designedForVersion = new Version(1, 0, 0, 0); - - if (mpVersions.Length > 0) - { - minRequiredVersion = mpVersions[0].MinRequiredVersion; - if (minRequiredVersion == CompatibleVersionAttribute.OwnAssemblyVersion) - { - minRequiredVersion = plugin.Assembly.GetName().Version; - } - designedForVersion = mpVersions[0].DesignedForVersion; - if (designedForVersion == CompatibleVersionAttribute.OwnAssemblyVersion) - { - designedForVersion = plugin.Assembly.GetName().Version; - } - } - - CheckLoadedAssemblies(); - Version lastFullyBreakingVersion; - - if (CompareVersions(AppVersion, minRequiredVersion) < 0 || // MP version is too old - (SubSystemVersions.TryGetValue("*", out lastFullyBreakingVersion) && - CompareVersions(lastFullyBreakingVersion, designedForVersion) > 0)) // MP breaking version after plugin released - { - return false; - } - - IEnumerable<UsesSubsystemAttribute> subsystemsUsed = (UsesSubsystemAttribute[])plugin.GetCustomAttributes(typeof(UsesSubsystemAttribute), true); - subsystemsUsed = subsystemsUsed.Union((UsesSubsystemAttribute[])plugin.Assembly.GetCustomAttributes(typeof(UsesSubsystemAttribute), true), - new UsesSubsystemAttributeComparer()).Where(attr => attr.Used); - - Version ver; - // Have all used subsystem known versions and prior to the one the plugin was designed for? - return subsystemsUsed.All(attr => SubSystemVersions.TryGetValue(attr.Subsystem, out ver) && CompareVersions(ver, designedForVersion) <= 0); - } - - /// <summary> - /// Verify a plugin assembly compatibility based on the subsystems used - /// and the MP version it was built against. - /// </summary> - /// <param name="plugin">The plugin assemby to check</param> - /// <returns>True if the plugin is compatible with this version of the application</returns> - /// <remarks> - /// A plugin assembly is compatible with this version of the application if - /// none of the subsystems it uses had a breaking change in a version - /// after the one the plugin was build against and the minimum required version - /// is older than the current application version. - /// A special subsystem "*" is used to signify that compatibility with all plugins - /// has been broken. - /// - /// The plugin is any assembly that is decorated using the UsesSubsystemAttribute - /// and CompatibleVersionAttribute. - /// </remarks> - public static bool IsPluginCompatible(Assembly plugin) - { - var mpVersions = - (CompatibleVersionAttribute[])plugin.GetCustomAttributes(typeof(CompatibleVersionAttribute), true); - - var minRequiredVersion = new Version(MinRequiredVersionDefault); - var designedForVersion = new Version(1, 0, 0, 0); - - if (mpVersions.Length > 0) - { - minRequiredVersion = mpVersions[0].MinRequiredVersion; - if (minRequiredVersion == CompatibleVersionAttribute.OwnAssemblyVersion) - { - minRequiredVersion = plugin.GetName().Version; - } - designedForVersion = mpVersions[0].DesignedForVersion; - if (designedForVersion == CompatibleVersionAttribute.OwnAssemblyVersion) - { - designedForVersion = plugin.GetName().Version; - } - } - - CheckLoadedAssemblies(); - Version lastFullyBreakingVersion; - - if (CompareVersions(AppVersion, minRequiredVersion) < 0 || // MP version is too old - (SubSystemVersions.TryGetValue("*", out lastFullyBreakingVersion) && - CompareVersions(lastFullyBreakingVersion, designedForVersion) > 0)) // MP breaking version after plugin released - { - return false; - } - - IEnumerable<UsesSubsystemAttribute> subsystemsUsed = ((UsesSubsystemAttribute[])plugin.GetCustomAttributes(typeof(UsesSubsystemAttribute), true)) - .Where(attr => attr.Used); - - Version ver; - // Have all used subsystem known versions and prior to the one the plugin was designed for? - return subsystemsUsed.All(attr => SubSystemVersions.TryGetValue(attr.Subsystem, out ver) && CompareVersions(ver, designedForVersion) <= 0); - } - - public static Version GetCurrentVersion() - { - CheckLoadedAssemblies(); - Version version; - if (!SubSystemVersions.TryGetValue("*", out version)) - { - return AppVersion; - } - return version; - } - - public static IEnumerable<UsesSubsystemAttribute> GetSubSystemsUsed(Assembly asm) - { - return ((UsesSubsystemAttribute[])asm.GetCustomAttributes(typeof(UsesSubsystemAttribute), true)).Where(attr => attr.Used); - } - - public static IEnumerable<CompatibleVersionAttribute> GetRequestedVersions(Assembly asm) - { - return (CompatibleVersionAttribute[])asm.GetCustomAttributes(typeof(CompatibleVersionAttribute), true); - } - - public static bool IsPluginCompatible(System.Xml.XmlElement rootNode) - { - XmlNode versionNode = rootNode.SelectSingleNode("CompatibleVersion/Items"); - if(versionNode == null) - { - return false; - } - var minRequiredVersion = new Version(MinRequiredVersionDefault); - var designedForVersion = new Version(1, 0, 0, 0); - - foreach (XmlNode node in versionNode.ChildNodes) - { - XmlNode minVersionNode = node.SelectSingleNode("MinRequiredVersion"); - XmlNode designedVersionNode = node.SelectSingleNode("DesignedForVersion"); - if (minVersionNode != null) - { - minRequiredVersion = new Version(minVersionNode.InnerText); - } - if (designedForVersion == null) - { - return false; - } - designedForVersion = new Version(designedVersionNode.InnerText); - break; //Break cause we only check first instance?? - } - - CheckLoadedAssemblies(); - Version lastFullyBreakingVersion; - - if (CompareVersions(AppVersion, minRequiredVersion) < 0 || // MP version is too old - (SubSystemVersions.TryGetValue("*", out lastFullyBreakingVersion) && - CompareVersions(lastFullyBreakingVersion, designedForVersion) > 0)) // MP breaking version after plugin released - { - return false; - } - - List<string> subsystemsUsed = new List<string>(); - XmlNode subsystemNode = rootNode.SelectSingleNode("SubSystemsUsed/Items"); - if (subsystemNode == null) - { - return false; - } - foreach (XmlNode node in subsystemNode.ChildNodes) - { - XmlAttribute nameAttrib = node.Attributes["Name"]; - if(nameAttrib == null || string.IsNullOrEmpty(nameAttrib.InnerText)) - { - continue; - } - subsystemsUsed.Add(nameAttrib.InnerText); - } - - if (subsystemsUsed.Count == 0) - { - return true; - } - - Version ver; - // Have all used subsystem known versions and prior to the one the plugin was designed for? - return subsystemsUsed.All(attr => SubSystemVersions.TryGetValue(attr, out ver) && CompareVersions(ver, designedForVersion) <= 0); - } - } -} Copied: branches/Common-MP-TVE3-experimental/Common.Utils/Compatibility/CompatibilityManager.cs (from rev 28338, branches/Common-MP-TVE3-experimental/Common.Utils/Compatibility/CompatibilityManager.cs) =================================================================== --- branches/Common-MP-TVE3-experimental/Common.Utils/Compatibility/CompatibilityManager.cs (rev 0) +++ branches/Common-MP-TVE3-experimental/Common.Utils/Compatibility/CompatibilityManager.cs 2011-12-17 11:25:43 UTC (rev 28341) @@ -0,0 +1,365 @@ +#region Copyright (C) 2005-2010 Team MediaPortal + +// Copyright (C) 2005-2010 Team MediaPortal +// http://www.team-mediaportal.com +// +// MediaPortal is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 2 of the License, or +// (at your option) any later version. +// +// MediaPortal is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>. + +#endregion + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Xml; + +namespace MediaPortal.Common.Utils +{ + public class CompatibilityManager + { + protected class UsesSubsystemAttributeComparer : IEqualityComparer<UsesSubsystemAttribute> + { + public bool Equals(UsesSubsystemAttribute x, UsesSubsystemAttribute y) + { + return x.Subsystem == y.Subsystem; + } + + public int GetHashCode(UsesSubsystemAttribute obj) + { + return obj.Subsystem.GetHashCode(); + } + } + + private static readonly HashSet<Assembly> AppAssemblies = new HashSet<Assembly>(); + private static readonly Dictionary<string, Version> SubSystemVersions = new Dictionary<string, Version>(); + private static readonly Version AppVersion; + public static readonly Version SkinVersion = new Version(1, 2, 0, 0); + private static readonly string MinRequiredVersionDefault = "1.1.8.0"; // 1.2.0 RC1 + + static CompatibilityManager() + { + AppVersion = Assembly.GetEntryAssembly().GetName().Version; + } + + /// <summary> + /// Enumerate loaded assemblies and scan each of the, for subsystem compatibility attributes + /// </summary> + /// <remarks> + /// This method can be called repeatedly. Each time it will + /// detect any newly loaded assemblies and scan those for + /// additional compatibility attributes + /// </remarks> + private static void CheckLoadedAssemblies() + { + Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies(); + if (assemblies.Length >= AppAssemblies.Count) + { + foreach (Assembly asm in assemblies) + { + if (AppAssemblies.Add(asm)) + { + ScanAssembly(asm); + } + } + } + } + + /// <summary> + /// Sets a subsystem's version, but only if there is no version information + /// about the subsystem or new version is later than the existing one. + /// </summary> + /// <param name="subSystem">The subsystem whose version to set</param> + /// <param name="version">The new version</param> + /// <returns>True if the version was set/changed</returns> + private static bool SetSubSystemVersion(string subSystem, Version version) + { + Version oldVersion; + if (!SubSystemVersions.TryGetValue(subSystem, out oldVersion) || CompareVersions(oldVersion, version) < 0) + { + SubSystemVersions[subSystem] = version; + return true; + } + return false; + } + + /// <summary> + /// Scan a loaded assembly for subsystem compatibility attributes. + /// </summary> + /// <param name="asm">The assembly to scan</param> + private static void ScanAssembly(Assembly asm) + { + var mpAttributes = + asm.GetCustomAttributes(typeof(SubsystemVersionAttribute), false).Cast<SubsystemVersionAttribute>(); + + foreach (SubsystemVersionAttribute attr in mpAttributes) + { + string subSystem = attr.Subsystem; + while(!string.IsNullOrEmpty(subSystem)) + { + if (!subSystem.EndsWith(".")) // ignore subsystems ending in dot, next iteration will pick up subsystem without the dot + { + SetSubSystemVersion(subSystem, attr.Version); + } + int pos = subSystem.LastIndexOf('.'); + if (pos<0) + { + pos = 0; + } + subSystem = subSystem.Substring(0, pos); + } + } + } + + /// <summary> + /// Compare two versions. + /// </summary> + /// <param name="v1"></param> + /// <param name="v2"></param> + /// <returns></returns> + /// <remarks> + /// The comparison done by this function differs from that of + /// the relational operators in Version class, in that any version with a + /// zero Build number is considered a release version and compares greater than + /// any other version with the same Major,Minor and Revision numbers + /// but non-zero Build number. + /// </remarks> + public static int CompareVersions(Version v1, Version v2) + { + //if (v1.Major == v2.Major && v1.Minor ==v2.Minor && v1.Revision == v2.Revision) + //{ + // if (v1.Build == v2.Build) + // { + // return 0; + // } + // if (v1.Build == 0) // release is always higher than any SVN build + // { + // return 1; + // } + // if (v2.Build == 0) // release is always higher than any SVN build + // { + // return -1; + // } + // if (v1.Build < v2.Build) + // { + // return -1; + // } + // return 1; + //} + + return v1.CompareTo(v2); + } + + /// <summary> + /// Verify a plugin compatibility based on the subsystems used + /// and the MP version it was built against. + /// </summary> + /// <param name="plugin">The plugin to check</param> + /// <returns>True if the plugin is compatible with this version of the application</returns> + /// <remarks> + /// A plugin is compatible with this version of the application if + /// none of the subsystems it uses had a breaking change in a version + /// after the one the plugin was build against and the minimum required version + /// is older than the current application version. + /// A special subsystem "*" is used to signify that compatibility with all plugins + /// has been broken. + /// + /// The plugin is any type that is decorated using the UsesSubsystemAttribute + /// and CompatibleVersionAttribute. If an attribute is not specified on the plugin, + /// its defining assembly is searched for the same attribute. + /// </remarks> + public static bool IsPluginCompatible(Type plugin) + { + var mpVersions = + (CompatibleVersionAttribute[])plugin.GetCustomAttributes(typeof(CompatibleVersionAttribute), true); + if (mpVersions.Length == 0) + { + mpVersions = (CompatibleVersionAttribute[])plugin.Assembly.GetCustomAttributes(typeof(CompatibleVersionAttribute), true); + } + var minRequiredVersion = new Version(MinRequiredVersionDefault); + var designedForVersion = new Version(1, 0, 0, 0); + + if (mpVersions.Length > 0) + { + minRequiredVersion = mpVersions[0].MinRequiredVersion; + if (minRequiredVersion == CompatibleVersionAttribute.OwnAssemblyVersion) + { + minRequiredVersion = plugin.Assembly.GetName().Version; + } + designedForVersion = mpVersions[0].DesignedForVersion; + if (designedForVersion == CompatibleVersionAttribute.OwnAssemblyVersion) + { + designedForVersion = plugin.Assembly.GetName().Version; + } + } + + CheckLoadedAssemblies(); + Version lastFullyBreakingVersion; + + if (CompareVersions(AppVersion, minRequiredVersion) < 0 || // MP version is too old + (SubSystemVersions.TryGetValue("*", out lastFullyBreakingVersion) && + CompareVersions(lastFullyBreakingVersion, designedForVersion) > 0)) // MP breaking version after plugin released + { + return false; + } + + IEnumerable<UsesSubsystemAttribute> subsystemsUsed = (UsesSubsystemAttribute[])plugin.GetCustomAttributes(typeof(UsesSubsystemAttribute), true); + subsystemsUsed = subsystemsUsed.Union((UsesSubsystemAttribute[])plugin.Assembly.GetCustomAttributes(typeof(UsesSubsystemAttribute), true), + new UsesSubsystemAttributeComparer()).Where(attr => attr.Used); + + Version ver; + // Have all used subsystem known versions and prior to the one the plugin was designed for? + return subsystemsUsed.All(attr => SubSystemVersions.TryGetValue(attr.Subsystem, out ver) && CompareVersions(ver, designedForVersion) <= 0); + } + + /// <summary> + /// Verify a plugin assembly compatibility based on the subsystems used + /// and the MP version it was built against. + /// </summary> + /// <param name="plugin">The plugin assemby to check</param> + /// <returns>True if the plugin is compatible with this version of the application</returns> + /// <remarks> + /// A plugin assembly is compatible with this version of the application if + /// none of the subsystems it uses had a breaking change in a version + /// after the one the plugin was build against and the minimum required version + /// is older than the current application version. + /// A special subsystem "*" is used to signify that compatibility with all plugins + /// has been broken. + /// + /// The plugin is any assembly that is decorated using the UsesSubsystemAttribute + /// and CompatibleVersionAttribute. + /// </remarks> + public static bool IsPluginCompatible(Assembly plugin) + { + var mpVersions = + (CompatibleVersionAttribute[])plugin.GetCustomAttributes(typeof(CompatibleVersionAttribute), true); + + var minRequiredVersion = new Version(MinRequiredVersionDefault); + var designedForVersion = new Version(1, 0, 0, 0); + + if (mpVersions.Length > 0) + { + minRequiredVersion = mpVersions[0].MinRequiredVersion; + if (minRequiredVersion == CompatibleVersionAttribute.OwnAssemblyVersion) + { + minRequiredVersion = plugin.GetName().Version; + } + designedForVersion = mpVersions[0].DesignedForVersion; + if (designedForVersion == CompatibleVersionAttribute.OwnAssemblyVersion) + { + designedForVersion = plugin.GetName().Version; + } + } + + CheckLoadedAssemblies(); + Version lastFullyBreakingVersion; + + if (CompareVersions(AppVersion, minRequiredVersion) < 0 || // MP version is too old + (SubSystemVersions.TryGetValue("*", out lastFullyBreakingVersion) && + CompareVersions(lastFullyBreakingVersion, designedForVersion) > 0)) // MP breaking version after plugin released + { + return false; + } + + IEnumerable<UsesSubsystemAttribute> subsystemsUsed = ((UsesSubsystemAttribute[])plugin.GetCustomAttributes(typeof(UsesSubsystemAttribute), true)) + .Where(attr => attr.Used); + + Version ver; + // Have all used subsystem known versions and prior to the one the plugin was designed for? + return subsystemsUsed.All(attr => SubSystemVersions.TryGetValue(attr.Subsystem, out ver) && CompareVersions(ver, designedForVersion) <= 0); + } + + public static Version GetCurrentVersion() + { + CheckLoadedAssemblies(); + Version version; + if (!SubSystemVersions.TryGetValue("*", out version)) + { + return AppVersion; + } + return version; + } + + public static IEnumerable<UsesSubsystemAttribute> GetSubSystemsUsed(Assembly asm) + { + return ((UsesSubsystemAttribute[])asm.GetCustomAttributes(typeof(UsesSubsystemAttribute), true)).Where(attr => attr.Used); + } + + public static IEnumerable<CompatibleVersionAttribute> GetRequestedVersions(Assembly asm) + { + return (CompatibleVersionAttribute[])asm.GetCustomAttributes(typeof(CompatibleVersionAttribute), true); + } + + public static bool IsPluginCompatible(System.Xml.XmlElement rootNode) + { + XmlNode versionNode = rootNode.SelectSingleNode("CompatibleVersion/Items"); + if(versionNode == null) + { + return false; + } + var minRequiredVersion = new Version(MinRequiredVersionDefault); + var designedForVersion = new Version(1, 0, 0, 0); + + foreach (XmlNode node in versionNode.ChildNodes) + { + XmlNode minVersionNode = node.SelectSingleNode("MinRequiredVersion"); + XmlNode designedVersionNode = node.SelectSingleNode("DesignedForVersion"); + if (minVersionNode != null) + { + minRequiredVersion = new Version(minVersionNode.InnerText); + } + if (designedForVersion == null) + { + return false; + } + designedForVersion = new Version(designedVersionNode.InnerText); + break; //Break cause we only check first instance?? + } + + CheckLoadedAssemblies(); + Version lastFullyBreakingVersion; + + if (CompareVersions(AppVersion, minRequiredVersion) < 0 || // MP version is too old + (SubSystemVersions.TryGetValue("*", out lastFullyBreakingVersion) && + CompareVersions(lastFullyBreakingVersion, designedForVersion) > 0)) // MP breaking version after plugin released + { + return false; + } + + List<string> subsystemsUsed = new List<string>(); + XmlNode subsystemNode = rootNode.SelectSingleNode("SubSystemsUsed/Items"); + if (subsystemNode == null) + { + return false; + } + foreach (XmlNode node in subsystemNode.ChildNodes) + { + XmlAttribute nameAttrib = node.Attributes["Name"]; + if(nameAttrib == null || string.IsNullOrEmpty(nameAttrib.InnerText)) + { + continue; + } + subsystemsUsed.Add(nameAttrib.InnerText); + } + + if (subsystemsUsed.Count == 0) + { + return true; + } + + Version ver; + // Have all used subsystem known versions and prior to the one the plugin was designed for? + return subsystemsUsed.All(attr => SubSystemVersions.TryGetValue(attr, out ver) && CompareVersions(ver, designedForVersion) <= 0); + } + } +} Deleted: branches/Common-MP-TVE3-experimental/Common.Utils/Compatibility/CompatibleVersionAttribute.cs =================================================================== --- branches/Common-MP-TVE3-experimental/Common.Utils/Compatibility/CompatibleVersionAttribute.cs 2011-12-11 13:11:38 UTC (rev 28338) +++ branches/Common-MP-TVE3-experimental/Common.Utils/Compatibility/CompatibleVersionAttribute.cs 2011-12-17 11:25:43 UTC (rev 28341) @@ -1,74 +0,0 @@ -#region Copyright (C) 2005-2010 Team MediaPortal - -// Copyright (C) 2005-2010 Team MediaPortal -// http://www.team-mediaportal.com -// -// MediaPortal is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 2 of the License, or -// (at your option) any later version. -// -// MediaPortal is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>. - -#endregion - -using System; - -namespace MediaPortal.Common.Utils -{ - [AttributeUsage(AttributeTargets.Class | AttributeTargets.Assembly, AllowMultiple = false)] - public class CompatibleVersionAttribute : Attribute - { - public static readonly Version OwnAssemblyVersion = new Version("0.0.0.0"); - private readonly Version _designedForVersion; - private readonly Version _minRequiredVersion; - - - pr... [truncated message content] |
|
From: <seb...@su...> - 2011-12-11 19:02:17
|
Author: sebastiii Date: 2011-12-11 20:02:10 +0100 (Sun, 11 Dec 2011) New Revision: 28340 Added: branches/TVEngine3-Experimental/TVEngine3/ branches/TVEngine3-Experimental/TVEngine3/MPWebGuide/ branches/TVEngine3-Experimental/TVEngine3/Mediaportal/ Removed: branches/TVEngine3-Experimental/MPWebGuide/ branches/TVEngine3-Experimental/Mediaportal/ Log: Move folder in sub folder TVEngine3 Property changes on: branches/TVEngine3-Experimental/TVEngine3 ___________________________________________________________________ Added: bugtraq:number + true |
|
From: <seb...@su...> - 2011-12-11 18:03:16
|
Author: sebastiii Date: 2011-12-11 19:03:09 +0100 (Sun, 11 Dec 2011) New Revision: 28339 Added: branches/Common-MP-TVE3-experimental/Common-MP-TVE3/ branches/Common-MP-TVE3-experimental/Common-MP-TVE3/Common.Utils/ branches/Common-MP-TVE3-experimental/Common-MP-TVE3/DirectShowLib/ branches/Common-MP-TVE3-experimental/Common-MP-TVE3/OsInfo/ branches/Common-MP-TVE3-experimental/Common-MP-TVE3/PowerScheduler.Interfaces/ branches/Common-MP-TVE3-experimental/Common-MP-TVE3/SolutionInfo.cs Removed: branches/Common-MP-TVE3-experimental/Common.Utils/ branches/Common-MP-TVE3-experimental/DirectShowLib/ branches/Common-MP-TVE3-experimental/OsInfo/ branches/Common-MP-TVE3-experimental/PowerScheduler.Interfaces/ branches/Common-MP-TVE3-experimental/SolutionInfo.cs Log: Move folder in sub folder Common-MP-TVE3 Property changes on: branches/Common-MP-TVE3-experimental/Common-MP-TVE3 ___________________________________________________________________ Added: bugtraq:number + true Copied: branches/Common-MP-TVE3-experimental/Common-MP-TVE3/SolutionInfo.cs (from rev 28338, branches/Common-MP-TVE3-experimental/SolutionInfo.cs) =================================================================== --- branches/Common-MP-TVE3-experimental/Common-MP-TVE3/SolutionInfo.cs (rev 0) +++ branches/Common-MP-TVE3-experimental/Common-MP-TVE3/SolutionInfo.cs 2011-12-11 18:03:09 UTC (rev 28339) @@ -0,0 +1,57 @@ +#region Copyright (C) 2005-2011 Team MediaPortal + +// Copyright (C) 2005-2011 Team MediaPortal +// http://www.team-mediaportal.com +// +// MediaPortal is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 2 of the License, or +// (at your option) any later version. +// +// MediaPortal is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>. + +#endregion + +using System; +using System.Reflection; +//using MediaPortal.Common.Utils; + +// +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +// +// These attributes apply to all assemblies in the solution +#if DEBUG + +[assembly: AssemblyConfiguration("Debug version")] +#else +[assembly: AssemblyConfiguration("")] +#endif + +[assembly: AssemblyCompany("Team MediaPortal")] +[assembly: AssemblyProduct("MediaPortal")] +[assembly: AssemblyCopyright("Copyright © 2005-2011 Team MediaPortal")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Revision and Build Numbers +// by using the '*' as shown below: + +[assembly: AssemblyVersion("1.2.0.0")] +[assembly: AssemblyFileVersion("1.2.0.0")] + +//[assembly: CompatibleVersion("1.1.8.*", "1.1.8.*")] Deleted: branches/Common-MP-TVE3-experimental/SolutionInfo.cs =================================================================== --- branches/Common-MP-TVE3-experimental/SolutionInfo.cs 2011-12-11 13:11:38 UTC (rev 28338) +++ branches/Common-MP-TVE3-experimental/SolutionInfo.cs 2011-12-11 18:03:09 UTC (rev 28339) @@ -1,57 +0,0 @@ -#region Copyright (C) 2005-2011 Team MediaPortal - -// Copyright (C) 2005-2011 Team MediaPortal -// http://www.team-mediaportal.com -// -// MediaPortal is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 2 of the License, or -// (at your option) any later version. -// -// MediaPortal is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>. - -#endregion - -using System; -using System.Reflection; -//using MediaPortal.Common.Utils; - -// -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -// -// These attributes apply to all assemblies in the solution -#if DEBUG - -[assembly: AssemblyConfiguration("Debug version")] -#else -[assembly: AssemblyConfiguration("")] -#endif - -[assembly: AssemblyCompany("Team MediaPortal")] -[assembly: AssemblyProduct("MediaPortal")] -[assembly: AssemblyCopyright("Copyright © 2005-2011 Team MediaPortal")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Revision and Build Numbers -// by using the '*' as shown below: - -[assembly: AssemblyVersion("1.2.0.0")] -[assembly: AssemblyFileVersion("1.2.0.0")] - -//[assembly: CompatibleVersion("1.1.8.*", "1.1.8.*")] |
|
From: <gib...@su...> - 2011-12-11 13:11:46
|
Author: gibman_dk
Date: 2011-12-11 14:11:38 +0100 (Sun, 11 Dec 2011)
New Revision: 28338
Modified:
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/TCPEventServer/TCPServer.cs
Log:
tcpserver small code cleanups.
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/TCPEventServer/TCPServer.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/TCPEventServer/TCPServer.cs 2011-12-10 19:24:26 UTC (rev 28337)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/TCPEventServer/TCPServer.cs 2011-12-11 13:11:38 UTC (rev 28338)
@@ -159,7 +159,6 @@
private byte[] PrepareChannelStateEvent(TvServerEventArgs tvServerEventArgs, TCPClientData tcpClientData)
{
- byte[] data;
IUser user = new User(tcpClientData.Name, false);
bool isTimeShifting = ServiceManager.Instance.InternalControllerService.IsTimeShifting(ref user);
if (isTimeShifting)
@@ -170,7 +169,7 @@
{
tvServerEventArgs.User.ChannelStates = ServiceManager.Instance.InternalControllerService.GetAllChannelStatesForIdleUserCached();
}
- data = TvServerEventArgsTranslator.ToBinary(tvServerEventArgs);
+ byte[] data = TvServerEventArgsTranslator.ToBinary(tvServerEventArgs);
return data;
}
@@ -223,9 +222,8 @@
StopHeartbeatThread();
_evtHeartbeatCtrl.Reset();
- _heartBeatMonitorThread = new Thread(HeartBeatMonitorThread);
- _heartBeatMonitorThread.Name = "HeartBeatMonitorThread";
- _heartBeatMonitorThread.IsBackground = true;
+ _heartBeatMonitorThread = new Thread(HeartBeatMonitorThread)
+ {Name = "HeartBeatMonitorThread", IsBackground = true};
_heartBeatMonitorThread.Start();
}
@@ -248,9 +246,8 @@
StopClientsNotificationsThread();
_evtNotificationsCtrl.Reset();
- _clientsNotificationThread = new Thread(ClientsNotificationsQueueThread);
- _clientsNotificationThread.Name = "ClientsNotificationsThread";
- _clientsNotificationThread.IsBackground = true;
+ _clientsNotificationThread = new Thread(ClientsNotificationsQueueThread)
+ {Name = "ClientsNotificationsThread", IsBackground = true};
_clientsNotificationThread.Start();
}
@@ -270,7 +267,7 @@
private void _tvController_OnTvServerEvent(object sender, EventArgs eventArgs)
{
- TvServerEventArgs tvEvent = eventArgs as TvServerEventArgs;
+ var tvEvent = eventArgs as TvServerEventArgs;
if (tvEvent != null)
{
@@ -292,7 +289,7 @@
{
while (!_evtNotificationsCtrl.WaitOne(1))
{
- IList<TvServerEventArgs> notificationsQueueCopy = new List<TvServerEventArgs>();
+ IList<TvServerEventArgs> notificationsQueueCopy;
lock (_notificationLock)
{
notificationsQueueCopy = new List<TvServerEventArgs>(_notificationsQueue);
@@ -314,9 +311,6 @@
}
}
-
-
-
bool isQueueEmpty;
lock (_notificationLock)
{
@@ -385,19 +379,18 @@
private void HandleClientComm(object client)
{
- TcpClient tcpClient = (TcpClient)client;
+ var tcpClient = (TcpClient)client;
NetworkStream clientStream = tcpClient.GetStream();
- byte[] message = new byte[4096];
- int bytesRead;
+ var message = new byte[4096];
- IPEndPoint endPoint = (IPEndPoint)tcpClient.Client.RemoteEndPoint;
+ var endPoint = (IPEndPoint)tcpClient.Client.RemoteEndPoint;
IPAddress ipAddress = endPoint.Address;
IPHostEntry hostEntry = Dns.GetHostEntry(ipAddress);
string clientHostName = hostEntry.HostName;
while (!_evtTCPCtrl.WaitOne(1))
{
- bytesRead = 0;
+ int bytesRead = 0;
try
{
//blocks until a client sends a message
@@ -416,16 +409,15 @@
break;
}
- TCPClientData existingClient;
lock (_clientsLock)
{
- existingClient = _clients.Find(t => t.Name.Equals(clientHostName));
+ TCPClientData existingClient = _clients.Find(t => t.Name.Equals(clientHostName));
if (existingClient != null)
{
Log.Debug("TCPServer.HandleClientComm: updating heartbeat for user: {0}", clientHostName);
existingClient.LastSeen = DateTime.Now;
}
- }
+ }
}
Log.Info("TCPServer: HandleClientComm stopped for host: {0}", clientHostName);
}
@@ -449,7 +441,6 @@
private void AddClient(TcpClient client)
{
-
string name = GetClientName(client);
lock (_clientsLock)
{
|
|
From: <gib...@su...> - 2011-12-10 19:24:35
|
Author: gibman_dk
Date: 2011-12-10 20:24:26 +0100 (Sat, 10 Dec 2011)
New Revision: 28337
Modified:
branches/Common-MP-TVE3-experimental/Common.Utils/GlobalServiceProvider.cs
branches/Common-MP-TVE3-experimental/Common.Utils/ServiceProvider.cs
Log:
serviceprovider alternative add impl.
Modified: branches/Common-MP-TVE3-experimental/Common.Utils/GlobalServiceProvider.cs
===================================================================
--- branches/Common-MP-TVE3-experimental/Common.Utils/GlobalServiceProvider.cs 2011-12-07 11:59:11 UTC (rev 28336)
+++ branches/Common-MP-TVE3-experimental/Common.Utils/GlobalServiceProvider.cs 2011-12-10 19:24:26 UTC (rev 28337)
@@ -77,6 +77,16 @@
}
/// <summary>
+ /// Adds the specified service.
+ /// </summary>
+ /// <param name="serviceInterface"></param>
+ /// <param name="service">The service.</param>
+ public static void Add<T>(Type serviceInterface, T service)
+ {
+ _instance.Add(serviceInterface, service);
+ }
+
+ /// <summary>
/// Determines whether this instance is registered.
/// </summary>
/// <returns>
Modified: branches/Common-MP-TVE3-experimental/Common.Utils/ServiceProvider.cs
===================================================================
--- branches/Common-MP-TVE3-experimental/Common.Utils/ServiceProvider.cs 2011-12-07 11:59:11 UTC (rev 28336)
+++ branches/Common-MP-TVE3-experimental/Common.Utils/ServiceProvider.cs 2011-12-10 19:24:26 UTC (rev 28337)
@@ -76,6 +76,21 @@
services.Add(t, service);
}
+ public void Add<T>(Type serviceInterface, T service)
+ {
+ object o = null;
+ if (services.TryGetValue(serviceInterface, out o))
+ {
+ /*if (!(o is ServiceCreatorCallback<T>))
+ {
+ throw new ArgumentException(string.Format("A service of type {0} is already present", t.ToString()));
+ }*/
+ services[serviceInterface] = service;
+ return;
+ }
+ services.Add(serviceInterface, service);
+ }
+
/// <summary>
/// Registes a new service to the ServiceProvider.
/// </summary>
|
|
From: <gib...@su...> - 2011-12-07 11:59:23
|
Author: gibman_dk
Date: 2011-12-07 12:59:11 +0100 (Wed, 07 Dec 2011)
New Revision: 28336
Modified:
branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/WebEPG/WebEPG/WebEPG.csproj
branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/WebEPG/WebEPGPlugin/Config/WebEPGConfigControl.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/WebEPG/WebEPGPlugin/Config/WebEPGMappingControl.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Service1.cs
Log:
webEPG now works in setuptv.
changed assembly name.
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/WebEPG/WebEPG/WebEPG.csproj
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/WebEPG/WebEPG/WebEPG.csproj 2011-12-07 11:16:37 UTC (rev 28335)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/WebEPG/WebEPG/WebEPG.csproj 2011-12-07 11:59:11 UTC (rev 28336)
@@ -11,7 +11,7 @@
</ApplicationIcon>
<AssemblyKeyContainerName>
</AssemblyKeyContainerName>
- <AssemblyName>WebEPG</AssemblyName>
+ <AssemblyName>Mediaportal.TV.Server.Plugins.WebEPG</AssemblyName>
<AssemblyOriginatorKeyFile>
</AssemblyOriginatorKeyFile>
<DefaultClientScript>JScript</DefaultClientScript>
@@ -19,7 +19,7 @@
<DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign>
<OutputType>Library</OutputType>
- <RootNamespace>WebEPG</RootNamespace>
+ <RootNamespace>Mediaportal.TV.Server.Plugins.WebEPG</RootNamespace>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<StartupObject>
</StartupObject>
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/WebEPG/WebEPGPlugin/Config/WebEPGConfigControl.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/WebEPG/WebEPGPlugin/Config/WebEPGConfigControl.cs 2011-12-07 11:16:37 UTC (rev 28335)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/WebEPG/WebEPGPlugin/Config/WebEPGConfigControl.cs 2011-12-07 11:59:11 UTC (rev 28336)
@@ -125,7 +125,7 @@
Initialize();
- switch (SettingsManagement.GetSetting("webepgDestination", "db").value)
+ switch (ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("webepgDestination", "db").value)
{
case "db":
DestinationComboBox.SelectedIndex = 0;
@@ -141,15 +141,15 @@
break;
}
- textBoxFolder.Text = SettingsManagement.GetSetting("webepgDestinationFolder").value;
- checkBoxDeleteBeforeImport.Checked = Convert.ToBoolean(SettingsManagement.GetSetting("webepgDeleteBeforeImport", "true").value);
+ textBoxFolder.Text = ServiceAgents.SettingServiceAgent.GetSetting("webepgDestinationFolder").value;
+ checkBoxDeleteBeforeImport.Checked = Convert.ToBoolean(ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("webepgDeleteBeforeImport", "true").value);
LoadWebepgConfigFile();
//RedrawList(null);
// Schedule
- ScheduleGrabCheckBox.Checked = Convert.ToBoolean(SettingsManagement.GetSetting("webepgScheduleEnabled", "true").value);
- EPGWakeupConfig config = new EPGWakeupConfig(SettingsManagement.GetSetting("webepgSchedule", String.Empty).value);
+ ScheduleGrabCheckBox.Checked = Convert.ToBoolean(ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("webepgScheduleEnabled", "true").value);
+ EPGWakeupConfig config = new EPGWakeupConfig(ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("webepgSchedule", String.Empty).value);
foreach (EPGGrabDays day in config.Days)
{
switch (day)
@@ -227,13 +227,13 @@
break;
}
- SettingsManagement.SaveSetting("webepgDestination", value);
- SettingsManagement.SaveSetting("webepgDestinationFolder", textBoxFolder.Text);
- SettingsManagement.SaveSetting("webepgDeleteBeforeImport", checkBoxDeleteBeforeImport.Checked ? "true" : "false");
- SettingsManagement.SaveSetting("webepgScheduleEnabled", ScheduleGrabCheckBox.Checked ? "true" : "false");
+ ServiceAgents.SettingServiceAgent.SaveSetting("webepgDestination", value);
+ ServiceAgents.SettingServiceAgent.SaveSetting("webepgDestinationFolder", textBoxFolder.Text);
+ ServiceAgents.SettingServiceAgent.SaveSetting("webepgDeleteBeforeImport", checkBoxDeleteBeforeImport.Checked ? "true" : "false");
+ ServiceAgents.SettingServiceAgent.SaveSetting("webepgScheduleEnabled", ScheduleGrabCheckBox.Checked ? "true" : "false");
- Setting setting = SettingsManagement.GetSetting("webepgSchedule", String.Empty);
+ Setting setting = ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("webepgSchedule", String.Empty);
EPGWakeupConfig cfg = new EPGWakeupConfig(setting.value);
EPGWakeupConfig newcfg = new EPGWakeupConfig();
newcfg.Hour = cfg.Hour;
@@ -253,7 +253,7 @@
if (!cfg.Equals(newcfg))
{
- SettingsManagement.SaveSetting("webepgSchedule", newcfg.SerializeAsString());
+ ServiceAgents.SettingServiceAgent.SaveSetting("webepgSchedule", newcfg.SerializeAsString());
}
}
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/WebEPG/WebEPGPlugin/Config/WebEPGMappingControl.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/WebEPG/WebEPGPlugin/Config/WebEPGMappingControl.cs 2011-12-07 11:16:37 UTC (rev 28335)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/WebEPG/WebEPGPlugin/Config/WebEPGMappingControl.cs 2011-12-07 11:59:11 UTC (rev 28336)
@@ -30,6 +30,7 @@
using Mediaportal.TV.Server.TVLibrary.Interfaces.Logging;
using System.Globalization;
+using Mediaportal.TV.Server.TVService.ServiceAgents;
using WebEPG.config.WebEPG;
using ChannelMap = WebEPG.config.WebEPG.ChannelMap;
//using System.Data;
@@ -115,7 +116,7 @@
GroupComboBox.Tag = "";
if (IsTvMapping)
{
- IList<ChannelGroup> channelGroups = ChannelGroupManagement.ListAllChannelGroups();
+ IList<ChannelGroup> channelGroups = ServiceAgents.ChannelGroupServiceAgent.ListAllChannelGroups();
foreach (ChannelGroup cg in channelGroups)
{
GroupComboBox.Items.Add(new CBChannelGroup(cg.groupName, cg.idGroup));
@@ -123,7 +124,7 @@
}
else
{
- IList<ChannelGroup> channelGroups = ChannelGroupManagement.ListAllChannelGroupsByMediaType(MediaTypeEnum.Radio);
+ IList<ChannelGroup> channelGroups = ServiceAgents.ChannelGroupServiceAgent.ListAllChannelGroupsByMediaType(MediaTypeEnum.Radio);
foreach (ChannelGroup cg in channelGroups)
{
GroupComboBox.Items.Add(new CBChannelGroup(cg.groupName, cg.idGroup));
@@ -237,12 +238,12 @@
mediaType = MediaTypeEnum.TV;
}
if (chGroup != null && chGroup.idGroup != -1)
- {
- channels = ChannelManagement.GetAllChannelsByGroupIdAndMediaType(chGroup.idGroup, mediaType);
+ {
+ ServiceAgents.ChannelServiceAgent.GetAllChannelsByGroupIdAndMediaType(chGroup.idGroup, mediaType);
}
else
{
- channels = ChannelManagement.ListAllChannelsByMediaType(mediaType);
+ channels = ServiceAgents.ChannelServiceAgent.ListAllChannelsByMediaType(mediaType);
}
foreach (Channel chan in channels)
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Service1.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Service1.cs 2011-12-07 11:16:37 UTC (rev 28335)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Service1.cs 2011-12-07 11:59:11 UTC (rev 28336)
@@ -881,7 +881,7 @@
public void OnStart()
{
- System.Diagnostics.Debugger.Launch();
+ //System.Diagnostics.Debugger.Launch();
try
{
if (!Started)
|
|
From: <gib...@su...> - 2011-12-07 11:16:44
|
Author: gibman_dk
Date: 2011-12-07 12:16:37 +0100 (Wed, 07 Dec 2011)
New Revision: 28335
Modified:
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/TCPEventServer/TCPServer.cs
Log:
tvservice now stops more quickly. a blocking call in tcpserver was the issue.
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/TCPEventServer/TCPServer.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/TCPEventServer/TCPServer.cs 2011-12-07 11:04:14 UTC (rev 28334)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/TCPEventServer/TCPServer.cs 2011-12-07 11:16:37 UTC (rev 28335)
@@ -104,8 +104,9 @@
StopClientsNotificationsThread();
_evtTCPCtrl.Set();
+ _notificationsQueue.Clear();
- _notificationsQueue.Clear();
+ _tcpListener.Stop();
}
#endregion
|
|
From: <gib...@su...> - 2011-12-07 11:04:28
|
Author: gibman_dk
Date: 2011-12-07 12:04:14 +0100 (Wed, 07 Dec 2011)
New Revision: 28334
Modified:
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/CardManagement/CardAllocation/AdvancedCardAllocation.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/CardManagement/CardAllocation/AdvancedCardAllocationTicket.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/CardManagement/CardHandler/CardTuner.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/CardManagement/CardReservation/CardReservationHelper.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/CardManagement/CardReservation/Implementations/CardReservationBase.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/CardManagement/CardReservation/Implementations/CardReservationRec.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Epg/EpgCard.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Epg/EpgGrabber.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Scheduler/Scheduler.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Service1.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Services/ServiceManager.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/TCPEventServer/TCPServer.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/TvCardContext.cs
Log:
servicemanager now impl. as a singleton with idisposable for closing wcf services.
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/CardManagement/CardAllocation/AdvancedCardAllocation.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/CardManagement/CardAllocation/AdvancedCardAllocation.cs 2011-12-06 12:32:43 UTC (rev 28333)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/CardManagement/CardAllocation/AdvancedCardAllocation.cs 2011-12-07 11:04:14 UTC (rev 28334)
@@ -59,7 +59,7 @@
bool isCardPresent = false;
try
{
- if (ServiceManager.InternalControllerService.CardPresent(cardId))
+ if (ServiceManager.Instance.InternalControllerService.CardPresent(cardId))
{
isCardPresent = true;
}
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/CardManagement/CardAllocation/AdvancedCardAllocationTicket.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/CardManagement/CardAllocation/AdvancedCardAllocationTicket.cs 2011-12-06 12:32:43 UTC (rev 28333)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/CardManagement/CardAllocation/AdvancedCardAllocationTicket.cs 2011-12-07 11:04:14 UTC (rev 28334)
@@ -50,9 +50,9 @@
{
if (LogEnabled && cardDetail.Card.idCard > 0)
{
- if (ServiceManager.InternalControllerService != null)
+ if (ServiceManager.Instance.InternalControllerService != null)
{
- var card = ServiceManager.InternalControllerService.CardCollection[cardDetail.Card.idCard];
+ var card = ServiceManager.Instance.InternalControllerService.CardCollection[cardDetail.Card.idCard];
Log.Info("Controller: card:{0} type:{1} users: {2}", cardDetail.Card.idCard, card.Type, cardDetail.NumberOfOtherUsers);
}
}
@@ -60,7 +60,7 @@
public ICollection<CardDetail> UpdateFreeCardsForChannelBasedOnTicket(ICollection<CardDetail> cardsAvailable, IUser user, out TvResult result)
{
- IDictionary<int, ITvCardHandler> cards = ServiceManager.InternalControllerService.CardCollection;
+ IDictionary<int, ITvCardHandler> cards = ServiceManager.Instance.InternalControllerService.CardCollection;
var cardetails = new List<CardDetail>();
foreach (CardDetail cardDetail in cardsAvailable)
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/CardManagement/CardHandler/CardTuner.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/CardManagement/CardHandler/CardTuner.cs 2011-12-06 12:32:43 UTC (rev 28333)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/CardManagement/CardHandler/CardTuner.cs 2011-12-07 11:04:14 UTC (rev 28334)
@@ -456,14 +456,14 @@
// if we are stopping an on-going recording/schedule (=admin), we have to make sure that we remove the schedule also.
{
Log.Debug("user is scheduler: {0}", users[i].Name);
- int recScheduleId = ServiceManager.InternalControllerService.GetRecordingSchedule(users[i].CardId,
+ int recScheduleId = ServiceManager.Instance.InternalControllerService.GetRecordingSchedule(users[i].CardId,
users[i].IdChannel);
if (recScheduleId > 0)
{
Schedule schedule = ScheduleManagement.GetSchedule(recScheduleId);
Log.Info("removing schedule with id: {0}", schedule.id_Schedule);
- ServiceManager.InternalControllerService.StopRecordingSchedule(schedule.id_Schedule);
+ ServiceManager.Instance.InternalControllerService.StopRecordingSchedule(schedule.id_Schedule);
ScheduleManagement.DeleteSchedule(schedule.id_Schedule);
}
}
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/CardManagement/CardReservation/CardReservationHelper.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/CardManagement/CardReservation/CardReservationHelper.cs 2011-12-06 12:32:43 UTC (rev 28333)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/CardManagement/CardReservation/CardReservationHelper.cs 2011-12-07 11:04:14 UTC (rev 28334)
@@ -389,7 +389,7 @@
public static ICollection<ICardTuneReservationTicket> RequestCardReservations(IUser user, IEnumerable<CardDetail> availCardsForReservation, ICardReservation cardResImpl, IEnumerable<int> ignoreCards)
{
ICollection<ICardTuneReservationTicket> tickets = new List<ICardTuneReservationTicket>();
- IDictionary<int, ITvCardHandler> cards = ServiceManager.InternalControllerService.CardCollection;
+ IDictionary<int, ITvCardHandler> cards = ServiceManager.Instance.InternalControllerService.CardCollection;
foreach (CardDetail cardDetail in availCardsForReservation)
{
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/CardManagement/CardReservation/Implementations/CardReservationBase.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/CardManagement/CardReservation/Implementations/CardReservationBase.cs 2011-12-06 12:32:43 UTC (rev 28333)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/CardManagement/CardReservation/Implementations/CardReservationBase.cs 2011-12-07 11:04:14 UTC (rev 28334)
@@ -141,7 +141,7 @@
{
if (OnStartCardTune != null)
{
- if (!ServiceManager.InternalControllerService.IsTimeShifting(ref user))
+ if (!ServiceManager.Instance.InternalControllerService.IsTimeShifting(ref user))
{
CleanTimeShiftFiles(tvcard.DataBaseCard.timeshiftingFolder,
String.Format("live{0}-{1}.ts", user.CardId, user.SubChannel));
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/CardManagement/CardReservation/Implementations/CardReservationRec.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/CardManagement/CardReservation/Implementations/CardReservationRec.cs 2011-12-06 12:32:43 UTC (rev 28333)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/CardManagement/CardReservation/Implementations/CardReservationRec.cs 2011-12-07 11:04:14 UTC (rev 28334)
@@ -56,12 +56,12 @@
protected override bool OnStartTune(IUser user)
{
bool startRecordingOnDisc = true;
- if (ServiceManager.InternalControllerService.SupportsSubChannels(_cardInfo.Card.idCard) == false)
+ if (ServiceManager.Instance.InternalControllerService.SupportsSubChannels(_cardInfo.Card.idCard) == false)
{
Log.Write("Scheduler : record, now start timeshift");
string timeshiftFileName = String.Format(@"{0}\live{1}-{2}.ts", _cardInfo.Card.timeshiftingFolder, _cardInfo.Id,
user.SubChannel);
- startRecordingOnDisc = (TvResult.Succeeded == ServiceManager.InternalControllerService.StartTimeShifting(ref user, ref timeshiftFileName));
+ startRecordingOnDisc = (TvResult.Succeeded == ServiceManager.Instance.InternalControllerService.StartTimeShifting(ref user, ref timeshiftFileName));
}
if (startRecordingOnDisc)
@@ -70,7 +70,7 @@
_recDetail.CardInfo = _cardInfo;
Log.Write("Scheduler : record to {0}", _recDetail.FileName);
string fileName = _recDetail.FileName;
- startRecordingOnDisc = (TvResult.Succeeded == ServiceManager.InternalControllerService.StartRecording(ref user, ref fileName));
+ startRecordingOnDisc = (TvResult.Succeeded == ServiceManager.Instance.InternalControllerService.StartRecording(ref user, ref fileName));
if (startRecordingOnDisc)
{
@@ -78,9 +78,9 @@
_recDetail.RecordingStartDateTime = DateTime.Now;
}
}
- if (!startRecordingOnDisc && ServiceManager.InternalControllerService.AllCardsIdle)
+ if (!startRecordingOnDisc && ServiceManager.Instance.InternalControllerService.AllCardsIdle)
{
- ServiceManager.InternalControllerService.EpgGrabberEnabled = true;
+ ServiceManager.Instance.InternalControllerService.EpgGrabberEnabled = true;
}
return startRecordingOnDisc;
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Epg/EpgCard.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Epg/EpgCard.cs 2011-12-06 12:32:43 UTC (rev 28333)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Epg/EpgCard.cs 2011-12-07 11:04:14 UTC (rev 28334)
@@ -103,7 +103,7 @@
_epgTimer.Interval = 30000;
_epgTimer.Elapsed += _epgTimer_Elapsed;
_eventHandler = controller_OnTvServerEvent;
- _dbUpdater = new EpgDBUpdater(ServiceManager.InternalControllerService, "IdleEpgGrabber", true);
+ _dbUpdater = new EpgDBUpdater(ServiceManager.Instance.InternalControllerService, "IdleEpgGrabber", true);
}
#endregion
@@ -156,7 +156,7 @@
return;
}
_state = EpgState.Idle;
- ServiceManager.InternalControllerService.StopGrabbingEpg(_user);
+ ServiceManager.Instance.InternalControllerService.StopGrabbingEpg(_user);
_user.CardId = -1;
_currentTransponder.InUse = false;
return;
@@ -190,13 +190,13 @@
{
Log.Epg("Epg: card:{0} OnEpgReceived but card is not idle", _user.CardId);
_state = EpgState.Idle;
- ServiceManager.InternalControllerService.StopGrabbingEpg(_user);
+ ServiceManager.Instance.InternalControllerService.StopGrabbingEpg(_user);
_user.CardId = -1;
_currentTransponder.InUse = false;
return 0;
}
- List<EpgChannel> epg = ServiceManager.InternalControllerService.Epg(_user.CardId) ?? new List<EpgChannel>();
+ List<EpgChannel> epg = ServiceManager.Instance.InternalControllerService.Epg(_user.CardId) ?? new List<EpgChannel>();
//did we receive epg info?
if (epg.Count == 0)
{
@@ -206,8 +206,8 @@
_currentTransponder.OnTimeOut();
_state = EpgState.Idle;
- ServiceManager.InternalControllerService.StopGrabbingEpg(_user);
- ServiceManager.InternalControllerService.PauseCard(_user);
+ ServiceManager.Instance.InternalControllerService.StopGrabbingEpg(_user);
+ ServiceManager.Instance.InternalControllerService.PauseCard(_user);
_user.CardId = -1;
_currentTransponder.InUse = false;
return 0;
@@ -238,7 +238,7 @@
/// </summary>
public void GrabEpg()
{
- ServiceManager.InternalControllerService.OnTvServerEvent += _eventHandler;
+ ServiceManager.Instance.InternalControllerService.OnTvServerEvent += _eventHandler;
Setting s = SettingsManagement.GetSetting("timeoutEPG", "10");
if (Int32.TryParse(s.value, out _epgTimeOut) == false)
{
@@ -276,13 +276,13 @@
if (_user.CardId >= 0)
{
Log.Epg("EpgCard: card: {0} stop grabbing", _user.CardId);
- ServiceManager.InternalControllerService.StopGrabbingEpg(_user);
+ ServiceManager.Instance.InternalControllerService.StopGrabbingEpg(_user);
}
if (_currentTransponder != null)
{
_currentTransponder.InUse = false;
}
- ServiceManager.InternalControllerService.OnTvServerEvent -= _eventHandler;
+ ServiceManager.Instance.InternalControllerService.OnTvServerEvent -= _eventHandler;
_epgTimer.Enabled = false;
_isRunning = false;
}
@@ -325,7 +325,7 @@
{
Log.Epg("EpgCard: Canceled epg, card is not idle:{0}", _user.CardId);
}
- ServiceManager.InternalControllerService.AbortEPGGrabbing(_user.CardId);
+ ServiceManager.Instance.InternalControllerService.AbortEPGGrabbing(_user.CardId);
_state = EpgState.Idle;
_user.CardId = -1;
_currentTransponder.InUse = false;
@@ -339,7 +339,7 @@
{
//epg grabber timed out. Update database and go back to idle mode
Log.Epg("EpgCard: card: {0} timeout after {1} mins", _user.CardId, ts.TotalMinutes);
- ServiceManager.InternalControllerService.AbortEPGGrabbing(_user.CardId);
+ ServiceManager.Instance.InternalControllerService.AbortEPGGrabbing(_user.CardId);
Log.Epg("EpgCard: Aborted epg grab");
}
else
@@ -383,7 +383,7 @@
Log.Error("Epg: invalid card");
return false;
}
- if (ServiceManager.InternalControllerService == null)
+ if (ServiceManager.Instance.InternalControllerService == null)
{
Log.Error("Epg: invalid tvcontroller");
return false;
@@ -394,7 +394,7 @@
return false;
}
//remove following check to enable multi-card epg grabbing (still beta)
- if (ServiceManager.InternalControllerService.AllCardsIdle == false)
+ if (ServiceManager.Instance.InternalControllerService.AllCardsIdle == false)
{
Log.Epg("Epg: card:{0} cards are not idle", card.idCard);
return false;
@@ -405,7 +405,7 @@
ATSCChannel atscChannel = tuning as ATSCChannel;
if (atscChannel != null)
{
- if (ServiceManager.InternalControllerService.Type(card.idCard) == CardType.Atsc)
+ if (ServiceManager.Instance.InternalControllerService.Type(card.idCard) == CardType.Atsc)
{
if (IsCardIdle(card.idCard) == false)
{
@@ -422,7 +422,7 @@
DVBCChannel dvbcChannel = tuning as DVBCChannel;
if (dvbcChannel != null)
{
- if (ServiceManager.InternalControllerService.Type(card.idCard) == CardType.DvbC)
+ if (ServiceManager.Instance.InternalControllerService.Type(card.idCard) == CardType.DvbC)
{
if (IsCardIdle(card.idCard) == false)
{
@@ -439,7 +439,7 @@
DVBSChannel dvbsChannel = tuning as DVBSChannel;
if (dvbsChannel != null)
{
- if (ServiceManager.InternalControllerService.Type(card.idCard) == CardType.DvbS)
+ if (ServiceManager.Instance.InternalControllerService.Type(card.idCard) == CardType.DvbS)
{
if (IsCardIdle(card.idCard) == false)
{
@@ -456,7 +456,7 @@
DVBTChannel dvbtChannel = tuning as DVBTChannel;
if (dvbtChannel != null)
{
- if (ServiceManager.InternalControllerService.Type(card.idCard) == CardType.DvbT)
+ if (ServiceManager.Instance.InternalControllerService.Type(card.idCard) == CardType.DvbT)
{
if (IsCardIdle(card.idCard) == false)
{
@@ -474,7 +474,7 @@
DVBIPChannel dvbipChannel = tuning as DVBIPChannel;
if (dvbipChannel != null)
{
- if (ServiceManager.InternalControllerService.Type(card.idCard) == CardType.DvbIP)
+ if (ServiceManager.Instance.InternalControllerService.Type(card.idCard) == CardType.DvbIP)
{
if (IsCardIdle(card.idCard) == false)
{
@@ -499,7 +499,7 @@
{
_user.CardId = card.idCard;
ITvCardHandler cardHandler;
- if (ServiceManager.InternalControllerService.CardCollection.TryGetValue(card.idCard, out cardHandler))
+ if (ServiceManager.Instance.InternalControllerService.CardCollection.TryGetValue(card.idCard, out cardHandler))
{
ICardTuneReservationTicket ticket = null;
try
@@ -509,14 +509,14 @@
if (ticket != null)
{
- result = ServiceManager.InternalControllerService.Tune(ref _user, tuning, channel.idChannel, ticket);
+ result = ServiceManager.Instance.InternalControllerService.Tune(ref _user, tuning, channel.idChannel, ticket);
if (result == TvResult.Succeeded)
{
- if (!_isRunning || false == ServiceManager.InternalControllerService.GrabEpg(this, card.idCard))
+ if (!_isRunning || false == ServiceManager.Instance.InternalControllerService.GrabEpg(this, card.idCard))
{
if (!_isRunning)
Log.Epg("Tuning finished but EpgGrabber no longer enabled");
- ServiceManager.InternalControllerService.StopGrabbingEpg(_user);
+ ServiceManager.Instance.InternalControllerService.StopGrabbingEpg(_user);
_user.CardId = -1;
Log.Epg("Epg: card:{0} could not start dvbt grabbing", card.idCard);
return false;
@@ -596,13 +596,13 @@
}
if (_state != EpgState.Idle && _user.CardId >= 0)
{
- ServiceManager.InternalControllerService.StopGrabbingEpg(_user);
- ServiceManager.InternalControllerService.PauseCard(_user);
+ ServiceManager.Instance.InternalControllerService.StopGrabbingEpg(_user);
+ ServiceManager.Instance.InternalControllerService.PauseCard(_user);
}
_currentTransponder.InUse = false;
_state = EpgState.Idle;
_user.CardId = -1;
- ServiceManager.InternalControllerService.Fire(this, new TvServerEventArgs(TvServerEventType.ProgramUpdated));
+ ServiceManager.Instance.InternalControllerService.Fire(this, new TvServerEventArgs(TvServerEventType.ProgramUpdated));
}
}
@@ -623,16 +623,16 @@
return false;
IUser user = new User();
user.CardId = cardId;
- if (ServiceManager.InternalControllerService.IsRecording(ref user))
+ if (ServiceManager.Instance.InternalControllerService.IsRecording(ref user))
return false;
- if (ServiceManager.InternalControllerService.IsTimeShifting(ref user))
+ if (ServiceManager.Instance.InternalControllerService.IsTimeShifting(ref user))
return false;
- if (ServiceManager.InternalControllerService.IsScanning(user.CardId))
+ if (ServiceManager.Instance.InternalControllerService.IsScanning(user.CardId))
return false;
IUser cardUser;
- if (ServiceManager.InternalControllerService.IsCardInUse(cardId, out cardUser))
+ if (ServiceManager.Instance.InternalControllerService.IsCardInUse(cardId, out cardUser))
return false;
- if (ServiceManager.InternalControllerService.IsCardInUse(user.CardId, out cardUser))
+ if (ServiceManager.Instance.InternalControllerService.IsCardInUse(user.CardId, out cardUser))
{
if (cardUser != null)
{
@@ -654,14 +654,14 @@
return false;
if (user.CardId < 0)
return false;
- if (ServiceManager.InternalControllerService.IsRecording(ref _user))
+ if (ServiceManager.Instance.InternalControllerService.IsRecording(ref _user))
return false;
- if (ServiceManager.InternalControllerService.IsTimeShifting(ref _user))
+ if (ServiceManager.Instance.InternalControllerService.IsTimeShifting(ref _user))
return false;
- if (ServiceManager.InternalControllerService.IsScanning(user.CardId))
+ if (ServiceManager.Instance.InternalControllerService.IsScanning(user.CardId))
return false;
IUser cardUser;
- if (ServiceManager.InternalControllerService.IsCardInUse(user.CardId, out cardUser))
+ if (ServiceManager.Instance.InternalControllerService.IsCardInUse(user.CardId, out cardUser))
{
if (cardUser != null)
{
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Epg/EpgGrabber.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Epg/EpgGrabber.cs 2011-12-06 12:32:43 UTC (rev 28333)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Epg/EpgGrabber.cs 2011-12-07 11:04:14 UTC (rev 28334)
@@ -141,7 +141,7 @@
try
{
RemoteControl.HostName = SettingsManagement.GetSetting("hostname").value;
- if (!ServiceManager.InternalControllerService.CardPresent(card.idCard))
+ if (!ServiceManager.Instance.InternalControllerService.CardPresent(card.idCard))
{
continue;
}
@@ -242,7 +242,7 @@
}
catch (InvalidOperationException) {}
- if (ServiceManager.InternalControllerService.AllCardsIdle == false)
+ if (ServiceManager.Instance.InternalControllerService.AllCardsIdle == false)
return;
foreach (EpgCard card in _epgCards)
{
@@ -251,7 +251,7 @@
return;
if (card.IsGrabbing)
continue;
- if (ServiceManager.InternalControllerService.AllCardsIdle == false)
+ if (ServiceManager.Instance.InternalControllerService.AllCardsIdle == false)
return;
GrabEpgOnCard(card);
}
@@ -272,7 +272,7 @@
/// <param name="epgCard">The epg card.</param>
private void GrabEpgOnCard(EpgCard epgCard)
{
- CardType type = ServiceManager.InternalControllerService.Type(epgCard.Card.idCard);
+ CardType type = ServiceManager.Instance.InternalControllerService.Type(epgCard.Card.idCard);
//skip analog and webstream cards
if (type == CardType.Analog || type == CardType.RadioWebStream)
return;
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Scheduler/Scheduler.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Scheduler/Scheduler.cs 2011-12-06 12:32:43 UTC (rev 28333)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Scheduler/Scheduler.cs 2011-12-07 11:04:14 UTC (rev 28334)
@@ -414,7 +414,7 @@
private void CheckAndDeleteOrphanedRecordings()
{
- List<IVirtualCard> vCards = ServiceManager.InternalControllerService.GetAllRecordingCards();
+ List<IVirtualCard> vCards = ServiceManager.Instance.InternalControllerService.GetAllRecordingCards();
foreach (VirtualCard vCard in vCards)
{
@@ -575,7 +575,7 @@
IUser user = newRecording.User;
- ServiceManager.InternalControllerService.Fire(this,
+ ServiceManager.Instance.InternalControllerService.Fire(this,
new TvServerEventArgs(TvServerEventType.ScheduleDeleted,
new VirtualCard(user), (User)user,
newRecording.Schedule.Entity.id_Schedule,
@@ -984,13 +984,13 @@
user, out tvResult);
CardReservationHelper.CancelCardReservationsExceedingMaxConcurrentTickets(tickets, cards,
- ServiceManager.InternalControllerService.CardCollection);
+ ServiceManager.Instance.InternalControllerService.CardCollection);
CardReservationHelper.CancelCardReservationsNotFoundInFreeCards(cardsForReservation, tickets,
cards,
- ServiceManager.InternalControllerService.CardCollection);
+ ServiceManager.Instance.InternalControllerService.CardCollection);
int maxCards = GetMaxCards(cards);
CardReservationHelper.CancelCardReservationsBasedOnMaxCardsLimit(tickets, cards, maxCards,
- ServiceManager.InternalControllerService.CardCollection);
+ ServiceManager.Instance.InternalControllerService.CardCollection);
UpdateCardsIterated(cardsIterated, cards); //keep track of what cards have been iterated here.
if (cards != null && cards.Count > 0)
@@ -1008,7 +1008,7 @@
}
finally
{
- CardReservationHelper.CancelAllCardReservations(tickets, ServiceManager.InternalControllerService.CardCollection);
+ CardReservationHelper.CancelAllCardReservations(tickets, ServiceManager.Instance.InternalControllerService.CardCollection);
}
}
@@ -1049,7 +1049,7 @@
private void StartRecordOnFreeCard(RecordingDetail recDetail, ref IUser user)
{
var cardAllocationStatic = new AdvancedCardAllocationStatic();
- List<CardDetail> freeCardsForReservation = cardAllocationStatic.GetFreeCardsForChannel(ServiceManager.InternalControllerService.CardCollection, recDetail.Channel, ref user);
+ List<CardDetail> freeCardsForReservation = cardAllocationStatic.GetFreeCardsForChannel(ServiceManager.Instance.InternalControllerService.CardCollection, recDetail.Channel, ref user);
StartRecordOnCard(recDetail, ref user, freeCardsForReservation);
}
@@ -1074,7 +1074,7 @@
{
ITvCardHandler tvCardHandler;
CardDetail cardInfo = GetCardInfoForRecording(cards);
- if (ServiceManager.InternalControllerService.CardCollection.TryGetValue(cardInfo.Id, out tvCardHandler))
+ if (ServiceManager.Instance.InternalControllerService.CardCollection.TryGetValue(cardInfo.Id, out tvCardHandler))
{
ICardTuneReservationTicket ticket = GetTicketByCardId(tickets, cardInfo.Id);
@@ -1128,7 +1128,7 @@
try
{
cardInfo = GetCardInfoForRecording(cards);
- if (ServiceManager.InternalControllerService.CardCollection.TryGetValue(cardInfo.Id, out tvCardHandler))
+ if (ServiceManager.Instance.InternalControllerService.CardCollection.TryGetValue(cardInfo.Id, out tvCardHandler))
{
ICardTuneReservationTicket ticket = GetTicketByCardId(tickets, cardInfo.Id);
if (ticket != null)
@@ -1209,18 +1209,18 @@
{
IUser user = recording.User;
- if (recording.CardInfo != null && ServiceManager.InternalControllerService.SupportsSubChannels(recording.CardInfo.Id) == false)
+ if (recording.CardInfo != null && ServiceManager.Instance.InternalControllerService.SupportsSubChannels(recording.CardInfo.Id) == false)
{
- ServiceManager.InternalControllerService.StopTimeShifting(ref user);
+ ServiceManager.Instance.InternalControllerService.StopTimeShifting(ref user);
}
Log.Write("Scheduler: stop failed record {0} {1}-{2} {3}", recording.Channel.displayName,
recording.RecordingStartDateTime,
recording.EndTime, recording.Schedule.Entity.programName);
- if (ServiceManager.InternalControllerService.IsRecording(ref user))
+ if (ServiceManager.Instance.InternalControllerService.IsRecording(ref user))
{
- if (ServiceManager.InternalControllerService.StopRecording(ref user))
+ if (ServiceManager.Instance.InternalControllerService.StopRecording(ref user))
{
ResetRecordingStateOnProgram(recording);
if (recording.Recording != null)
@@ -1314,7 +1314,7 @@
Log.Write(
"Scheduler : kicking user:{0}",
timeshiftingUser.Name);
- ServiceManager.InternalControllerService.StopTimeShifting(ref timeshiftingUser, TvStoppedReason.RecordingStarted);
+ ServiceManager.Instance.InternalControllerService.StopTimeShifting(ref timeshiftingUser, TvStoppedReason.RecordingStarted);
Log.Write(
"Scheduler : card is tuned to the same transponder but not free. record on card:{0} priority:{1}, kicking user:{2}",
@@ -1355,7 +1355,7 @@
Log.Write(
"Scheduler : card is tuned to the same transponder but not free. record on card:{0} priority:{1}, kicking user:{2}",
cardDetail.Id, cardDetail.Card.priority, timeshiftingUser.Name);
- ServiceManager.InternalControllerService.StopTimeShifting(ref timeshiftingUser, TvStoppedReason.RecordingStarted);
+ ServiceManager.Instance.InternalControllerService.StopTimeShifting(ref timeshiftingUser, TvStoppedReason.RecordingStarted);
cardInfo = cardDetail;
break;
@@ -1366,7 +1366,7 @@
private void RecordingFailedNotification(RecordingDetail recDetail)
{
IUser user = recDetail.User;
- ServiceManager.InternalControllerService.Fire(this,
+ ServiceManager.Instance.InternalControllerService.Fire(this,
new TvServerEventArgs(TvServerEventType.RecordingFailed, new VirtualCard(user), (User)user));
}
@@ -1374,7 +1374,7 @@
private void RecordingStartedNotification(RecordingDetail recDetail)
{
IUser user = recDetail.User;
- ServiceManager.InternalControllerService.Fire(this,
+ ServiceManager.Instance.InternalControllerService.Fire(this,
new TvServerEventArgs(TvServerEventType.RecordingStarted, new VirtualCard(user), (User)user,
recDetail.Schedule.Entity.id_Schedule, recDetail.Recording.idRecording));
}
@@ -1382,7 +1382,7 @@
private void StartRecordingNotification(RecordingDetail recDetail)
{
IUser user = recDetail.User;
- ServiceManager.InternalControllerService.Fire(this,
+ ServiceManager.Instance.InternalControllerService.Fire(this,
new TvServerEventArgs(TvServerEventType.StartRecording, new VirtualCard(user), (User)user,
recDetail.Schedule.Entity.id_Schedule, -1));
}
@@ -1402,13 +1402,13 @@
private bool StartRecordingOnDisc(RecordingDetail recDetail, ref IUser user, CardDetail cardInfo, ICardTuneReservationTicket ticket, CardReservationRec cardResImpl)
{
bool startRecordingOnDisc = false;
- ServiceManager.InternalControllerService.EpgGrabberEnabled = false;
+ ServiceManager.Instance.InternalControllerService.EpgGrabberEnabled = false;
Log.Write("Scheduler : record, first tune to channel");
cardResImpl.CardInfo = cardInfo;
cardResImpl.RecDetail = recDetail;
- TvResult tuneResult = ServiceManager.InternalControllerService.Tune(ref user, cardInfo.TuningDetail, recDetail.Channel.idChannel, ticket, cardResImpl);
+ TvResult tuneResult = ServiceManager.Instance.InternalControllerService.Tune(ref user, cardInfo.TuningDetail, recDetail.Channel.idChannel, ticket, cardResImpl);
startRecordingOnDisc = (tuneResult == TvResult.Succeeded);
return startRecordingOnDisc;
@@ -1447,16 +1447,16 @@
{
IUser user = recDetail.User;
int cardId = user.CardId;
- if (ServiceManager.InternalControllerService.SupportsQualityControl(cardId))
+ if (ServiceManager.Instance.InternalControllerService.SupportsQualityControl(cardId))
{
- if (recDetail.Schedule.BitRateMode != VIDEOENCODER_BITRATE_MODE.NotSet && ServiceManager.InternalControllerService.SupportsBitRate(cardId))
+ if (recDetail.Schedule.BitRateMode != VIDEOENCODER_BITRATE_MODE.NotSet && ServiceManager.Instance.InternalControllerService.SupportsBitRate(cardId))
{
- ServiceManager.InternalControllerService.SetQualityType(cardId, recDetail.Schedule.QualityType);
+ ServiceManager.Instance.InternalControllerService.SetQualityType(cardId, recDetail.Schedule.QualityType);
}
- if (recDetail.Schedule.QualityType != QualityType.NotSet && ServiceManager.InternalControllerService.SupportsBitRateModes(cardId) &&
- ServiceManager.InternalControllerService.SupportsPeakBitRateMode(cardId))
+ if (recDetail.Schedule.QualityType != QualityType.NotSet && ServiceManager.Instance.InternalControllerService.SupportsBitRateModes(cardId) &&
+ ServiceManager.Instance.InternalControllerService.SupportsPeakBitRateMode(cardId))
{
- ServiceManager.InternalControllerService.SetBitRateMode(cardId, recDetail.Schedule.BitRateMode);
+ ServiceManager.Instance.InternalControllerService.SetBitRateMode(cardId, recDetail.Schedule.BitRateMode);
}
}
}
@@ -1503,16 +1503,16 @@
{
IUser user = recording.User;
- if (ServiceManager.InternalControllerService.SupportsSubChannels(recording.CardInfo.Id) == false)
+ if (ServiceManager.Instance.InternalControllerService.SupportsSubChannels(recording.CardInfo.Id) == false)
{
- ServiceManager.InternalControllerService.StopTimeShifting(ref user);
+ ServiceManager.Instance.InternalControllerService.StopTimeShifting(ref user);
}
Log.Write("Scheduler: stop record {0} {1}-{2} {3}", recording.Channel.displayName,
recording.RecordingStartDateTime,
recording.EndTime, recording.Schedule.Entity.programName);
- if (ServiceManager.InternalControllerService.StopRecording(ref user))
+ if (ServiceManager.Instance.InternalControllerService.StopRecording(ref user))
{
ResetRecordingState(recording);
ResetRecordingStateOnProgram(recording);
@@ -1553,7 +1553,7 @@
private void RecordingEndedNotification(RecordingDetail recording)
{
IUser user = recording.User;
- ServiceManager.InternalControllerService.Fire(this,
+ ServiceManager.Instance.InternalControllerService.Fire(this,
new TvServerEventArgs(TvServerEventType.RecordingEnded, new VirtualCard(user), (User)user,
recording.Schedule.Entity.id_Schedule, recording.Recording.idRecording));
}
@@ -1579,7 +1579,7 @@
{
_episodeManagement.OnScheduleEnded(recording.FileName, recording.Schedule.Entity, recording.Program.Entity);
}
- ServiceManager.InternalControllerService.Fire(this,
+ ServiceManager.Instance.InternalControllerService.Fire(this,
new TvServerEventArgs(TvServerEventType.ScheduleDeleted, new VirtualCard(user), (User)user,
recording.Schedule.Entity.id_Schedule, -1));
// now we can safely delete it
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Service1.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Service1.cs 2011-12-06 12:32:43 UTC (rev 28333)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Service1.cs 2011-12-07 11:04:14 UTC (rev 28334)
@@ -173,7 +173,7 @@
{
if (_tvServiceThread == null)
{
- StarServiceManager();
+ //System.Diagnostics.Debugger.Launch();
if (!(args != null && args.Length > 0 && args[0] == "/DEBUG"))
{
@@ -206,15 +206,8 @@
Thread.Sleep(20);
}
}
- }
+ }
- private void StarServiceManager()
- {
- System.Diagnostics.Debugger.Launch();
- ServiceManager.Start();
- //ThreadPool.QueueUserWorkItem(delegate { debug(); });
- }
-
private void debug()
{
/*var rnd = new Random();
@@ -399,14 +392,8 @@
_tvServiceThread.Join();
Log.Write("tvService thread aborted.");
_tvServiceThread = null;
- }
- CloseWCFservice();
- }
-
- private void CloseWCFservice()
- {
- ServiceManager.Close();
- }
+ }
+ }
}
public class TvServiceThread : IPowerEventHandler
@@ -733,7 +720,7 @@
powerStatus == PowerEventType.ResumeSuspend
)
{
- ServiceManager.InternalControllerService.ExecutePendingDeletions();
+ ServiceManager.Instance.InternalControllerService.ExecutePendingDeletions();
// call Recording-folder cleanup, just in case we have empty folders.
}
@@ -749,13 +736,13 @@
{
case PowerEventType.StandBy:
case PowerEventType.Suspend:
- ServiceManager.InternalControllerService.OnSuspend();
+ ServiceManager.Instance.InternalControllerService.OnSuspend();
return true;
case PowerEventType.QuerySuspend:
case PowerEventType.QueryStandBy:
- if (ServiceManager.InternalControllerService != null)
+ if (ServiceManager.Instance.InternalControllerService != null)
{
- if (ServiceManager.InternalControllerService.CanSuspend)
+ if (ServiceManager.Instance.InternalControllerService.CanSuspend)
{
//OnStop();
return true;
@@ -765,13 +752,13 @@
return true;
case PowerEventType.QuerySuspendFailed:
case PowerEventType.QueryStandByFailed:
- if (!ServiceManager.InternalControllerService.EpgGrabberEnabled)
- ServiceManager.InternalControllerService.EpgGrabberEnabled = true;
+ if (!ServiceManager.Instance.InternalControllerService.EpgGrabberEnabled)
+ ServiceManager.Instance.InternalControllerService.EpgGrabberEnabled = true;
return true;
case PowerEventType.ResumeAutomatic:
case PowerEventType.ResumeCritical:
case PowerEventType.ResumeSuspend:
- ServiceManager.InternalControllerService.OnResume();
+ ServiceManager.Instance.InternalControllerService.OnResume();
return true;
}
return true;
@@ -800,13 +787,13 @@
Type interfaceType = tvServerPluginCommunciation.GetServiceInterfaceForContractType;
object instance = tvServerPluginCommunciation.GetServiceInstance;
- ServiceManager.AddService(interfaceType, instance);
+ ServiceManager.Instance.AddService(interfaceType, instance);
}
Log.Info("TV Service: Plugin: {0} started", plugin.Name);
try
{
- plugin.Start(ServiceManager.InternalControllerService);
+ plugin.Start(ServiceManager.Instance.InternalControllerService);
_pluginsStarted.Add(plugin);
}
catch (Exception ex)
@@ -874,9 +861,9 @@
{
_InitializedEvent.Reset();
}
- if (ServiceManager.InternalControllerService != null)
+ if (ServiceManager.Instance.InternalControllerService != null)
{
- ServiceManager.InternalControllerService.DeInit();
+ ServiceManager.Instance.InternalControllerService.DeInit();
}
StopPlugins();
@@ -915,7 +902,7 @@
_powerEventThread.Name = "PowerEventThread";
_powerEventThread.IsBackground = true;
_powerEventThread.Start();
- ServiceManager.InternalControllerService.Init();
+ ServiceManager.Instance.InternalControllerService.Init();
StartPlugins();
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Services/ServiceManager.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Services/ServiceManager.cs 2011-12-06 12:32:43 UTC (rev 28333)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Services/ServiceManager.cs 2011-12-07 11:04:14 UTC (rev 28334)
@@ -11,57 +11,44 @@
namespace Mediaportal.TV.Server.TVService.Services
{
- public static class ServiceManager
+ public class ServiceManager : IDisposable
{
- private static readonly object _lock = new object();
- private static readonly IDictionary<Type, ServiceHost> _serviceHosts = new Dictionary<Type, ServiceHost>();
-
- /*private static readonly IDictionary<Type, Type> _staticMappings = new Dictionary<Type, Type>
+ private readonly object _lock = new object();
+ private readonly IDictionary<Type, ServiceHost> _serviceHosts = new Dictionary<Type, ServiceHost>();
+ private static ServiceManager _instance;
+ private static readonly object _instanceLock = new object();
+
+
+ public static ServiceManager Instance
+ {
+ get
+ {
+ lock (_instanceLock)
{
- {typeof (IProgramCategoryService), typeof (ProgramCategoryService)},
- {typeof (IConflictService), typeof (ConflictService)},
- {typeof (ICardService), typeof (CardService)},
- {typeof (ICanceledScheduleService), typeof (CanceledScheduleService)},
- {typeof (IChannelService), typeof (ChannelService)},
- {typeof (IProgramService), typeof(ProgramService)},
- {typeof (ISettingService), typeof(SettingService)},
- {typeof (IRecordingService), typeof(RecordingService)},
- {typeof (IScheduleService), typeof(ScheduleService)},
- {typeof (IChannelGroupService), typeof(ChannelGroupService)},
- {typeof (IControllerService), typeof(TvControllerService)}
- }; */
+ if (_instance == null)
+ {
+ _instance = new ServiceManager();
+ }
+ return _instance;
+ }
+ }
+ }
- static ServiceManager()
+ ~ServiceManager()
{
- /*GlobalServiceProvider.Add<IProgramCategoryService>(new ProgramCategoryService());
- GlobalServiceProvider.Add<IConflictService>(new ConflictService());
- GlobalServiceProvider.Add<ICardService>(new CardService());
- GlobalServiceProvider.Add<ICanceledScheduleService>(new CanceledScheduleService());
- GlobalServiceProvider.Add<IChannelService>(new ChannelService());
- GlobalServiceProvider.Add<IProgramService>(new ProgramService());
- GlobalServiceProvider.Add<ISettingService>(new SettingService());
- GlobalServiceProvider.Add<IRecordingService>(new RecordingService());
- GlobalServiceProvider.Add<IScheduleService>(new ScheduleService());
- GlobalServiceProvider.Add<IChannelGroupService>(new ChannelGroupService());
- GlobalServiceProvider.Add<IControllerService>(new TvControllerService());
- GlobalServiceProvider.Add<IInternalControllerService>(new TvController());
- */
+ lock (_instanceLock)
+ {
+ Dispose();
+ }
+ }
- /*
- AddService<IProgramCategoryService, ProgramCategoryService>(typeof(ProgramCategoryService));
- AddService<IConflictService, ConflictService>(typeof(ConflictService));
- AddService<ICardService, CardService>(typeof(CardService));
- AddService<ICanceledScheduleService, CanceledScheduleService>(typeof(CanceledScheduleService));
- AddService<IChannelService, ChannelService>(typeof(ChannelService));
- AddService<IProgramService, ProgramService>(typeof(ProgramService));
- AddService<ISettingService, SettingService>(typeof(SettingService));
- AddService<IRecordingService, RecordingService>(typeof(RecordingService));
- AddService<IScheduleService, ScheduleService>(typeof(ScheduleService));
- AddService<IChannelGroupService, ChannelGroupService>(typeof(ChannelGroupService));
- AddService<IControllerService, TvControllerService>(typeof(TvControllerService));
- AddService<IInternalControllerService, TvController>(typeof(TvController));
- */
+ private ServiceManager ()
+ {
+ Init();
+ }
+ private void Init()
+ {
AddService<IProgramCategoryService, ProgramCategoryService>();
AddService<IConflictService, ConflictService>();
AddService<ICardService, CardService>();
@@ -77,67 +64,67 @@
GlobalServiceProvider.Add<IInternalControllerService>(new TvController());
}
- public static ICardService CardService
+ public ICardService CardService
{
get { return GlobalServiceProvider.Get<ICardService>(); }
}
- public static IProgramService ProgramService
+ public IProgramService ProgramService
{
get { return GlobalServiceProvider.Get<IProgramService>(); }
}
- public static IRecordingService RecordingService
+ public IRecordingService RecordingService
{
get { return GlobalServiceProvider.Get<IRecordingService>(); }
}
- public static IChannelGroupService ChannelGroupService
+ public IChannelGroupService ChannelGroupService
{
get { return GlobalServiceProvider.Get<IChannelGroupService>(); }
}
- public static ISettingService SettingService
+ public ISettingService SettingService
{
get { return GlobalServiceProvider.Get<ISettingService>(); }
}
- public static IChannelService ChannelService
+ public IChannelService ChannelService
{
get { return GlobalServiceProvider.Get<IChannelService>(); }
}
- public static IScheduleService ScheduleService
+ public IScheduleService ScheduleService
{
get { return GlobalServiceProvider.Get<IScheduleService>(); }
}
- public static ICanceledScheduleService CanceledScheduleService
+ public ICanceledScheduleService CanceledScheduleService
{
get { return GlobalServiceProvider.Get<ICanceledScheduleService>(); }
}
- public static IConflictService ConflictService
+ public IConflictService ConflictService
{
get { return GlobalServiceProvider.Get<IConflictService>(); }
}
- public static IProgramCategoryService ProgramCategoryService
+ public IProgramCategoryService ProgramCategoryService
{
get { return GlobalServiceProvider.Get<IProgramCategoryService>(); }
}
- public static IInternalControllerService InternalControllerService
+ public IInternalControllerService InternalControllerService
{
get { return GlobalServiceProvider.Get<IInternalControllerService>(); }
}
- public static IControllerService ControllerService
+ public IControllerService ControllerService
{
get { return GlobalServiceProvider.Get<IControllerService>(); }
}
- public static void AddService(Type interfaceType, object instance)
+ public void AddService(Type interfaceType, object instance)
{
Type implType = instance.GetType();
ThrowExceptionIfServiceAlreadyAdded(implType);
@@ -149,7 +136,7 @@
}
}
- public static void AddService<I, T>() where T : class, I, new()
+ public void AddService<I, T>() where T : class, I, new()
{
Type implType = typeof (T);
Type interfaceType = typeof (I);
@@ -163,7 +150,7 @@
}
}
- private static ServiceHost GetServiceHost(Type interfaceType, Type implType)
+ private ServiceHost GetServiceHost(Type interfaceType, Type implType)
{
var serviceHost = new ServiceHost(implType);
BasicHttpBinding defaultBinding = ServiceHelper.GetBinding();
@@ -200,7 +187,7 @@
return serviceHost;
}
- private static void ThrowExceptionIfServiceAlreadyAdded(Type contractType)
+ private void ThrowExceptionIfServiceAlreadyAdded(Type contractType)
{
lock (_lock)
{
@@ -210,41 +197,16 @@
}
}
}
+
- public static void Start ()
- {
- //System.Diagnostics.Debugger.Launch();
- /*Log.Debug("starting WCF service.");
- try
- {
- if (_serviceHosts.Count > 0)
- {
- Close();
- }
+
+ #region Implementation of IDisposable
- foreach (var type in _staticMappings)
- {
- Type implementationType = type.Value;
- ThrowExceptionIfServiceAlreadyAdded(implementationType);
-
- var serviceHost = new ServiceHost(implementationType);
- serviceHost.Open();
-
- lock (_lock)
- {
- _serviceHosts.Add(implementationType, serviceHost);
- }
- }
- }
- catch (Exception ex)
- {
- Log.Error("could not start WCF service", ex);
- throw;
- }
- Log.Debug("WCF service(s) started."); */
- }
-
- public static void Close()
+ /// <summary>
+ /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+ /// </summary>
+ /// <filterpriority>2</filterpriority>
+ public void Dispose()
{
Log.Debug("closing WCF service.");
try
@@ -266,6 +228,6 @@
}
}
-
+ #endregion
}
}
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/TCPEventServer/TCPServer.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/TCPEventServer/TCPServer.cs 2011-12-06 12:32:43 UTC (rev 28333)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/TCPEventServer/TCPServer.cs 2011-12-07 11:04:14 UTC (rev 28334)
@@ -85,8 +85,8 @@
public void Start()
{
- ServiceManager.InternalControllerService.OnTvServerEvent -= new TvServerEventHandler(_tvController_OnTvServerEvent);
- ServiceManager.InternalControllerService.OnTvServerEvent += new TvServerEventHandler(_tvController_OnTvServerEvent);
+ ServiceManager.Instance.InternalControllerService.OnTvServerEvent -= new TvServerEventHandler(_tvController_OnTvServerEvent);
+ ServiceManager.Instance.InternalControllerService.OnTvServerEvent += new TvServerEventHandler(_tvController_OnTvServerEvent);
_evtTCPCtrl.Reset();
_listenThread = new Thread(new ThreadStart(ListenForClients));
@@ -98,7 +98,7 @@
public void Stop()
{
- ServiceManager.InternalControllerService.OnTvServerEvent -= new TvServerEventHandler(_tvController_OnTvServerEvent);
+ ServiceManager.Instance.InternalControllerService.OnTvServerEvent -= new TvServerEventHandler(_tvController_OnTvServerEvent);
StopHeartbeatThread();
StopClientsNotificationsThread();
@@ -160,14 +160,14 @@
{
byte[] data;
IUser user = new User(tcpClientData.Name, false);
- bool isTimeShifting = ServiceManager.InternalControllerService.IsTimeShifting(ref user);
+ bool isTimeShifting = ServiceManager.Instance.InternalControllerService.IsTimeShifting(ref user);
if (isTimeShifting)
{
tvServerEventArgs.User.ChannelStates = user.ChannelStates;
}
else
{
- tvServerEventArgs.User.ChannelStates = ServiceManager.InternalControllerService.GetAllChannelStatesForIdleUserCached();
+ tvServerEventArgs.User.ChannelStates = ServiceManager.Instance.InternalControllerService.GetAllChannelStatesForIdleUserCached();
}
data = TvServerEventArgsTranslator.ToBinary(tvServerEventArgs);
return data;
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/TvCardContext.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/TvCardContext.cs 2011-12-06 12:32:43 UTC (rev 28333)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/TvCardContext.cs 2011-12-07 11:04:14 UTC (rev 28334)
@@ -427,7 +427,7 @@
ChannelManagement.SaveChannelHistory(history);
}
existingUser.History = null;
- var channelBll = new ChannelBLL(ServiceManager.ProgramService, channel);
+ var channelBll = new ChannelBLL(ServiceManager.Instance.ProgramService, channel);
Program p = channelBll.CurrentProgram;
if (p != null)
{
@@ -462,7 +462,7 @@
Channel channel = ChannelManagement.GetChannel(existingUser.IdChannel);
if (channel != null)
{
- Program p = new ChannelBLL(ServiceManager.ProgramService, channel).CurrentProgram;
+ Program p = new ChannelBLL(ServiceManager.Instance.ProgramService, channel).CurrentProgram;
if (p != null && p.startTime != history.startTime)
{
ChannelManagement.SaveChannelHistory(history);
|
|
From: <gib...@su...> - 2011-12-06 12:32:54
|
Author: gibman_dk
Date: 2011-12-06 13:32:43 +0100 (Tue, 06 Dec 2011)
New Revision: 28333
Modified:
branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ConflictsManager/ConflictsManager.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TVDatabase/EntityModel/Repositories/GenericRepository.cs
Log:
conflictmanager didnt work in setuptv.
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ConflictsManager/ConflictsManager.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ConflictsManager/ConflictsManager.cs 2011-12-06 11:58:25 UTC (rev 28332)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ConflictsManager/ConflictsManager.cs 2011-12-06 12:32:43 UTC (rev 28333)
@@ -40,8 +40,8 @@
{
#region variables
- private IList<Schedule> _schedules = ScheduleManagement.ListAllSchedules();
- private IList<Card> _cards = CardManagement.ListAllCards();
+ private IList<Schedule> _schedules = null;
+ private IList<Card> _cards = null;
private IList<Program> _conflictingPrograms;
@@ -92,6 +92,10 @@
public void Start(IInternalControllerService controllerService)
{
Log.WriteFile("plugin: ConflictsManager started");
+
+ _schedules = ScheduleManagement.ListAllSchedules();
+ _cards = CardManagement.ListAllCards();
+
_conflictingPrograms = new List<Program>();
ITvServerEvent events = GlobalServiceProvider.Instance.Get<ITvServerEvent>();
events.OnTvServerEvent += new TvServerEventHandler(events_OnTvServerEvent);
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TVDatabase/EntityModel/Repositories/GenericRepository.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TVDatabase/EntityModel/Repositories/GenericRepository.cs 2011-12-06 11:58:25 UTC (rev 28332)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TVDatabase/EntityModel/Repositories/GenericRepository.cs 2011-12-06 12:32:43 UTC (rev 28333)
@@ -385,7 +385,7 @@
public void Dispose()
{
- if (!_disposed)
+ if (!_disposed && this._objectContext != null)
{
try
{
|
|
From: <gib...@su...> - 2011-12-06 11:58:35
|
Author: gibman_dk
Date: 2011-12-06 12:58:25 +0100 (Tue, 06 Dec 2011)
New Revision: 28332
Modified:
branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/App.config
Log:
removed EF connectionstring from setuptv-
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/App.config
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/App.config 2011-12-06 07:39:10 UTC (rev 28331)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/App.config 2011-12-06 11:58:25 UTC (rev 28332)
@@ -1,8 +1,5 @@
<?xml version="1.0"?>
-<configuration>
- <connectionStrings>
- <add name="TVDatabaseEntities" connectionString="metadata=res://*/Model.csdl|res://*/Model.ssdl|res://*/Model.msl;provider=System.Data.SqlClient;provider connection string="Data Source=SERVER\SQLEXPRESS;Initial Catalog=tvlibrary;User ID=sa;Password=****;MultipleActiveResultSets=True"" providerName="System.Data.EntityClient" />
- </connectionStrings>
+<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<probing privatePath="plugins" />
|
|
From: <gib...@su...> - 2011-12-06 07:39:19
|
Author: gibman_dk
Date: 2011-12-06 08:39:10 +0100 (Tue, 06 Dec 2011)
New Revision: 28331
Modified:
branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ConflictsManager/ConflictsManager.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TVDatabase/TvBusinessLayer/ProgramManagement.cs
Log:
conflictsmanager compiles.
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ConflictsManager/ConflictsManager.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ConflictsManager/ConflictsManager.cs 2011-12-02 10:54:26 UTC (rev 28330)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ConflictsManager/ConflictsManager.cs 2011-12-06 07:39:10 UTC (rev 28331)
@@ -671,8 +671,10 @@
if (schedule.canceled != Schedule.MinSchedule) continue;
if (scheduleType != ScheduleRecordingType.EveryTimeOnThisChannel) continue;
Channel channel = ChannelManagement.GetChannel(schedule.idChannel);
- IList<Program> programsList = layer.SearchMinimalPrograms(DateTime.Now, DateTime.Now.AddMonths(1),
- schedule.programName, channel);
+
+ IList<Program> programsList = ProgramManagement.GetProgramsByChannelAndTitleAndStartEndTimes(channel.idChannel,
+ schedule.programName, DateTime.Now,
+ DateTime.Now.AddMonths(1));
if (programsList != null)
{
foreach (Program program in programsList)
@@ -706,9 +708,11 @@
if (schedule.canceled != Schedule.MinSchedule) continue;
if (scheduleType != ScheduleRecordingType.WeeklyEveryTimeOnThisChannel) continue;
Channel channel = ChannelManagement.GetChannel(schedule.idChannel);
-
- IList<Program> programsList = layer.SearchMinimalPrograms(DateTime.Now, DateTime.Now.AddMonths(1),
- schedule.programName, channel);
+
+ IList<Program> programsList = ProgramManagement.GetProgramsByChannelAndTitleAndStartEndTimes(channel.idChannel,
+ schedule.programName, DateTime.Now,
+ DateTime.Now.AddMonths(1));
+
if (programsList != null)
{
foreach (Program program in programsList)
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TVDatabase/TvBusinessLayer/ProgramManagement.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TVDatabase/TvBusinessLayer/ProgramManagement.cs 2011-12-02 10:54:26 UTC (rev 28330)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TVDatabase/TvBusinessLayer/ProgramManagement.cs 2011-12-06 07:39:10 UTC (rev 28331)
@@ -558,7 +558,7 @@
return retrieveByTitleAndTimesInterval;
}
- private static IList<Program> RetrieveByTitleAndTimesInterval(string title, DateTime startTime, DateTime endTime)
+ public static IList<Program> RetrieveByTitleAndTimesInterval(string title, DateTime startTime, DateTime endTime)
{
using (IProgramRepository programRepository = new ProgramRepository())
{
|
Author: gibman_dk
Date: 2011-12-02 11:54:26 +0100 (Fri, 02 Dec 2011)
New Revision: 28330
Modified:
branches/TVEngine3-Experimental/Mediaportal/TV/Server/Mediaportal.TV.Server.sln
branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ComSkipLauncher/ComSkipLauncher.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ComSkipLauncher/ComSkipLauncher.csproj
branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ConflictsManager/ConflictsManager.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PersonalTVGuide/PersonalTVGuide.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PluginBase/PluginBase.csproj
branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PowerScheduler/Handlers/ControllerActiveHandler.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PowerScheduler/PowerScheduler.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PowerScheduler/PowerScheduler.csproj
branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ServerBlaster/ServerBlaster.Learn/ServerBlaster.Learn.csproj
branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ServerBlaster/ServerBlaster/BlasterSetup.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ServerBlaster/ServerBlaster/ServerBlaster.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ServerBlaster/ServerBlaster/ServerBlaster.csproj
branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/TvMovie/TvMovie.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/TvMovie/TvMovie.csproj
branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/TvMovie/TvMovieDatabase.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/TvMovie/TvMovieSetup.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/WebEPG/WebEPG/Parser/ProgramData.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/WebEPG/WebEPG/WebEPG.csproj
branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/WebEPG/WebEPG/WebListingGrabber.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/WebEPG/WebEPGPlugin/Config/WebEPGConfigControl.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/WebEPG/WebEPGPlugin/Config/WebEPGMappingControl.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/WebEPG/WebEPGPlugin/DatabaseEPGDataSink.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/WebEPG/WebEPGPlugin/WebEPGImport.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/WebEPG/WebEPGPlugin/WebEPGImport.csproj
branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/XmlTvImport/XMLTVImport.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/XmlTvImport/XmlTvImport.csproj
branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/XmlTvImport/XmlTvImporter.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/RuleBasedScheduler/RuleBasedScheduler.csproj
branches/TVEngine3-Experimental/Mediaportal/TV/Server/ServiceAgents/ServiceAgents.csproj
branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/SetupTv.csproj
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TVDatabase/Entities/Entities.csproj
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TVDatabase/EntityModel/EntityModel.csproj
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TVDatabase/TvBusinessLayer/ChannelManagement.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TVDatabase/TvBusinessLayer/ProgramManagement.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TVDatabase/TvBusinessLayer/TvBusinessLayer.csproj
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TVLibrary/TVLibrary.csproj
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/RemoteControl.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/TvControl.csproj
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvLibrary.Interfaces/TvLibrary.Interfaces.csproj
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/TvService.Interfaces.csproj
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Service1.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Services/ServiceManager.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/TvService.csproj
branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/TVHome.cs
branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/TvPlugin.csproj
Log:
all plugins now compile except for: ConflictsManager,PersonalTVGuide
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/Mediaportal.TV.Server.sln
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/Mediaportal.TV.Server.sln 2011-11-26 14:51:15 UTC (rev 28329)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/Mediaportal.TV.Server.sln 2011-12-02 10:54:26 UTC (rev 28330)
@@ -122,8 +122,8 @@
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{59C2EBC8-0FEA-4B2E-B5D1-476347332331}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{59C2EBC8-0FEA-4B2E-B5D1-476347332331}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {59C2EBC8-0FEA-4B2E-B5D1-476347332331}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
- {59C2EBC8-0FEA-4B2E-B5D1-476347332331}.Debug|Mixed Platforms.Build.0 = Debug|x86
+ {59C2EBC8-0FEA-4B2E-B5D1-476347332331}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {59C2EBC8-0FEA-4B2E-B5D1-476347332331}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{59C2EBC8-0FEA-4B2E-B5D1-476347332331}.Debug|x86.ActiveCfg = Debug|Any CPU
{59C2EBC8-0FEA-4B2E-B5D1-476347332331}.Debug|x86.Build.0 = Debug|Any CPU
{59C2EBC8-0FEA-4B2E-B5D1-476347332331}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -154,8 +154,8 @@
{3BE4F3AA-36EB-4956-B000-E29C74FC6AB0}.Release|x86.Build.0 = Release|x86
{0DB878C6-1B68-4DC5-B6EF-564B7C08486F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0DB878C6-1B68-4DC5-B6EF-564B7C08486F}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {0DB878C6-1B68-4DC5-B6EF-564B7C08486F}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
- {0DB878C6-1B68-4DC5-B6EF-564B7C08486F}.Debug|Mixed Platforms.Build.0 = Debug|x86
+ {0DB878C6-1B68-4DC5-B6EF-564B7C08486F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {0DB878C6-1B68-4DC5-B6EF-564B7C08486F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{0DB878C6-1B68-4DC5-B6EF-564B7C08486F}.Debug|x86.ActiveCfg = Debug|Any CPU
{0DB878C6-1B68-4DC5-B6EF-564B7C08486F}.Debug|x86.Build.0 = Debug|Any CPU
{0DB878C6-1B68-4DC5-B6EF-564B7C08486F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -166,8 +166,8 @@
{0DB878C6-1B68-4DC5-B6EF-564B7C08486F}.Release|x86.Build.0 = Release|x86
{AE752FB4-7450-4150-9BAD-19EFA9D2AC37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AE752FB4-7450-4150-9BAD-19EFA9D2AC37}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {AE752FB4-7450-4150-9BAD-19EFA9D2AC37}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
- {AE752FB4-7450-4150-9BAD-19EFA9D2AC37}.Debug|Mixed Platforms.Build.0 = Debug|x86
+ {AE752FB4-7450-4150-9BAD-19EFA9D2AC37}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {AE752FB4-7450-4150-9BAD-19EFA9D2AC37}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{AE752FB4-7450-4150-9BAD-19EFA9D2AC37}.Debug|x86.ActiveCfg = Debug|Any CPU
{AE752FB4-7450-4150-9BAD-19EFA9D2AC37}.Debug|x86.Build.0 = Debug|Any CPU
{AE752FB4-7450-4150-9BAD-19EFA9D2AC37}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -178,8 +178,8 @@
{AE752FB4-7450-4150-9BAD-19EFA9D2AC37}.Release|x86.Build.0 = Release|x86
{58C35C9D-F18D-40F2-8024-24E50D01E9C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{58C35C9D-F18D-40F2-8024-24E50D01E9C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {58C35C9D-F18D-40F2-8024-24E50D01E9C5}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
- {58C35C9D-F18D-40F2-8024-24E50D01E9C5}.Debug|Mixed Platforms.Build.0 = Debug|x86
+ {58C35C9D-F18D-40F2-8024-24E50D01E9C5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {58C35C9D-F18D-40F2-8024-24E50D01E9C5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{58C35C9D-F18D-40F2-8024-24E50D01E9C5}.Debug|x86.ActiveCfg = Debug|Any CPU
{58C35C9D-F18D-40F2-8024-24E50D01E9C5}.Debug|x86.Build.0 = Debug|Any CPU
{58C35C9D-F18D-40F2-8024-24E50D01E9C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -202,8 +202,8 @@
{FF9AAD68-BBE0-41F7-9183-F2B8474B9224}.Release|x86.Build.0 = Release|x86
{A2792D3C-04C1-4A92-9383-A33D59C54D8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A2792D3C-04C1-4A92-9383-A33D59C54D8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {A2792D3C-04C1-4A92-9383-A33D59C54D8D}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
- {A2792D3C-04C1-4A92-9383-A33D59C54D8D}.Debug|Mixed Platforms.Build.0 = Debug|x86
+ {A2792D3C-04C1-4A92-9383-A33D59C54D8D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {A2792D3C-04C1-4A92-9383-A33D59C54D8D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{A2792D3C-04C1-4A92-9383-A33D59C54D8D}.Debug|x86.ActiveCfg = Debug|Any CPU
{A2792D3C-04C1-4A92-9383-A33D59C54D8D}.Debug|x86.Build.0 = Debug|Any CPU
{A2792D3C-04C1-4A92-9383-A33D59C54D8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -214,8 +214,8 @@
{A2792D3C-04C1-4A92-9383-A33D59C54D8D}.Release|x86.Build.0 = Release|x86
{158A88D6-FA0D-4D50-B9DC-D90E189206B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{158A88D6-FA0D-4D50-B9DC-D90E189206B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {158A88D6-FA0D-4D50-B9DC-D90E189206B0}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
- {158A88D6-FA0D-4D50-B9DC-D90E189206B0}.Debug|Mixed Platforms.Build.0 = Debug|x86
+ {158A88D6-FA0D-4D50-B9DC-D90E189206B0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {158A88D6-FA0D-4D50-B9DC-D90E189206B0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{158A88D6-FA0D-4D50-B9DC-D90E189206B0}.Debug|x86.ActiveCfg = Debug|Any CPU
{158A88D6-FA0D-4D50-B9DC-D90E189206B0}.Debug|x86.Build.0 = Debug|Any CPU
{158A88D6-FA0D-4D50-B9DC-D90E189206B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -226,8 +226,8 @@
{158A88D6-FA0D-4D50-B9DC-D90E189206B0}.Release|x86.Build.0 = Release|x86
{5EE20DC0-B22B-4BDB-828B-8DC5723A1873}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5EE20DC0-B22B-4BDB-828B-8DC5723A1873}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {5EE20DC0-B22B-4BDB-828B-8DC5723A1873}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
- {5EE20DC0-B22B-4BDB-828B-8DC5723A1873}.Debug|Mixed Platforms.Build.0 = Debug|x86
+ {5EE20DC0-B22B-4BDB-828B-8DC5723A1873}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {5EE20DC0-B22B-4BDB-828B-8DC5723A1873}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{5EE20DC0-B22B-4BDB-828B-8DC5723A1873}.Debug|x86.ActiveCfg = Debug|Any CPU
{5EE20DC0-B22B-4BDB-828B-8DC5723A1873}.Debug|x86.Build.0 = Debug|Any CPU
{5EE20DC0-B22B-4BDB-828B-8DC5723A1873}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -237,7 +237,7 @@
{5EE20DC0-B22B-4BDB-828B-8DC5723A1873}.Release|x86.ActiveCfg = Release|x86
{5EE20DC0-B22B-4BDB-828B-8DC5723A1873}.Release|x86.Build.0 = Release|x86
{544182DC-92EC-4BCF-AA88-A76C6EFF0212}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {544182DC-92EC-4BCF-AA88-A76C6EFF0212}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+ {544182DC-92EC-4BCF-AA88-A76C6EFF0212}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{544182DC-92EC-4BCF-AA88-A76C6EFF0212}.Debug|x86.ActiveCfg = Debug|Any CPU
{544182DC-92EC-4BCF-AA88-A76C6EFF0212}.Debug|x86.Build.0 = Debug|Any CPU
{544182DC-92EC-4BCF-AA88-A76C6EFF0212}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -247,7 +247,7 @@
{544182DC-92EC-4BCF-AA88-A76C6EFF0212}.Release|x86.ActiveCfg = Release|x86
{544182DC-92EC-4BCF-AA88-A76C6EFF0212}.Release|x86.Build.0 = Release|x86
{C1F670A6-C856-4997-814F-C535218AF757}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {C1F670A6-C856-4997-814F-C535218AF757}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+ {C1F670A6-C856-4997-814F-C535218AF757}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{C1F670A6-C856-4997-814F-C535218AF757}.Debug|x86.ActiveCfg = Debug|Any CPU
{C1F670A6-C856-4997-814F-C535218AF757}.Debug|x86.Build.0 = Debug|Any CPU
{C1F670A6-C856-4997-814F-C535218AF757}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -258,7 +258,8 @@
{C1F670A6-C856-4997-814F-C535218AF757}.Release|x86.Build.0 = Release|x86
{CD395FC2-70E2-42C4-8A20-5469A0C5EB50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CD395FC2-70E2-42C4-8A20-5469A0C5EB50}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {CD395FC2-70E2-42C4-8A20-5469A0C5EB50}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+ {CD395FC2-70E2-42C4-8A20-5469A0C5EB50}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {CD395FC2-70E2-42C4-8A20-5469A0C5EB50}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{CD395FC2-70E2-42C4-8A20-5469A0C5EB50}.Debug|x86.ActiveCfg = Debug|Any CPU
{CD395FC2-70E2-42C4-8A20-5469A0C5EB50}.Debug|x86.Build.0 = Debug|Any CPU
{CD395FC2-70E2-42C4-8A20-5469A0C5EB50}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -268,8 +269,8 @@
{CD395FC2-70E2-42C4-8A20-5469A0C5EB50}.Release|x86.ActiveCfg = Release|x86
{CD395FC2-70E2-42C4-8A20-5469A0C5EB50}.Release|x86.Build.0 = Release|x86
{3F8F1617-A987-4516-BF37-E01D04D2686F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {3F8F1617-A987-4516-BF37-E01D04D2686F}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
- {3F8F1617-A987-4516-BF37-E01D04D2686F}.Debug|Mixed Platforms.Build.0 = Debug|x86
+ {3F8F1617-A987-4516-BF37-E01D04D2686F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {3F8F1617-A987-4516-BF37-E01D04D2686F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{3F8F1617-A987-4516-BF37-E01D04D2686F}.Debug|x86.ActiveCfg = Debug|Any CPU
{3F8F1617-A987-4516-BF37-E01D04D2686F}.Debug|x86.Build.0 = Debug|Any CPU
{3F8F1617-A987-4516-BF37-E01D04D2686F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -280,7 +281,8 @@
{3F8F1617-A987-4516-BF37-E01D04D2686F}.Release|x86.Build.0 = Release|x86
{AD20D519-D1AF-484E-ADDE-251F7CA912D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AD20D519-D1AF-484E-ADDE-251F7CA912D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {AD20D519-D1AF-484E-ADDE-251F7CA912D9}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+ {AD20D519-D1AF-484E-ADDE-251F7CA912D9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {AD20D519-D1AF-484E-ADDE-251F7CA912D9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{AD20D519-D1AF-484E-ADDE-251F7CA912D9}.Debug|x86.ActiveCfg = Debug|Any CPU
{AD20D519-D1AF-484E-ADDE-251F7CA912D9}.Debug|x86.Build.0 = Debug|Any CPU
{AD20D519-D1AF-484E-ADDE-251F7CA912D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -290,7 +292,7 @@
{AD20D519-D1AF-484E-ADDE-251F7CA912D9}.Release|x86.ActiveCfg = Release|x86
{AD20D519-D1AF-484E-ADDE-251F7CA912D9}.Release|x86.Build.0 = Release|x86
{BDB09793-4EAB-4E94-AD30-5D790281A1DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {BDB09793-4EAB-4E94-AD30-5D790281A1DF}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+ {BDB09793-4EAB-4E94-AD30-5D790281A1DF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{BDB09793-4EAB-4E94-AD30-5D790281A1DF}.Debug|x86.ActiveCfg = Debug|Any CPU
{BDB09793-4EAB-4E94-AD30-5D790281A1DF}.Debug|x86.Build.0 = Debug|Any CPU
{BDB09793-4EAB-4E94-AD30-5D790281A1DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -300,7 +302,8 @@
{BDB09793-4EAB-4E94-AD30-5D790281A1DF}.Release|x86.ActiveCfg = Release|x86
{BDB09793-4EAB-4E94-AD30-5D790281A1DF}.Release|x86.Build.0 = Release|x86
{F7CB2A9F-004E-4667-BEAF-782F1C28E2D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {F7CB2A9F-004E-4667-BEAF-782F1C28E2D3}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+ {F7CB2A9F-004E-4667-BEAF-782F1C28E2D3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {F7CB2A9F-004E-4667-BEAF-782F1C28E2D3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{F7CB2A9F-004E-4667-BEAF-782F1C28E2D3}.Debug|x86.ActiveCfg = Debug|Any CPU
{F7CB2A9F-004E-4667-BEAF-782F1C28E2D3}.Debug|x86.Build.0 = Debug|Any CPU
{F7CB2A9F-004E-4667-BEAF-782F1C28E2D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -310,7 +313,8 @@
{F7CB2A9F-004E-4667-BEAF-782F1C28E2D3}.Release|x86.ActiveCfg = Release|x86
{F7CB2A9F-004E-4667-BEAF-782F1C28E2D3}.Release|x86.Build.0 = Release|x86
{7A16796E-77F3-4754-A5E2-5C04A94BD8B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {7A16796E-77F3-4754-A5E2-5C04A94BD8B7}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+ {7A16796E-77F3-4754-A5E2-5C04A94BD8B7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {7A16796E-77F3-4754-A5E2-5C04A94BD8B7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{7A16796E-77F3-4754-A5E2-5C04A94BD8B7}.Debug|x86.ActiveCfg = Debug|Any CPU
{7A16796E-77F3-4754-A5E2-5C04A94BD8B7}.Debug|x86.Build.0 = Debug|Any CPU
{7A16796E-77F3-4754-A5E2-5C04A94BD8B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -321,8 +325,8 @@
{7A16796E-77F3-4754-A5E2-5C04A94BD8B7}.Release|x86.Build.0 = Release|x86
{954F9929-7FDA-4F59-88E3-FD2B9A7B6E6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{954F9929-7FDA-4F59-88E3-FD2B9A7B6E6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {954F9929-7FDA-4F59-88E3-FD2B9A7B6E6E}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
- {954F9929-7FDA-4F59-88E3-FD2B9A7B6E6E}.Debug|Mixed Platforms.Build.0 = Debug|x86
+ {954F9929-7FDA-4F59-88E3-FD2B9A7B6E6E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {954F9929-7FDA-4F59-88E3-FD2B9A7B6E6E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{954F9929-7FDA-4F59-88E3-FD2B9A7B6E6E}.Debug|x86.ActiveCfg = Debug|Any CPU
{954F9929-7FDA-4F59-88E3-FD2B9A7B6E6E}.Debug|x86.Build.0 = Debug|Any CPU
{954F9929-7FDA-4F59-88E3-FD2B9A7B6E6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -333,8 +337,8 @@
{954F9929-7FDA-4F59-88E3-FD2B9A7B6E6E}.Release|x86.Build.0 = Release|x86
{D3C57312-F398-48ED-BFE0-F80EF856DD68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D3C57312-F398-48ED-BFE0-F80EF856DD68}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {D3C57312-F398-48ED-BFE0-F80EF856DD68}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
- {D3C57312-F398-48ED-BFE0-F80EF856DD68}.Debug|Mixed Platforms.Build.0 = Debug|x86
+ {D3C57312-F398-48ED-BFE0-F80EF856DD68}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {D3C57312-F398-48ED-BFE0-F80EF856DD68}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{D3C57312-F398-48ED-BFE0-F80EF856DD68}.Debug|x86.ActiveCfg = Debug|Any CPU
{D3C57312-F398-48ED-BFE0-F80EF856DD68}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D3C57312-F398-48ED-BFE0-F80EF856DD68}.Release|Any CPU.Build.0 = Release|Any CPU
@@ -343,8 +347,8 @@
{D3C57312-F398-48ED-BFE0-F80EF856DD68}.Release|x86.ActiveCfg = Release|Any CPU
{F6EDA1F3-3DCD-43F4-8A90-E32DA70C8227}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F6EDA1F3-3DCD-43F4-8A90-E32DA70C8227}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {F6EDA1F3-3DCD-43F4-8A90-E32DA70C8227}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
- {F6EDA1F3-3DCD-43F4-8A90-E32DA70C8227}.Debug|Mixed Platforms.Build.0 = Debug|x86
+ {F6EDA1F3-3DCD-43F4-8A90-E32DA70C8227}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {F6EDA1F3-3DCD-43F4-8A90-E32DA70C8227}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{F6EDA1F3-3DCD-43F4-8A90-E32DA70C8227}.Debug|x86.ActiveCfg = Debug|x86
{F6EDA1F3-3DCD-43F4-8A90-E32DA70C8227}.Debug|x86.Build.0 = Debug|x86
{F6EDA1F3-3DCD-43F4-8A90-E32DA70C8227}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -355,8 +359,8 @@
{F6EDA1F3-3DCD-43F4-8A90-E32DA70C8227}.Release|x86.Build.0 = Release|x86
{CE009BFA-5EF6-4153-B2A1-2FA79698A9AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CE009BFA-5EF6-4153-B2A1-2FA79698A9AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {CE009BFA-5EF6-4153-B2A1-2FA79698A9AE}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
- {CE009BFA-5EF6-4153-B2A1-2FA79698A9AE}.Debug|Mixed Platforms.Build.0 = Debug|x86
+ {CE009BFA-5EF6-4153-B2A1-2FA79698A9AE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {CE009BFA-5EF6-4153-B2A1-2FA79698A9AE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{CE009BFA-5EF6-4153-B2A1-2FA79698A9AE}.Debug|x86.ActiveCfg = Debug|x86
{CE009BFA-5EF6-4153-B2A1-2FA79698A9AE}.Debug|x86.Build.0 = Debug|x86
{CE009BFA-5EF6-4153-B2A1-2FA79698A9AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -367,8 +371,8 @@
{CE009BFA-5EF6-4153-B2A1-2FA79698A9AE}.Release|x86.Build.0 = Release|x86
{7701AA79-18D4-4A18-BB52-16774FB7943D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7701AA79-18D4-4A18-BB52-16774FB7943D}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {7701AA79-18D4-4A18-BB52-16774FB7943D}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
- {7701AA79-18D4-4A18-BB52-16774FB7943D}.Debug|Mixed Platforms.Build.0 = Debug|x86
+ {7701AA79-18D4-4A18-BB52-16774FB7943D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {7701AA79-18D4-4A18-BB52-16774FB7943D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{7701AA79-18D4-4A18-BB52-16774FB7943D}.Debug|x86.ActiveCfg = Debug|x86
{7701AA79-18D4-4A18-BB52-16774FB7943D}.Debug|x86.Build.0 = Debug|x86
{7701AA79-18D4-4A18-BB52-16774FB7943D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -379,7 +383,8 @@
{7701AA79-18D4-4A18-BB52-16774FB7943D}.Release|x86.Build.0 = Release|x86
{5552136B-6122-47EE-A218-6311974AA569}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5552136B-6122-47EE-A218-6311974AA569}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {5552136B-6122-47EE-A218-6311974AA569}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+ {5552136B-6122-47EE-A218-6311974AA569}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {5552136B-6122-47EE-A218-6311974AA569}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{5552136B-6122-47EE-A218-6311974AA569}.Debug|x86.ActiveCfg = Debug|x86
{5552136B-6122-47EE-A218-6311974AA569}.Debug|x86.Build.0 = Debug|x86
{5552136B-6122-47EE-A218-6311974AA569}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -390,8 +395,8 @@
{5552136B-6122-47EE-A218-6311974AA569}.Release|x86.Build.0 = Release|x86
{4C2D9698-AF44-4157-99B6-48F5269F20CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4C2D9698-AF44-4157-99B6-48F5269F20CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {4C2D9698-AF44-4157-99B6-48F5269F20CC}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
- {4C2D9698-AF44-4157-99B6-48F5269F20CC}.Debug|Mixed Platforms.Build.0 = Debug|x86
+ {4C2D9698-AF44-4157-99B6-48F5269F20CC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {4C2D9698-AF44-4157-99B6-48F5269F20CC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{4C2D9698-AF44-4157-99B6-48F5269F20CC}.Debug|x86.ActiveCfg = Debug|Any CPU
{4C2D9698-AF44-4157-99B6-48F5269F20CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4C2D9698-AF44-4157-99B6-48F5269F20CC}.Release|Any CPU.Build.0 = Release|Any CPU
@@ -400,8 +405,8 @@
{4C2D9698-AF44-4157-99B6-48F5269F20CC}.Release|x86.ActiveCfg = Release|Any CPU
{4D0F06A3-DE88-4395-823F-67B27DE30E81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4D0F06A3-DE88-4395-823F-67B27DE30E81}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {4D0F06A3-DE88-4395-823F-67B27DE30E81}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
- {4D0F06A3-DE88-4395-823F-67B27DE30E81}.Debug|Mixed Platforms.Build.0 = Debug|x86
+ {4D0F06A3-DE88-4395-823F-67B27DE30E81}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {4D0F06A3-DE88-4395-823F-67B27DE30E81}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{4D0F06A3-DE88-4395-823F-67B27DE30E81}.Debug|x86.ActiveCfg = Debug|Any CPU
{4D0F06A3-DE88-4395-823F-67B27DE30E81}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4D0F06A3-DE88-4395-823F-67B27DE30E81}.Release|Any CPU.Build.0 = Release|Any CPU
@@ -410,8 +415,8 @@
{4D0F06A3-DE88-4395-823F-67B27DE30E81}.Release|x86.ActiveCfg = Release|Any CPU
{DB873507-8095-4877-A489-DA39AB55A9A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DB873507-8095-4877-A489-DA39AB55A9A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {DB873507-8095-4877-A489-DA39AB55A9A2}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
- {DB873507-8095-4877-A489-DA39AB55A9A2}.Debug|Mixed Platforms.Build.0 = Debug|x86
+ {DB873507-8095-4877-A489-DA39AB55A9A2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {DB873507-8095-4877-A489-DA39AB55A9A2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{DB873507-8095-4877-A489-DA39AB55A9A2}.Debug|x86.ActiveCfg = Debug|Any CPU
{DB873507-8095-4877-A489-DA39AB55A9A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DB873507-8095-4877-A489-DA39AB55A9A2}.Release|Any CPU.Build.0 = Release|Any CPU
@@ -420,8 +425,8 @@
{DB873507-8095-4877-A489-DA39AB55A9A2}.Release|x86.ActiveCfg = Release|Any CPU
{1526A789-1DE2-4A8B-AA4B-5382A617C4F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1526A789-1DE2-4A8B-AA4B-5382A617C4F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {1526A789-1DE2-4A8B-AA4B-5382A617C4F8}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
- {1526A789-1DE2-4A8B-AA4B-5382A617C4F8}.Debug|Mixed Platforms.Build.0 = Debug|x86
+ {1526A789-1DE2-4A8B-AA4B-5382A617C4F8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {1526A789-1DE2-4A8B-AA4B-5382A617C4F8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{1526A789-1DE2-4A8B-AA4B-5382A617C4F8}.Debug|x86.ActiveCfg = Debug|x86
{1526A789-1DE2-4A8B-AA4B-5382A617C4F8}.Debug|x86.Build.0 = Debug|x86
{1526A789-1DE2-4A8B-AA4B-5382A617C4F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -431,8 +436,8 @@
{1526A789-1DE2-4A8B-AA4B-5382A617C4F8}.Release|x86.ActiveCfg = Release|x86
{1526A789-1DE2-4A8B-AA4B-5382A617C4F8}.Release|x86.Build.0 = Release|x86
{A2BFFBDD-3BEA-4B68-94F1-C34D2BE10AEB}.Debug|Any CPU.ActiveCfg = Debug|x86
- {A2BFFBDD-3BEA-4B68-94F1-C34D2BE10AEB}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
- {A2BFFBDD-3BEA-4B68-94F1-C34D2BE10AEB}.Debug|Mixed Platforms.Build.0 = Debug|x86
+ {A2BFFBDD-3BEA-4B68-94F1-C34D2BE10AEB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {A2BFFBDD-3BEA-4B68-94F1-C34D2BE10AEB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{A2BFFBDD-3BEA-4B68-94F1-C34D2BE10AEB}.Debug|x86.ActiveCfg = Debug|x86
{A2BFFBDD-3BEA-4B68-94F1-C34D2BE10AEB}.Debug|x86.Build.0 = Debug|x86
{A2BFFBDD-3BEA-4B68-94F1-C34D2BE10AEB}.Release|Any CPU.ActiveCfg = Release|x86
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ComSkipLauncher/ComSkipLauncher.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ComSkipLauncher/ComSkipLauncher.cs 2011-11-26 14:51:15 UTC (rev 28329)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ComSkipLauncher/ComSkipLauncher.cs 2011-12-02 10:54:26 UTC (rev 28330)
@@ -24,9 +24,8 @@
using Mediaportal.TV.Server.Plugins.Base;
using Mediaportal.TV.Server.Plugins.Base.Events;
using Mediaportal.TV.Server.SetupControls;
-using Mediaportal.TV.Server.TVControl;
+using Mediaportal.TV.Server.TVControl.Interfaces;
using Mediaportal.TV.Server.TVDatabase.Entities;
-using Mediaportal.TV.Server.TVDatabase.TVBusinessLayer;
using Mediaportal.TV.Server.TVLibrary.Interfaces.Logging;
using MediaPortal.Common.Utils;
using Mediaportal.TV.Server.TVService.ServiceAgents;
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ComSkipLauncher/ComSkipLauncher.csproj
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ComSkipLauncher/ComSkipLauncher.csproj 2011-11-26 14:51:15 UTC (rev 28329)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ComSkipLauncher/ComSkipLauncher.csproj 2011-12-02 10:54:26 UTC (rev 28330)
@@ -100,11 +100,6 @@
<Project>{4C2D9698-AF44-4157-99B6-48F5269F20CC}</Project>
<Name>Entities</Name>
</ProjectReference>
- <ProjectReference Include="..\..\TVDatabase\TvBusinessLayer\TvBusinessLayer.csproj">
- <Project>{58C35C9D-F18D-40F2-8024-24E50D01E9C5}</Project>
- <Name>TvBusinessLayer</Name>
- <Private>False</Private>
- </ProjectReference>
<ProjectReference Include="..\..\TvLibrary.Interfaces\TvLibrary.Interfaces.csproj">
<Project>{AE752FB4-7450-4150-9BAD-19EFA9D2AC37}</Project>
<Name>TvLibrary.Interfaces</Name>
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ConflictsManager/ConflictsManager.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ConflictsManager/ConflictsManager.cs 2011-11-26 14:51:15 UTC (rev 28329)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ConflictsManager/ConflictsManager.cs 2011-12-02 10:54:26 UTC (rev 28330)
@@ -25,6 +25,7 @@
using Mediaportal.TV.Server.Plugins.Base.Events;
using Mediaportal.TV.Server.SetupControls;
using Mediaportal.TV.Server.TVControl;
+using Mediaportal.TV.Server.TVControl.Interfaces;
using Mediaportal.TV.Server.TVDatabase.Entities;
using Mediaportal.TV.Server.TVDatabase.Entities.Enums;
using Mediaportal.TV.Server.TVDatabase.Entities.Factories;
@@ -88,7 +89,7 @@
/// <summary>
/// Starts the plugin
/// </summary>
- public void Start(IControllerService IControllerService)
+ public void Start(IInternalControllerService controllerService)
{
Log.WriteFile("plugin: ConflictsManager started");
_conflictingPrograms = new List<Program>();
@@ -705,6 +706,7 @@
if (schedule.canceled != Schedule.MinSchedule) continue;
if (scheduleType != ScheduleRecordingType.WeeklyEveryTimeOnThisChannel) continue;
Channel channel = ChannelManagement.GetChannel(schedule.idChannel);
+
IList<Program> programsList = layer.SearchMinimalPrograms(DateTime.Now, DateTime.Now.AddMonths(1),
schedule.programName, channel);
if (programsList != null)
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PersonalTVGuide/PersonalTVGuide.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PersonalTVGuide/PersonalTVGuide.cs 2011-11-26 14:51:15 UTC (rev 28329)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PersonalTVGuide/PersonalTVGuide.cs 2011-12-02 10:54:26 UTC (rev 28330)
@@ -21,18 +21,16 @@
using System;
using System.Collections.Generic;
using System.Threading;
-
+using MediaPortal.Common.Utils;
using Mediaportal.TV.Server.Plugins.Base;
using Mediaportal.TV.Server.Plugins.Base.Events;
using Mediaportal.TV.Server.Plugins.PowerScheduler.Interfaces.Interfaces;
using Mediaportal.TV.Server.SetupControls;
-using Mediaportal.TV.Server.TVControl;
using Mediaportal.TV.Server.TVDatabase.Entities;
using Mediaportal.TV.Server.TVDatabase.Entities.Enums;
using Mediaportal.TV.Server.TVDatabase.TVBusinessLayer;
using Mediaportal.TV.Server.TVLibrary.Interfaces.Logging;
-using MediaPortal.Common.Utils;
-using Mediaportal.TV.Server.TVService.ServiceAgents;
+using Mediaportal.TV.Server.TVControl.Interfaces;
namespace Mediaportal.TV.Server.Plugins.PersonalTVGuide
{
@@ -117,7 +115,7 @@
UpdateKeyword(key);
}
- ServiceAgents.SettingServiceAgent.SaveSetting("PTVGLastUpdateTime", DateTime.Now.ToString());
+ SettingsManagement.SaveSetting("PTVGLastUpdateTime", DateTime.Now.ToString());
if (_debugMode) Log.Info("PersonalTVGuide: UpdateThread - Stop : " + DateTime.Now.ToLongTimeString());
_isUpdating = false;
}
@@ -137,7 +135,7 @@
if (_debugMode) Log.Debug("PersonalTVGuide: Updating Keyword: " + key.keywordName);
if (key.SearchInTitle)
{
- SaveList(key.IdKeyword, ContainsInTitle(key.keywordName));
+ SaveList(key.idKeyword, ContainsInTitle(key.keywordName));
Thread.Sleep(100);
}
@@ -239,7 +237,7 @@
/// <summary>
/// Starts the plugin
/// </summary>
- public void Start(IControllerService IControllerService)
+ public void Start(IInternalControllerService controllerService)
{
LoadSettings();
Log.WriteFile("plugin: PersonalTVGuide started");
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PluginBase/PluginBase.csproj
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PluginBase/PluginBase.csproj 2011-11-26 14:51:15 UTC (rev 28329)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PluginBase/PluginBase.csproj 2011-12-02 10:54:26 UTC (rev 28330)
@@ -76,8 +76,6 @@
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Data" />
- <Reference Include="System.Drawing" />
- <Reference Include="System.ServiceProcess" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
</ItemGroup>
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PowerScheduler/Handlers/ControllerActiveHandler.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PowerScheduler/Handlers/ControllerActiveHandler.cs 2011-11-26 14:51:15 UTC (rev 28329)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PowerScheduler/Handlers/ControllerActiveHandler.cs 2011-12-02 10:54:26 UTC (rev 28330)
@@ -21,12 +21,9 @@
#region Usings
using Mediaportal.TV.Server.Plugins.PowerScheduler.Interfaces.Interfaces;
-using Mediaportal.TV.Server.TVControl;
using Mediaportal.TV.Server.TVControl.Interfaces;
-using Mediaportal.TV.Server.TVService;
-using Mediaportal.TV.Server.TVService.Interfaces.Services;
-using Mediaportal.TV.Server.TVService.Services;
+
#endregion
namespace Mediaportal.TV.Server.Plugins.PowerScheduler.Handlers
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PowerScheduler/PowerScheduler.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PowerScheduler/PowerScheduler.cs 2011-11-26 14:51:15 UTC (rev 28329)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PowerScheduler/PowerScheduler.cs 2011-12-02 10:54:26 UTC (rev 28330)
@@ -22,27 +22,19 @@
using System;
using System.Collections;
-using System.Collections.Specialized;
using System.Collections.Generic;
using System.Diagnostics;
using System.Runtime.CompilerServices;
-using System.Runtime.Remoting;
-using System.Runtime.Remoting.Channels;
-using System.Runtime.Remoting.Channels.Http;
using Mediaportal.TV.Server.Plugins.Base.Interfaces;
using Mediaportal.TV.Server.Plugins.PowerScheduler.Handlers;
using Mediaportal.TV.Server.Plugins.PowerScheduler.Interfaces;
using Mediaportal.TV.Server.Plugins.PowerScheduler.Interfaces.Interfaces;
-using Mediaportal.TV.Server.TVControl;
using Mediaportal.TV.Server.TVControl.Interfaces;
using Mediaportal.TV.Server.TVDatabase.TVBusinessLayer;
using Mediaportal.TV.Server.TVLibrary.Interfaces.Logging;
using MediaPortal.Common.Utils;
-using Mediaportal.TV.Server.TVService;
using System.Runtime.InteropServices;
using System.Threading;
-using Mediaportal.TV.Server.TVService.Interfaces.Services;
-using Mediaportal.TV.Server.TVService.Services;
using TvEngine.PowerScheduler.Interfaces;
#endregion
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PowerScheduler/PowerScheduler.csproj
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PowerScheduler/PowerScheduler.csproj 2011-11-26 14:51:15 UTC (rev 28329)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PowerScheduler/PowerScheduler.csproj 2011-12-02 10:54:26 UTC (rev 28330)
@@ -107,8 +107,6 @@
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Management" />
- <Reference Include="System.Runtime.Remoting" />
- <Reference Include="System.ServiceProcess" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
</ItemGroup>
@@ -149,20 +147,10 @@
<Name>TvLibrary.Interfaces</Name>
<Private>False</Private>
</ProjectReference>
- <ProjectReference Include="..\..\TVLibrary\TVLibrary.csproj">
- <Project>{59C2EBC8-0FEA-4B2E-B5D1-476347332331}</Project>
- <Name>TVLibrary %28TVLibrary\TVLibrary%29</Name>
- <Private>False</Private>
- </ProjectReference>
<ProjectReference Include="..\..\TvService.Interfaces\TvService.Interfaces.csproj">
<Project>{A2BFFBDD-3BEA-4B68-94F1-C34D2BE10AEB}</Project>
<Name>TvService.Interfaces</Name>
</ProjectReference>
- <ProjectReference Include="..\..\TvService\TvService.csproj">
- <Project>{3BE4F3AA-36EB-4956-B000-E29C74FC6AB0}</Project>
- <Name>TvService</Name>
- <Private>False</Private>
- </ProjectReference>
<ProjectReference Include="..\PluginBase\PluginBase.csproj">
<Project>{5EE20DC0-B22B-4BDB-828B-8DC5723A1873}</Project>
<Name>PluginBase</Name>
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ServerBlaster/ServerBlaster/BlasterSetup.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ServerBlaster/ServerBlaster/BlasterSetup.cs 2011-11-26 14:51:15 UTC (rev 28329)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ServerBlaster/ServerBlaster/BlasterSetup.cs 2011-12-02 10:54:26 UTC (rev 28330)
@@ -22,7 +22,6 @@
using System.Collections.Generic;
using Mediaportal.TV.Server.SetupControls;
using Mediaportal.TV.Server.TVDatabase.Entities;
-using Mediaportal.TV.Server.TVDatabase.TVBusinessLayer;
using Mediaportal.TV.Server.TVLibrary.Interfaces.Logging;
using Mediaportal.TV.Server.TVService.ServiceAgents;
using Setting = Mediaportal.TV.Server.TVDatabase.Entities.Setting;
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ServerBlaster/ServerBlaster/ServerBlaster.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ServerBlaster/ServerBlaster/ServerBlaster.cs 2011-11-26 14:51:15 UTC (rev 28329)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ServerBlaster/ServerBlaster/ServerBlaster.cs 2011-12-02 10:54:26 UTC (rev 28330)
@@ -26,8 +26,7 @@
using Mediaportal.TV.Server.Plugins.Base;
using Mediaportal.TV.Server.Plugins.Base.Events;
using Mediaportal.TV.Server.SetupControls;
-using Mediaportal.TV.Server.TVControl;
-using Mediaportal.TV.Server.TVDatabase.TVBusinessLayer;
+using Mediaportal.TV.Server.TVControl.Interfaces;
using Mediaportal.TV.Server.TVLibrary.Interfaces;
using Mediaportal.TV.Server.TVLibrary.Interfaces.Implementations.Channels;
using Mediaportal.TV.Server.TVLibrary.Interfaces.Logging;
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ServerBlaster/ServerBlaster/ServerBlaster.csproj
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ServerBlaster/ServerBlaster/ServerBlaster.csproj 2011-11-26 14:51:15 UTC (rev 28329)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ServerBlaster/ServerBlaster/ServerBlaster.csproj 2011-12-02 10:54:26 UTC (rev 28330)
@@ -169,16 +169,15 @@
<Project>{4C2D9698-AF44-4157-99B6-48F5269F20CC}</Project>
<Name>Entities</Name>
</ProjectReference>
- <ProjectReference Include="..\..\..\TVDatabase\TvBusinessLayer\TvBusinessLayer.csproj">
- <Project>{58C35C9D-F18D-40F2-8024-24E50D01E9C5}</Project>
- <Name>TvBusinessLayer</Name>
- <Private>False</Private>
- </ProjectReference>
<ProjectReference Include="..\..\..\TvLibrary.Interfaces\TvLibrary.Interfaces.csproj">
<Project>{AE752FB4-7450-4150-9BAD-19EFA9D2AC37}</Project>
<Name>TvLibrary.Interfaces</Name>
<Private>False</Private>
</ProjectReference>
+ <ProjectReference Include="..\..\..\TvService.Interfaces\TvService.Interfaces.csproj">
+ <Project>{A2BFFBDD-3BEA-4B68-94F1-C34D2BE10AEB}</Project>
+ <Name>TvService.Interfaces</Name>
+ </ProjectReference>
<ProjectReference Include="..\..\PluginBase\PluginBase.csproj">
<Project>{5EE20DC0-B22B-4BDB-828B-8DC5723A1873}</Project>
<Name>PluginBase</Name>
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ServerBlaster/ServerBlaster.Learn/ServerBlaster.Learn.csproj
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ServerBlaster/ServerBlaster.Learn/ServerBlaster.Learn.csproj 2011-11-26 14:51:15 UTC (rev 28329)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/ServerBlaster/ServerBlaster.Learn/ServerBlaster.Learn.csproj 2011-12-02 10:54:26 UTC (rev 28330)
@@ -113,9 +113,6 @@
<Reference Include="System.Drawing">
<Name>System.Drawing</Name>
</Reference>
- <Reference Include="System.Runtime.Serialization.Formatters.Soap">
- <Name>System.Runtime.Serialization.Formatters.Soap</Name>
- </Reference>
<Reference Include="System.Windows.Forms">
<Name>System.Windows.Forms</Name>
</Reference>
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/TvMovie/TvMovie.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/TvMovie/TvMovie.cs 2011-11-26 14:51:15 UTC (rev 28329)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/TvMovie/TvMovie.cs 2011-12-02 10:54:26 UTC (rev 28330)
@@ -27,7 +27,7 @@
using Mediaportal.TV.Server.Plugins.Base;
using Mediaportal.TV.Server.Plugins.PowerScheduler.Interfaces.Interfaces;
using Mediaportal.TV.Server.SetupControls;
-using Mediaportal.TV.Server.TVControl;
+using Mediaportal.TV.Server.TVControl.Interfaces;
using Mediaportal.TV.Server.TVDatabase.TVBusinessLayer;
using Mediaportal.TV.Server.TVLibrary.Interfaces.Logging;
using MediaPortal.Common.Utils;
@@ -100,16 +100,14 @@
{
get
{
- var setting = TvMovieDatabase.TvBLayer.GetSetting("TvMovieInstallPath", string.Empty);
- string path = setting.Value;
+ var setting = SettingsManagement.GetSetting("TvMovieInstallPath", string.Empty);
+ string path = setting.value;
if (!File.Exists(path))
{
path = GetRegistryValueFromValueName("ProgrammPath");
- setting.Value = path;
-
+ setting.value = path;
}
-
return path;
}
}
@@ -121,7 +119,7 @@
{
get
{
- string path = TvMovieDatabase.TvBLayer.GetSetting("TvMoviedatabasepath", string.Empty).Value;
+ string path = SettingsManagement.GetSetting("TvMoviedatabasepath", string.Empty).value;
if (!File.Exists(path))
path = GetRegistryValueFromValueName("DBDatei");
@@ -137,10 +135,7 @@
{
path = DatabasePath;
}
-
- var setting = TvMovieDatabase.TvBLayer.GetSetting("TvMoviedatabasepath");
- setting.Value = path;
-
+ SettingsManagement.SaveSetting("TvMoviedatabasepath", path);
}
}
@@ -275,8 +270,10 @@
try
{
- if (layer.GetSetting("TvMovieEnabled", "false").Value != "true")
+ if (SettingsManagement.GetSetting("TvMovieEnabled", "false").value != "true")
+ {
return;
+ }
}
catch (Exception ex1)
{
@@ -348,7 +345,7 @@
get { return false; }
}
- public void Start(IControllerService IControllerService)
+ public void Start(IInternalControllerService controllerService)
{
StartStopTimer(true);
}
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/TvMovie/TvMovie.csproj
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/TvMovie/TvMovie.csproj 2011-11-26 14:51:15 UTC (rev 28329)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/TvMovie/TvMovie.csproj 2011-12-02 10:54:26 UTC (rev 28330)
@@ -108,7 +108,6 @@
<ProjectReference Include="..\..\TVDatabase\TvBusinessLayer\TvBusinessLayer.csproj">
<Project>{58C35C9D-F18D-40F2-8024-24E50D01E9C5}</Project>
<Name>TvBusinessLayer</Name>
- <Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\TvLibrary.Interfaces\TvLibrary.Interfaces.csproj">
<Project>{AE752FB4-7450-4150-9BAD-19EFA9D2AC37}</Project>
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/TvMovie/TvMovieDatabase.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/TvMovie/TvMovieDatabase.cs 2011-11-26 14:51:15 UTC (rev 28329)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/TvMovie/TvMovieDatabase.cs 2011-12-02 10:54:26 UTC (rev 28330)
@@ -19,6 +19,7 @@
#endregion
using System;
+using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Data;
using System.Data.OleDb;
@@ -27,6 +28,8 @@
using System.Text;
using System.Threading;
using Mediaportal.TV.Server.TVDatabase.Entities;
+using Mediaportal.TV.Server.TVDatabase.Entities.Enums;
+using Mediaportal.TV.Server.TVDatabase.Entities.Factories;
using Mediaportal.TV.Server.TVDatabase.TVBusinessLayer;
using Mediaportal.TV.Server.TVLibrary.Interfaces;
using Mediaportal.TV.Server.TVLibrary.Interfaces.Logging;
@@ -91,8 +94,19 @@
internal class TvMovieDatabase
{
+
+ public TvMovieDatabase()
+ {
+ IEnumerable<ProgramCategory> categories = ProgramCategoryManagement.ListAllProgramCategories();
+ foreach (var programCategory in categories)
+ {
+ _categories.Add(programCategory.category, programCategory);
+ }
+ }
+
#region Members
+ private readonly IDictionary<string, ProgramCategory> _categories = new ConcurrentDictionary<string, ProgramCategory>();
private OleDbConnection _databaseConnection = null;
private bool _canceled = false;
private List<TVMChannel> _tvmEpgChannels;
@@ -223,11 +237,13 @@
List<Channel> tvChannels = new List<Channel>();
try
{
- IList<Channel> allChannels = Channel.ListAll();
+ IList<Channel> allChannels = ChannelManagement.ListAllChannelsByMediaType(MediaTypeEnum.TV);
foreach (Channel channel in allChannels)
{
- if (channel.IsTv && channel.VisibleInGuide)
+ if (channel.visibleInGuide)
+ {
tvChannels.Add(channel);
+ }
}
}
catch (Exception ex)
@@ -356,9 +372,8 @@
{
try
{
- TimeSpan restTime = new TimeSpan(Convert.ToInt32(TvBLayer.GetSetting("TvMovieRestPeriod", "24").Value), 0, 0);
- DateTime lastUpdated = Convert.ToDateTime(TvBLayer.GetSetting("TvMovieLastUpdate", "0").Value);
- // if (Convert.ToInt64(TvBLayer.GetSetting("TvMovieLastUpdate", "0").Value) == LastUpdate)
+ TimeSpan restTime = new TimeSpan(Convert.ToInt32(SettingsManagement.GetSetting("TvMovieRestPeriod", "24").value), 0, 0);
+ DateTime lastUpdated = Convert.ToDateTime(SettingsManagement.GetSetting("TvMovieLastUpdate", "0").value);
if (lastUpdated >= (DateTime.Now - restTime))
{
return false;
@@ -409,9 +424,7 @@
// setting update time of epg import to avoid that the background thread triggers another import
// if the process lasts longer than the timer's update check interval
- Setting setting = TvBLayer.GetSetting("TvMovieLastUpdate");
- setting.Value = DateTime.Now.ToString();
-
+ SettingsManagement.SaveSetting("TvMovieLastUpdate", DateTime.Now.ToString());
Log.Debug("TVMovie: Mapped {0} stations for EPG import", Convert.ToString(maximum));
int counter = 0;
@@ -419,7 +432,7 @@
_tvmEpgProgs.Clear();
// get all tv channels from MP DB via gentle.net
- IList<Channel> allChannels = Channel.ListAll();
+ IList<Channel> allChannels = ChannelManagement.ListAllChannels();
foreach (TVMChannel station in _tvmEpgChannels)
{
@@ -459,7 +472,7 @@
Thread.Sleep(32);
// make a copy of this list because Insert it done in syncronized threads - therefore the object reference would cause multiple/missing entries
- List<Program> InsertCopy = new List<Program>(_tvmEpgProgs);
+ List<Program> InsertCopy = new List<Program>(_tvmEpgProgs);
int debugCount = TvBLayer.InsertPrograms(InsertCopy, DeleteBeforeImportOption.OverlappingPrograms,
importPrio);
Log.Info("TVMovie: Inserted {0} programs", debugCount);
@@ -472,6 +485,7 @@
}
Log.Debug("TVMovie: Waiting for database to be updated...");
+ //ProgramManagement.WaitForInsertPrograms
TvBLayer.WaitForInsertPrograms();
Log.Debug("TVMovie: Database update finished.");
@@ -483,9 +497,7 @@
{
try
{
- setting = TvBLayer.GetSetting("TvMovieLastUpdate");
- setting.Value = DateTime.Now.ToString();
-
+ SettingsManagement.SaveSetting("TvMovieLastUpdate", DateTime.Now.ToString());
TimeSpan ImportDuration = (DateTime.Now - ImportStartTime);
Log.Debug("TVMovie: Imported {0} database entries for {1} stations in {2} seconds", _programsCounter, counter,
@@ -505,14 +517,14 @@
private void LoadMemberSettings()
{
- _useShortProgramDesc = TvBLayer.GetSetting("TvMovieShortProgramDesc", "false").Value == "true";
- _extendDescription = TvBLayer.GetSetting("TvMovieExtendDescription", "true").Value == "true";
- _showRatings = TvBLayer.GetSetting("TvMovieShowRatings", "true").Value == "true";
- _showAudioFormat = TvBLayer.GetSetting("TvMovieShowAudioFormat", "false").Value == "true";
- _slowImport = TvBLayer.GetSetting("TvMovieSlowImport", "true").Value == "true";
- _actorCount = Convert.ToInt32(TvBLayer.GetSetting("TvMovieLimitActors", "5").Value);
- _showLive = TvBLayer.GetSetting("TvMovieShowLive", "true").Value == "true";
- _showRepeat = TvBLayer.GetSetting("TvMovieShowRepeating", "false").Value == "true";
+ _useShortProgramDesc = SettingsManagement.GetSetting("TvMovieShortProgramDesc", "false").value == "true";
+ _extendDescription = SettingsManagement.GetSetting("TvMovieExtendDescription", "true").value == "true";
+ _showRatings = SettingsManagement.GetSetting("TvMovieShowRatings", "true").value == "true";
+ _showAudioFormat = SettingsManagement.GetSetting("TvMovieShowAudioFormat", "false").value == "true";
+ _slowImport = SettingsManagement.GetSetting("TvMovieSlowImport", "true").value == "true";
+ _actorCount = Convert.ToInt32(SettingsManagement.GetSetting("TvMovieLimitActors", "5").value);
+ _showLive = SettingsManagement.GetSetting("TvMovieShowLive", "true").value == "true";
+ _showRepeat = SettingsManagement.GetSetting("TvMovieShowRepeating", "false").value == "true";
_xmlFile = String.Format(@"{0}\TVMovieMapping.xml", PathManager.GetDataPath);
}
@@ -709,7 +721,7 @@
Channel progChannel = null;
foreach (Channel MpChannel in allChannels)
{
- if (MpChannel.IdChannel == channelMap.IdChannel)
+ if (MpChannel.idChannel == channelMap.IdChannel)
{
progChannel = MpChannel;
break;
@@ -809,8 +821,17 @@
description += "Ton: " + audioFormat;
}
- Program prog = new Program(progChannel.IdChannel, newStartDate, newEndDate, title, description, genre,
- Program.ProgramState.None, OnAirDate, String.Empty, String.Empty, episode,
+ ProgramCategory programCategory;
+ bool hasCategory = _categories.TryGetValue(genre, out programCategory);
+ if (!hasCategory)
+ {
+ programCategory = new ProgramCategory { category = genre };
+ ProgramCategoryManagement.AddCategory(programCategory);
+ _categories[genre] = programCategory;
+ }
+
+ Program prog = ProgramFactory.CreateProgram(progChannel.idChannel, newStartDate, newEndDate, title, description, programCategory,
+ ProgramState.None, OnAirDate, String.Empty, String.Empty, episode,
String.Empty, EPGStarRating, classification, parentalRating);
_tvmEpgProgs.Add(prog);
@@ -835,18 +856,18 @@
{
try
{
- string newStart = mapping.TimeSharingStart;
- string newEnd = mapping.TimeSharingEnd;
- string newStation = mapping.StationName;
- string newChannel = Channel.Retrieve(mapping.IdChannel).DisplayName;
- int newIdChannel = mapping.IdChannel;
+ string newStart = mapping.timeSharingStart;
+ string newEnd = mapping.timeSharingEnd;
+ string newStation = mapping.stationName;
+ string newChannel = mapping.Channel.displayName;
+ int newIdChannel = mapping.idChannel;
mappingList.Add(new Mapping(newChannel, newIdChannel, newStation, newStart, newEnd));
}
catch (Exception)
{
Log.Info("TVMovie: Error loading mappings - make sure tv channel: {0} (ID: {1}) still exists!",
- mapping.StationName, mapping.IdChannel);
+ mapping.stationName, mapping.idChannel);
}
}
}
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/TvMovie/TvMovieSetup.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/TvMovie/TvMovieSetup.cs 2011-11-26 14:51:15 UTC (rev 28329)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/TvMovie/TvMovieSetup.cs 2011-12-02 10:54:26 UTC (rev 28330)
@@ -27,7 +27,6 @@
using System.Windows.Forms;
using Mediaportal.TV.Server.SetupControls;
using Mediaportal.TV.Server.TVDatabase.Entities;
-using Mediaportal.TV.Server.TVDatabase.TVBusinessLayer;
using Mediaportal.TV.Server.TVLibrary.Interfaces.Logging;
using Mediaportal.TV.Server.TVService.ServiceAgents;
@@ -118,67 +117,17 @@
private void SaveDbSettings()
{
-
-
- TvMovie.DatabasePath = tbDbPath.Text;
-
-
- ServiceAgents.SettingServiceAgent.SaveSetting("TvMovieEnabled", "false");
- if (checkBoxEnableImport.Checked)
- setting.Value = "true";
- else
- setting.Value = "false";
-
- ServiceAgents.SettingServiceAgent.SaveSetting("TvMovieShortProgramDesc", "false");
- if (checkBoxUseShortDesc.Checked)
- setting.Value = "true";
- else
- setting.Value = "false";
-
- ServiceAgents.SettingServiceAgent.SaveSetting("TvMovieExtendDescription", "true");
- if (checkBoxAdditionalInfo.Checked)
- setting.Value = "true";
- else
- setting.Value = "false";
-
- ServiceAgents.SettingServiceAgent.SaveSetting("TvMovieShowAudioFormat", "false");
- if (checkBoxShowAudioFormat.Checked)
- setting.Value = "true";
- else
- setting.Value = "false";
-
- ServiceAgents.SettingServiceAgent.SaveSetting("TvMovieSlowImport", "true");
- if (checkBoxSlowImport.Checked)
- setting.Value = "true";
- else
- setting.Value = "false";
-
- ServiceAgents.SettingServiceAgent.SaveSetting("TvMovieShowRatings", "true");
- if (checkBoxShowRatings.Checked)
- setting.Value = "true";
- else
- setting.Value = "false";
-
- ServiceAgents.SettingServiceAgent.SaveSetting("TvMovieLimitActors", "5");
- if (checkBoxLimitActors.Checked)
- setting.Value = numericUpDownActorCount.Value.ToString();
- else
- setting.Value = "0";
-
- ServiceAgents.SettingServiceAgent.SaveSetting("TvMovieShowLive", "true");
- if (checkBoxShowLive.Checked)
- setting.Value = "true";
- else
- setting.Value = "false";
-
- ServiceAgents.SettingServiceAgent.SaveSetting("TvMovieShowRepeating", "false");
- if (checkBoxShowRepeat.Checked)
- setting.Value = "true";
- else
- setting.Value = "false";
-
- ServiceAgents.SettingServiceAgent.SaveSetting("TvMovieRestPeriod", "24");
- setting.Value = GetRestPeriod();
+ TvMovie.DatabasePath = tbDbPath.Text;
+ ServiceAgents.SettingServiceAgent.SaveSetting("TvMovieEnabled", checkBoxEnableImport.Checked ? "true" : "false");
+ ServiceAgents.SettingServiceAgent.SaveSetting("TvMovieShortProgramDesc", checkBoxUseShortDesc.Checked ? "true" : "false");
+ ServiceAgents.SettingServiceAgent.SaveSetting("TvMovieExtendDescription", checkBoxAdditionalInfo.Checked ? "true" : "false");
+ ServiceAgents.SettingServiceAgent.SaveSetting("TvMovieShowAudioFormat", checkBoxShowAudioFormat.Checked ? "true" : "false");
+ ServiceAgents.SettingServiceAgent.SaveSetting("TvMovieSlowImport", checkBoxSlowImport.Checked ? "true" : "false");
+ ServiceAgents.SettingServiceAgent.SaveSetting("TvMovieShowRatings", checkBoxShowRatings.Checked ? "true" : "false");
+ ServiceAgents.SettingServiceAgent.SaveSetting("TvMovieLimitActors", checkBoxLimitActors.Checked ? numericUpDownActorCount.Value.ToString() : "0");
+ ServiceAgents.SettingServiceAgent.SaveSetting("TvMovieShowLive", checkBoxShowLive.Checked ? "true" : "false");
+ ServiceAgents.SettingServiceAgent.SaveSetting("TvMovieShowRepeating", checkBoxShowRepeat.Checked ? "true" : "false");
+ ServiceAgents.SettingServiceAgent.SaveSetting("TvMovieRestPeriod", GetRestPeriod());
}
public override void OnSectionActivated()
@@ -190,15 +139,14 @@
private void LoadDbSettings()
{
-
- checkBoxEnableImport.Checked = layer.GetSetting("TvMovieEnabled", "false").Value == "true";
- checkBoxUseShortDesc.Checked = layer.GetSetting("TvMovieShortProgramDesc", "false").Value == "true";
- checkBoxAdditionalInfo.Checked = layer.GetSetting("TvMovieExtendDescription", "true").Value == "true";
- checkBoxShowRatings.Checked = layer.GetSetting("TvMovieShowRatings", "true").Value == "true";
- checkBoxShowAudioFormat.Checked = layer.GetSetting("TvMovieShowAudioFormat", "false").Value == "true";
- checkBoxSlowImport.Checked = layer.GetSetting("TvMovieSlowImport", "true").Value == "true";
+ checkBoxEnableImport.Checked = ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("TvMovieEnabled", "false").value == "true";
+ checkBoxUseShortDesc.Checked = ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("TvMovieShortProgramDesc", "false").value == "true";
+ checkBoxAdditionalInfo.Checked = ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("TvMovieExtendDescription", "true").value == "true";
+ checkBoxShowRatings.Checked = ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("TvMovieShowRatings", "true").value == "true";
+ checkBoxShowAudioFormat.Checked = ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("TvMovieShowAudioFormat", "false").value == "true";
+ checkBoxSlowImport.Checked = ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("TvMovieSlowImport", "true").value == "true";
- var tvMovieLimitActors = Convert.ToDecimal(layer.GetSetting("TvMovieLimitActors", "5").Value);
+ var tvMovieLimitActors = Convert.ToDecimal(ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("TvMovieLimitActors", "5").value);
if (tvMovieLimitActors < numericUpDownActorCount.Minimum || tvMovieLimitActors > numericUpDownActorCount.Maximum)
{
checkBoxLimitActors.Checked = false;
@@ -210,9 +158,9 @@
numericUpDownActorCount.Value = tvMovieLimitActors;
}
- checkBoxShowLive.Checked = layer.GetSetting("TvMovieShowLive", "true").Value == "true";
- checkBoxShowRepeat.Checked = layer.GetSetting("TvMovieShowRepeating", "false").Value == "true";
- SetRestPeriod(layer.GetSetting("TvMovieRestPeriod", "24").Value);
+ checkBoxShowLive.Checked = ServiceAgents.SettingServiceAgent.GetSettingWithDefaultValue("TvMovieShowLive", "true").value == ...
[truncated message content] |
Author: gibman_dk
Date: 2011-11-26 15:51:15 +0100 (Sat, 26 Nov 2011)
New Revision: 28329
Added:
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/ServiceHelper.cs
Modified:
branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PluginBase/PluginBase.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PowerScheduler/PowerSchedulerPlugin.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/XmlTvImport/XmlTvImporter.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/ServiceAgents/ServiceAgents.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/App.config
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/TvControl.csproj
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/App.config
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Service1.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Services/ServiceManager.cs
Log:
removed the need for static servicemodel config.
now all services are instantiated and configured at runtime.
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PluginBase/PluginBase.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PluginBase/PluginBase.cs 2011-11-26 09:04:32 UTC (rev 28328)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PluginBase/PluginBase.cs 2011-11-26 14:51:15 UTC (rev 28329)
@@ -33,9 +33,14 @@
public interface ITvServerPluginCommunciation
{
/// <summary>
- /// Supply a WCF class for client-server plugin communication
+ /// Supply a service class implementation for client-server plugin communication
/// </summary>
- Type GetServiceForContractType { get; }
+ object GetServiceInstance { get; }
+
+ /// <summary>
+ /// Supply a service class interface for client-server plugin communication
+ /// </summary>
+ Type GetServiceInterfaceForContractType { get; }
}
/// <summary>
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PowerScheduler/PowerSchedulerPlugin.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PowerScheduler/PowerSchedulerPlugin.cs 2011-11-26 09:04:32 UTC (rev 28328)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/PowerScheduler/PowerSchedulerPlugin.cs 2011-11-26 14:51:15 UTC (rev 28329)
@@ -22,6 +22,7 @@
using System;
using Mediaportal.TV.Server.Plugins.Base;
+using Mediaportal.TV.Server.Plugins.PowerScheduler.Interfaces.Interfaces;
using Mediaportal.TV.Server.SetupControls;
using Mediaportal.TV.Server.TVControl;
using Mediaportal.TV.Server.TVControl.Interfaces;
@@ -35,11 +36,6 @@
{
#region Variables
- /// <summary>
- /// Reference to the tvservice's TVcontroller
- /// </summary>
- private IInternalControllerService _controllerService;
-
#endregion
#region Constructor
@@ -59,7 +55,6 @@
/// <param name="controllerService">Reference to the tvservice's TVController</param>
public void Start(IInternalControllerService controllerService)
{
- _controllerService = controllerService;
PowerScheduler.Instance.Start(controllerService);
}
@@ -125,14 +120,22 @@
#region ITvServerPluginCommunciation
- public Type GetServiceForContractType
+ public object GetServiceInstance
{
get
{
- return new PowerScheduler().GetType();
+ return PowerScheduler.Instance;
}
}
+ /// <summary>
+ /// Supply a service class interface for client-server plugin communication
+ /// </summary>
+ public Type GetServiceInterfaceForContractType
+ {
+ get { return typeof(IPowerController); }
+ }
+
#endregion
}
}
\ No newline at end of file
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/XmlTvImport/XmlTvImporter.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/XmlTvImport/XmlTvImporter.cs 2011-11-26 09:04:32 UTC (rev 28328)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/Plugins/XmlTvImport/XmlTvImporter.cs 2011-11-26 14:51:15 UTC (rev 28329)
@@ -955,9 +955,14 @@
#endregion
- public Type GetServiceForContractType
+ public object GetServiceInstance
{
- get { return new XMLTVImportService().GetType(); }
+ get { return new XMLTVImportService(); }
}
+
+ public Type GetServiceInterfaceForContractType
+ {
+ get { return typeof(IXMLTVImportService); }
+ }
}
}
\ No newline at end of file
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/ServiceAgents/ServiceAgents.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/ServiceAgents/ServiceAgents.cs 2011-11-26 09:04:32 UTC (rev 28328)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/ServiceAgents/ServiceAgents.cs 2011-11-26 14:51:15 UTC (rev 28329)
@@ -1,7 +1,9 @@
using System;
using System.Collections.Generic;
+using System.Net;
using System.ServiceModel;
using MediaPortal.Common.Utils;
+using Mediaportal.TV.Server.TVControl;
using Mediaportal.TV.Server.TVControl.Interfaces;
using Mediaportal.TV.Server.TVService.Interfaces.Services;
@@ -9,7 +11,7 @@
{
public static class ServiceAgents
{
- private static string _hostname = System.Net.Dns.GetHostName();
+ private static string _hostname = Dns.GetHostName();
static ServiceAgents ()
{
@@ -109,19 +111,19 @@
{
bool found = GlobalServiceProvider.IsRegistered<I>();
- var binding = new BasicHttpBinding {Name = "TvServiceBinding"};
- var endpoint = new EndpointAddress("http://" + _hostname + ":8000/TVService/" + typeof(I).Name);
+ var binding = ServiceHelper.GetBinding();
+ var endpoint = new EndpointAddress(ServiceHelper.GetEndpointURL(typeof(I), _hostname));
var channelFactory = new ChannelFactory<I>(binding, endpoint);
I channel = channelFactory.CreateChannel();
if (found)
{
- GlobalServiceProvider.Replace<I>(channel);
+ GlobalServiceProvider.Replace(channel);
}
else
{
- GlobalServiceProvider.Add<I>(channel);
+ GlobalServiceProvider.Add(channel);
}
- }
+ }
public static I PluginService<I> ()
{
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/App.config
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/App.config 2011-11-26 09:04:32 UTC (rev 28328)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/App.config 2011-11-26 14:51:15 UTC (rev 28329)
@@ -7,28 +7,6 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<probing privatePath="plugins" />
</assemblyBinding>
- </runtime>
-
- <system.serviceModel>
- <bindings>
- <basicHttpBinding>
- <binding name="TvServiceBinding" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" maxBufferSize="2147483647" maxBufferPoolSize="2147483647" maxReceivedMessageSize="2147483647" messageEncoding="Text" textEncoding="utf-8" transferMode="Buffered" useDefaultWebProxy="true">
- <readerQuotas maxDepth="200" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647" />
- <security mode="None">
- <transport clientCredentialType="None" proxyCredentialType="None" realm="" />
- <message clientCredentialType="UserName" algorithmSuite="Default" />
- </security>
- </binding>
- </basicHttpBinding>
- </bindings>
-
- <behaviors>
- <endpointBehaviors>
- <behavior name="ServiceViewEventBehavior">
- <dataContractSerializer maxItemsInObjectGraph="2147483647" />
- </behavior>
- </endpointBehaviors>
- </behaviors>
- </system.serviceModel>
+ </runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
Added: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/ServiceHelper.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/ServiceHelper.cs (rev 0)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/ServiceHelper.cs 2011-11-26 14:51:15 UTC (rev 28329)
@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.ServiceModel;
+using System.Text;
+
+namespace Mediaportal.TV.Server.TVControl
+{
+ public static class ServiceHelper
+ {
+ public static BasicHttpBinding GetBinding()
+ {
+ var defaultBinding = new BasicHttpBinding
+ {
+ Name = "defaultBasicHttpBinding",
+ MaxBufferSize = Int32.MaxValue,
+ MaxReceivedMessageSize = Int32.MaxValue,
+ ReaderQuotas =
+ {
+ MaxDepth = 32,
+ MaxStringContentLength = Int32.MaxValue,
+ MaxArrayLength = Int32.MaxValue,
+ MaxBytesPerRead = Int32.MaxValue,
+ MaxNameTableCharCount = Int32.MaxValue
+ },
+ Security =
+ {
+ Mode = BasicHttpSecurityMode.None,
+ Transport = { ClientCredentialType = HttpClientCredentialType.None }
+ }
+ };
+ return defaultBinding;
+ }
+
+ public static string GetEndpointURL(Type type, string hostName)
+ {
+ return @"http://" + hostName + ":8000/TVService/" + type.Name;
+ }
+ }
+}
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/TvControl.csproj
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/TvControl.csproj 2011-11-26 09:04:32 UTC (rev 28328)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvControl/TvControl.csproj 2011-11-26 14:51:15 UTC (rev 28329)
@@ -117,6 +117,7 @@
<Compile Include="Interfaces\IScheduleService.cs" />
<Compile Include="Interfaces\ISettingService.cs" />
<Compile Include="RemoteControl.cs" />
+ <Compile Include="ServiceHelper.cs" />
<Compile Include="TCP\PacketProtocol.cs" />
<Compile Include="User.cs" />
<Compile Include="Util.cs" />
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/App.config
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/App.config 2011-11-26 09:04:32 UTC (rev 28328)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/App.config 2011-11-26 14:51:15 UTC (rev 28329)
@@ -39,274 +39,4 @@
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
</startup>
-
- <system.serviceModel>
- <services>
- <!-- This section is optional with the new configuration model
- introduced in .NET Framework 4. -->
-
- <service name="Mediaportal.TV.Server.TVService.Services.ChannelService"
- behaviorConfiguration="TVServiceBehavior">
- <host>
- <baseAddresses>
- <add baseAddress="http://localhost:8000/TVService/IChannelService"/>
- </baseAddresses>
- </host>
- <endpoint address="" binding="basicHttpBinding" bindingConfiguration="defaultBasicHttpBinding" contract="Mediaportal.TV.Server.TVControl.Interfaces.IChannelService">
- <identity>
- <dns value="localhost" />
- </identity>
- </endpoint>
- <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange">
- <identity>
- <dns value="localhost" />
- </identity>
- </endpoint>
- </service>
-
- <service name="Mediaportal.TV.Server.TVService.Services.ProgramService"
- behaviorConfiguration="TVServiceBehavior">
- <host>
- <baseAddresses>
- <add baseAddress="http://localhost:8000/TVService/IProgramService"/>
- </baseAddresses>
- </host>
- <endpoint address="" binding="basicHttpBinding" bindingConfiguration="defaultBasicHttpBinding" contract="Mediaportal.TV.Server.TVControl.Interfaces.IProgramService">
- <identity>
- <dns value="localhost" />
- </identity>
- </endpoint>
- <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange">
- <identity>
- <dns value="localhost" />
- </identity>
- </endpoint>
- </service>
-
- <service name="Mediaportal.TV.Server.TVService.Services.SettingService"
- behaviorConfiguration="TVServiceBehavior">
- <host>
- <baseAddresses>
- <add baseAddress="http://localhost:8000/TVService/ISettingService"/>
- </baseAddresses>
- </host>
- <endpoint address="" binding="basicHttpBinding" bindingConfiguration="defaultBasicHttpBinding" contract="Mediaportal.TV.Server.TVControl.Interfaces.ISettingService">
- <identity>
- <dns value="localhost" />
- </identity>
- </endpoint>
- <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange">
- <identity>
- <dns value="localhost" />
- </identity>
- </endpoint>
- </service>
-
- <service name="Mediaportal.TV.Server.TVService.Services.ChannelGroupService"
- behaviorConfiguration="TVServiceBehavior">
- <host>
- <baseAddresses>
- <add baseAddress="http://localhost:8000/TVService/IChannelGroupService"/>
- </baseAddresses>
- </host>
- <endpoint address="" binding="basicHttpBinding" bindingConfiguration="defaultBasicHttpBinding" contract="Mediaportal.TV.Server.TVControl.Interfaces.IChannelGroupService">
- <identity>
- <dns value="localhost" />
- </identity>
- </endpoint>
-
- <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange">
- <identity>
- <dns value="localhost" />
- </identity>
- </endpoint>
- </service>
-
- <service name="Mediaportal.TV.Server.TVService.Services.CanceledScheduleService"
- behaviorConfiguration="TVServiceBehavior">
- <host>
- <baseAddresses>
- <add baseAddress="http://localhost:8000/TVService/ICanceledScheduleService"/>
- </baseAddresses>
- </host>
- <endpoint address="" binding="basicHttpBinding" bindingConfiguration="defaultBasicHttpBinding" contract="Mediaportal.TV.Server.TVControl.Interfaces.ICanceledScheduleService">
- <identity>
- <dns value="localhost" />
- </identity>
- </endpoint>
-
- <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange">
- <identity>
- <dns value="localhost" />
- </identity>
- </endpoint>
- </service>
-
- <service name="Mediaportal.TV.Server.TVService.Services.CardService"
- behaviorConfiguration="TVServiceBehavior">
- <host>
- <baseAddresses>
- <add baseAddress="http://localhost:8000/TVService/ICardService"/>
- </baseAddresses>
- </host>
- <endpoint address="" binding="basicHttpBinding" bindingConfiguration="defaultBasicHttpBinding" contract="Mediaportal.TV.Server.TVControl.Interfaces.ICardService">
- <identity>
- <dns value="localhost" />
- </identity>
- </endpoint>
-
- <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange">
- <identity>
- <dns value="localhost" />
- </identity>
- </endpoint>
- </service>
-
- <service name="Mediaportal.TV.Server.TVService.Services.ConflictService"
- behaviorConfiguration="TVServiceBehavior">
- <host>
- <baseAddresses>
- <add baseAddress="http://localhost:8000/TVService/IConflictService"/>
- </baseAddresses>
- </host>
- <endpoint address="" binding="basicHttpBinding" bindingConfiguration="defaultBasicHttpBinding" contract="Mediaportal.TV.Server.TVControl.Interfaces.IConflictService">
- <identity>
- <dns value="localhost" />
- </identity>
- </endpoint>
-
- <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange">
- <identity>
- <dns value="localhost" />
- </identity>
- </endpoint>
- </service>
-
- <service name="Mediaportal.TV.Server.TVService.Services.ProgramCategoryService"
- behaviorConfiguration="TVServiceBehavior">
- <host>
- <baseAddresses>
- <add baseAddress="http://localhost:8000/TVService/IProgramCategoryService"/>
- </baseAddresses>
- </host>
- <endpoint address="" binding="basicHttpBinding" bindingConfiguration="defaultBasicHttpBinding" contract="Mediaportal.TV.Server.TVControl.Interfaces.IProgramCategoryService">
- <identity>
- <dns value="localhost" />
- </identity>
- </endpoint>
-
- <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange">
- <identity>
- <dns value="localhost" />
- </identity>
- </endpoint>
- </service>
-
- <service name="Mediaportal.TV.Server.TVService.Services.RecordingService"
- behaviorConfiguration="TVServiceBehavior">
- <host>
- <baseAddresses>
- <add baseAddress="http://localhost:8000/TVService/IRecordingService"/>
- </baseAddresses>
- </host>
- <endpoint address="" binding="basicHttpBinding" bindingConfiguration="defaultBasicHttpBinding" contract="Mediaportal.TV.Server.TVControl.Interfaces.IRecordingService">
- <identity>
- <dns value="localhost" />
- </identity>
- </endpoint>
-
- <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange">
- <identity>
- <dns value="localhost" />
- </identity>
- </endpoint>
- </service>
-
- <service name="Mediaportal.TV.Server.TVService.Services.ScheduleService"
- behaviorConfiguration="TVServiceBehavior">
- <host>
- <baseAddresses>
- <add baseAddress="http://localhost:8000/TVService/IScheduleService"/>
- </baseAddresses>
- </host>
- <endpoint address="" binding="basicHttpBinding" bindingConfiguration="defaultBasicHttpBinding" contract="Mediaportal.TV.Server.TVControl.Interfaces.IScheduleService">
- <identity>
- <dns value="localhost" />
- </identity>
- </endpoint>
-
- <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange">
- <identity>
- <dns value="localhost" />
- </identity>
- </endpoint>
- </service>
-
- <service name="Mediaportal.TV.Server.TVService.Services.UserService"
- behaviorConfiguration="TVServiceBehavior">
- <host>
- <baseAddresses>
- <add baseAddress="http://localhost:8000/TVService/IUserService"/>
- </baseAddresses>
- </host>
- <endpoint address="" binding="basicHttpBinding" bindingConfiguration="defaultBasicHttpBinding" contract="Mediaportal.TV.Server.TVControl.Interfaces.IUserService">
- <identity>
- <dns value="localhost" />
- </identity>
- </endpoint>
-
- <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange">
- <identity>
- <dns value="localhost" />
- </identity>
- </endpoint>
- </service>
-
- <service name="Mediaportal.TV.Server.TVService.Services.TvControllerService"
- behaviorConfiguration="TVServiceBehavior">
- <host>
- <baseAddresses>
- <add baseAddress="http://localhost:8000/TVService/IControllerService"/>
- </baseAddresses>
- </host>
- <endpoint address="" binding="basicHttpBinding" bindingConfiguration="defaultBasicHttpBinding" contract="Mediaportal.TV.Server.TVControl.Interfaces.IControllerService">
- <identity>
- <dns value="localhost" />
- </identity>
- </endpoint>
-
- <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange">
- <identity>
- <dns value="localhost" />
- </identity>
- </endpoint>
- </service>
-
-
- </services>
- <behaviors>
- <serviceBehaviors>
- <behavior name="TVServiceBehavior">
- <dataContractSerializer maxItemsInObjectGraph="2147483647" />
- <serviceMetadata httpGetEnabled="true" />
- <serviceDebug includeExceptionDetailInFaults="True" />
- </behavior>
- </serviceBehaviors>
- </behaviors>
-
- <bindings>
- <basicHttpBinding>
- <binding name="defaultBasicHttpBinding" maxBufferSize="2147483647" maxReceivedMessageSize="2147483647">
- <readerQuotas maxDepth="200" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647" />
- <security mode="None">
- <transport clientCredentialType="None" />
- </security>
- </binding>
- </basicHttpBinding>
- </bindings>
-
- </system.serviceModel>
-
-
-
</configuration>
\ No newline at end of file
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Service1.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Service1.cs 2011-11-26 09:04:32 UTC (rev 28328)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Service1.cs 2011-11-26 14:51:15 UTC (rev 28329)
@@ -805,7 +805,11 @@
{
if (plugin is ITvServerPluginCommunciation)
{
- ServiceManager.AddService((plugin as ITvServerPluginCommunciation).GetServiceForContractType);
+ var tvServerPluginCommunciation = (plugin as ITvServerPluginCommunciation);
+ Type interfaceType = tvServerPluginCommunciation.GetServiceInterfaceForContractType;
+ object instance = tvServerPluginCommunciation.GetServiceInstance;
+
+ ServiceManager.AddService(interfaceType, instance);
}
Log.Info("TV Service: Plugin: {0} started", plugin.Name);
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Services/ServiceManager.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Services/ServiceManager.cs 2011-11-26 09:04:32 UTC (rev 28328)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Services/ServiceManager.cs 2011-11-26 14:51:15 UTC (rev 28329)
@@ -4,6 +4,7 @@
using System.ServiceModel;
using System.ServiceModel.Description;
using MediaPortal.Common.Utils;
+using Mediaportal.TV.Server.TVControl;
using Mediaportal.TV.Server.TVControl.Interfaces;
using Mediaportal.TV.Server.TVLibrary.Interfaces.Logging;
using Mediaportal.TV.Server.TVService.Interfaces.Services;
@@ -15,7 +16,7 @@
private static readonly object _lock = new object();
private static readonly IDictionary<Type, ServiceHost> _serviceHosts = new Dictionary<Type, ServiceHost>();
- private static readonly IDictionary<Type, Type> _staticMappings = new Dictionary<Type, Type>
+ /*private static readonly IDictionary<Type, Type> _staticMappings = new Dictionary<Type, Type>
{
{typeof (IProgramCategoryService), typeof (ProgramCategoryService)},
{typeof (IConflictService), typeof (ConflictService)},
@@ -28,29 +29,11 @@
{typeof (IScheduleService), typeof(ScheduleService)},
{typeof (IChannelGroupService), typeof(ChannelGroupService)},
{typeof (IControllerService), typeof(TvControllerService)}
- };
-
- /*private static readonly IList<Type> _staticMappings = new List<Type>
- {
- {typeof (IProgramCategoryService)},
- {typeof (IConflictService)},
- {typeof (ICardService)},
- {typeof (ICanceledScheduleService)},
- {typeof (IChannelService)},
- {typeof (IProgramService)},
- {typeof (ISettingService)},
- {typeof (IRecordingService)},
- {typeof (IScheduleService)},
- {typeof (IChannelGroupService)},
- {typeof (IUserService)},
- {typeof (IControllerService)}
- };
- */
-
+ }; */
static ServiceManager()
- {
- GlobalServiceProvider.Add<IProgramCategoryService>(new ProgramCategoryService());
+ {
+ /*GlobalServiceProvider.Add<IProgramCategoryService>(new ProgramCategoryService());
GlobalServiceProvider.Add<IConflictService>(new ConflictService());
GlobalServiceProvider.Add<ICardService>(new CardService());
GlobalServiceProvider.Add<ICanceledScheduleService>(new CanceledScheduleService());
@@ -61,7 +44,37 @@
GlobalServiceProvider.Add<IScheduleService>(new ScheduleService());
GlobalServiceProvider.Add<IChannelGroupService>(new ChannelGroupService());
GlobalServiceProvider.Add<IControllerService>(new TvControllerService());
- GlobalServiceProvider.Add<IInternalControllerService>(new TvController());
+ GlobalServiceProvider.Add<IInternalControllerService>(new TvController());
+ */
+
+ /*
+ AddService<IProgramCategoryService, ProgramCategoryService>(typeof(ProgramCategoryService));
+ AddService<IConflictService, ConflictService>(typeof(ConflictService));
+ AddService<ICardService, CardService>(typeof(CardService));
+ AddService<ICanceledScheduleService, CanceledScheduleService>(typeof(CanceledScheduleService));
+ AddService<IChannelService, ChannelService>(typeof(ChannelService));
+ AddService<IProgramService, ProgramService>(typeof(ProgramService));
+ AddService<ISettingService, SettingService>(typeof(SettingService));
+ AddService<IRecordingService, RecordingService>(typeof(RecordingService));
+ AddService<IScheduleService, ScheduleService>(typeof(ScheduleService));
+ AddService<IChannelGroupService, ChannelGroupService>(typeof(ChannelGroupService));
+ AddService<IControllerService, TvControllerService>(typeof(TvControllerService));
+ AddService<IInternalControllerService, TvController>(typeof(TvController));
+ */
+
+ AddService<IProgramCategoryService, ProgramCategoryService>();
+ AddService<IConflictService, ConflictService>();
+ AddService<ICardService, CardService>();
+ AddService<ICanceledScheduleService, CanceledScheduleService>();
+ AddService<IChannelService, ChannelService>();
+ AddService<IProgramService, ProgramService>();
+ AddService<ISettingService, SettingService>();
+ AddService<IRecordingService, RecordingService>();
+ AddService<IScheduleService, ScheduleService>();
+ AddService<IChannelGroupService, ChannelGroupService>();
+ AddService<IControllerService, TvControllerService>();
+
+ GlobalServiceProvider.Add<IInternalControllerService>(new TvController());
}
public static ICardService CardService
@@ -124,33 +137,42 @@
get { return GlobalServiceProvider.Get<IControllerService>(); }
}
- private static BasicHttpBinding GetBinding()
+ public static void AddService(Type interfaceType, object instance)
{
- var defaultBinding = new BasicHttpBinding();
- defaultBinding.Name = "defaultBasicHttpBinding";
- defaultBinding.MaxBufferSize = int.MaxValue;
- defaultBinding.MaxReceivedMessageSize = int.MaxValue;
- defaultBinding.ReaderQuotas.MaxDepth = 32;
- defaultBinding.ReaderQuotas.MaxStringContentLength = int.MaxValue;
- defaultBinding.ReaderQuotas.MaxArrayLength = int.MaxValue;
- defaultBinding.ReaderQuotas.MaxBytesPerRead = int.MaxValue;
- defaultBinding.ReaderQuotas.MaxNameTableCharCount = int.MaxValue;
- defaultBinding.Security.Mode = BasicHttpSecurityMode.None;
- defaultBinding.Security.Transport.ClientCredentialType = HttpClientCredentialType.None;
- return defaultBinding;
+ Type implType = instance.GetType();
+ ThrowExceptionIfServiceAlreadyAdded(implType);
+ ServiceHost serviceHost = GetServiceHost(interfaceType, implType);
+ lock (_lock)
+ {
+ GlobalServiceProvider.Add(interfaceType, instance);
+ _serviceHosts.Add(implType, serviceHost);
+ }
}
- public static void AddService(Type contractType)
+ public static void AddService<I, T>() where T : class, I, new()
{
- ThrowExceptionIfServiceAlreadyAdded(contractType);
-
- var serviceHost = new ServiceHost(contractType);
- BasicHttpBinding defaultBinding = GetBinding();
- var httpUri = new Uri(@"http://localhost:8000/TVService/" + contractType.Name);
+ Type implType = typeof (T);
+ Type interfaceType = typeof (I);
+ ThrowExceptionIfServiceAlreadyAdded(implType);
+ ServiceHost serviceHost = GetServiceHost(interfaceType, implType);
+ lock (_lock)
+ {
+ var service = new T();
+ GlobalServiceProvider.Add<I>(service);
+ _serviceHosts.Add(implType, serviceHost);
+ }
+ }
+
+ private static ServiceHost GetServiceHost(Type interfaceType, Type implType)
+ {
+ var serviceHost = new ServiceHost(implType);
+ BasicHttpBinding defaultBinding = ServiceHelper.GetBinding();
+ var httpUri = new Uri(ServiceHelper.GetEndpointURL(interfaceType, "localhost"));
+
var endpointAddress = new EndpointAddress(httpUri, EndpointIdentity.CreateSpnIdentity("localhost"));
- ContractDescription contract = ContractDescription.GetContract(contractType);
+ ContractDescription contract = ContractDescription.GetContract(implType);
var endpoint = new ServiceEndpoint(contract, defaultBinding, endpointAddress);
- serviceHost.AddServiceEndpoint(endpoint);
+ serviceHost.AddServiceEndpoint(endpoint);
var serviceDebugBehaviour = serviceHost.Description.Behaviors.Find<ServiceDebugBehavior>();
serviceDebugBehaviour.IncludeExceptionDetailInFaults = true;
@@ -164,21 +186,16 @@
var serviceMetaDataBehaviour = serviceHost.Description.Behaviors.Find<ServiceMetadataBehavior>();
if (serviceMetaDataBehaviour == null)
{
- serviceMetaDataBehaviour = new ServiceMetadataBehavior { HttpGetEnabled = true };
+ serviceMetaDataBehaviour = new ServiceMetadataBehavior {HttpGetEnabled = true};
serviceHost.Description.Behaviors.Add(serviceMetaDataBehaviour);
}
else
{
- serviceMetaDataBehaviour.HttpsGetEnabled = true;
+ serviceMetaDataBehaviour.HttpsGetEnabled = true;
}
serviceMetaDataBehaviour.HttpGetUrl = httpUri;
-
serviceHost.Open();
- lock (_lock)
- {
- GlobalServiceProvider.Add(serviceHost);
- _serviceHosts.Add(contractType, serviceHost);
- }
+ return serviceHost;
}
private static void ThrowExceptionIfServiceAlreadyAdded(Type contractType)
@@ -195,7 +212,7 @@
public static void Start ()
{
//System.Diagnostics.Debugger.Launch();
- Log.Debug("starting WCF service.");
+ /*Log.Debug("starting WCF service.");
try
{
if (_serviceHosts.Count > 0)
@@ -222,7 +239,7 @@
Log.Error("could not start WCF service", ex);
throw;
}
- Log.Debug("WCF service(s) started.");
+ Log.Debug("WCF service(s) started."); */
}
public static void Close()
@@ -246,5 +263,7 @@
throw;
}
}
+
+
}
}
|
|
From: <gib...@su...> - 2011-11-26 09:04:39
|
Author: gibman_dk
Date: 2011-11-26 10:04:32 +0100 (Sat, 26 Nov 2011)
New Revision: 28328
Modified:
branches/TVEngine3-Experimental/Mediaportal/TV/Server/ServiceAgents/ServiceAgents.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/App.config
Log:
dynamic generated service agents now should use the XML defined http binding.
client WCF values increased to max.
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/ServiceAgents/ServiceAgents.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/ServiceAgents/ServiceAgents.cs 2011-11-25 20:57:12 UTC (rev 28327)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/ServiceAgents/ServiceAgents.cs 2011-11-26 09:04:32 UTC (rev 28328)
@@ -107,9 +107,9 @@
public static void AddService<I>()
where I : class
{
- bool found = GlobalServiceProvider.IsRegistered<I>();
-
- var binding = new BasicHttpBinding();
+ bool found = GlobalServiceProvider.IsRegistered<I>();
+
+ var binding = new BasicHttpBinding {Name = "TvServiceBinding"};
var endpoint = new EndpointAddress("http://" + _hostname + ":8000/TVService/" + typeof(I).Name);
var channelFactory = new ChannelFactory<I>(binding, endpoint);
I channel = channelFactory.CreateChannel();
Modified: branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/App.config
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/App.config 2011-11-25 20:57:12 UTC (rev 28327)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/App.config 2011-11-26 09:04:32 UTC (rev 28328)
@@ -12,7 +12,7 @@
<system.serviceModel>
<bindings>
<basicHttpBinding>
- <binding name="TvServiceBinding" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" maxBufferSize="5000000" maxBufferPoolSize="524288" maxReceivedMessageSize="5000000" messageEncoding="Text" textEncoding="utf-8" transferMode="Buffered" useDefaultWebProxy="true">
+ <binding name="TvServiceBinding" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" maxBufferSize="2147483647" maxBufferPoolSize="2147483647" maxReceivedMessageSize="2147483647" messageEncoding="Text" textEncoding="utf-8" transferMode="Buffered" useDefaultWebProxy="true">
<readerQuotas maxDepth="200" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647" />
<security mode="None">
<transport clientCredentialType="None" proxyCredentialType="None" realm="" />
|
Author: gibman_dk
Date: 2011-11-25 21:57:12 +0100 (Fri, 25 Nov 2011)
New Revision: 28327
Added:
branches/TVEngine3-Experimental/Mediaportal/TV/ExternalBinaries/
branches/TVEngine3-Experimental/Mediaportal/TV/ExternalBinaries/EntityFramework.dll
branches/TVEngine3-Experimental/Mediaportal/TV/ExternalBinaries/EntityFramework.xml
branches/TVEngine3-Experimental/Mediaportal/TV/ExternalBinaries/MySql.Data.dll
branches/TVEngine3-Experimental/Mediaportal/TV/ExternalBinaries/log4net.dll
Modified:
branches/TVEngine3-Experimental/Mediaportal/TV/Server/SetupTv/SetupTv.csproj
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TVDatabase/EntityModel/EntityModel.csproj
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TVDatabase/TvBusinessLayer/TvBusinessLayer.csproj
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvLibrary.Interfaces/TvLibrary.Interfaces.csproj
branches/TVEngine3-Experimental/Mediaportal/TV/TvPlugin/TvPlugin.csproj
Log:
added new folder for ExternalBinaries
Added: branches/TVEngine3-Experimental/Mediaportal/TV/ExternalBinaries/EntityFramework.dll
===================================================================
(Binary files differ)
Property changes on: branches/TVEngine3-Experimental/Mediaportal/TV/ExternalBinaries/EntityFramework.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/TVEngine3-Experimental/Mediaportal/TV/ExternalBinaries/EntityFramework.xml
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/ExternalBinaries/EntityFramework.xml (rev 0)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/ExternalBinaries/EntityFramework.xml 2011-11-25 20:57:12 UTC (rev 28327)
@@ -0,0 +1,13206 @@
+<?xml version="1.0"?>
+<doc>
+ <assembly>
+ <name>EntityFramework</name>
+ </assembly>
+ <members>
+ <member name="T:System.Data.Edm.Strings">
+ <summary>
+ Strongly-typed and parameterized string resources.
+ </summary>
+ </member>
+ <member name="M:System.Data.Edm.Strings.EdmPrimitiveType_SetPropertyNotSupported(System.Object)">
+ <summary>
+ A string like "The '{0}' property of EdmPrimitiveType is fixed and cannot be set."
+ </summary>
+ </member>
+ <member name="M:System.Data.Edm.Strings.EdmModel_Validator_Semantic_SystemNamespaceEncountered(System.Object)">
+ <summary>
+ A string like "The namespace '{0}' is a system namespace and cannot be used by other schemas. Choose another namespace name."
+ </summary>
+ </member>
+ <member name="M:System.Data.Edm.Strings.EdmModel_Validator_Semantic_SimilarRelationshipEnd(System.Object,System.Object,System.Object,System.Object,System.Object)">
+ <summary>
+ A string like "Role '{0}' in AssociationSets ‘{1}’ and ‘{2}’ refers to the same EntitySet '{3}' in EntityContainer '{4}'. Make sure that if two or more AssociationSets refer to the same AssociationType, the ends do not refer to the same EntitySet."
+ </summary>
+ </member>
+ <member name="M:System.Data.Edm.Strings.EdmModel_Validator_Semantic_InvalidEntitySetNameReference(System.Object,System.Object)">
+ <summary>
+ A string like "The referenced EntitySet ‘{0}’ for End ‘{1}’ could not be found in the containing EntityContainer."
+ </summary>
+ </member>
+ <member name="M:System.Data.Edm.Strings.EdmModel_Validator_Semantic_ConcurrencyRedefinedOnSubTypeOfEntitySetType(System.Object,System.Object,System.Object)">
+ <summary>
+ A string like "Type '{0}' is derived from type '{1}' that is the type for EntitySet '{2}'. Type '{0}' defines new concurrency requirements that are not allowed for subtypes of base EntitySet types."
+ </summary>
+ </member>
+ <member name="M:System.Data.Edm.Strings.EdmModel_Validator_Semantic_EntitySetTypeHasNoKeys(System.Object,System.Object)">
+ <summary>
+ A string like "EntitySet ‘{0}’ is based on type ‘{1}’ that has no keys defined."
+ </summary>
+ </member>
+ <member name="M:System.Data.Edm.Strings.EdmModel_Validator_Semantic_DuplicateEndName(System.Object)">
+ <summary>
+ A string like "The end name ‘{0}’ is already defined."
+ </summary>
+ </member>
+ <member name="M:System.Data.Edm.Strings.EdmModel_Validator_Semantic_DuplicatePropertyNameSpecifiedInEntityKey(System.Object,System.Object)">
+ <summary>
+ A string like "The key specified in EntityType '{0}' is not valid. Property '{1}' is referenced more than once in the Key element."
+ </summary>
+ </member>
+ <member name="M:System.Data.Edm.Strings.EdmModel_Validator_Semantic_InvalidCollectionKindNotCollection(System.Object)">
+ <summary>
+ A string like "Property '{0}' has a CollectionKind specified but is not a collection property."
+ </summary>
+ </member>
+ <member name="M:System.Data.Edm.Strings.EdmModel_Validator_Semantic_InvalidCollectionKindNotV1_1(System.Object)">
+ <summary>
+ A string like "Property '{0}' has a CollectionKind specified. CollectionKind is only supported in version 1.1 EDM models."
+ </summary>
+ </member>
+ <member name="M:System.Data.Edm.Strings.EdmModel_Validator_Semantic_InvalidComplexTypeAbstract(System.Object)">
+ <summary>
+ A string like "ComplexType '{0}' is marked as abstract. Abstract ComplexTypes are only supported in version 1.1 EDM models."
+ </summary>
+ </member>
+ <member name="M:System.Data.Edm.Strings.EdmModel_Validator_Semantic_InvalidComplexTypePolymorphic(System.Object)">
+ <summary>
+ A string like "ComplexType '{0}' has a BaseType specified. ComplexType inheritance is only supported in version 1.1 EDM models."
+ </summary>
+ </member>
+ <member name="M:System.Data.Edm.Strings.EdmModel_Validator_Semantic_InvalidKeyNullablePart(System.Object,System.Object)">
+ <summary>
+ A string like "Key part '{0}' for type ‘{1}’ is not valid. All parts of the key must be non-nullable."
+ </summary>
+ </member>
+ <member name="M:System.Data.Edm.Strings.EdmModel_Validator_Semantic_EntityKeyMustBeScalar(System.Object,System.Object)">
+ <summary>
+ A string like "The property '{0}' in EntityType '{1}' is not valid. All properties that are part of the EntityKey must be of PrimitiveType."
+ </summary>
+ </member>
+ <member name="M:System.Data.Edm.Strings.EdmModel_Validator_Semantic_InvalidKeyKeyDefinedInBaseClass(System.Object,System.Object)">
+ <summary>
+ A string like "Key usage is not valid. The {0} class cannot define keys because one of its base classes (‘{1}’) defines keys."
+ </summary>
+ </member>
+ <member name="M:System.Data.Edm.Strings.EdmModel_Validator_Semantic_KeyMissingOnEntityType(System.Object)">
+ <summary>
+ A string like "EntityType '{0}' has no key defined. Define the key for this EntityType."
+ </summary>
+ </member>
+ <member name="M:System.Data.Edm.Strings.EdmModel_Validator_Semantic_BadNavigationPropertyUndefinedRole(System.Object,System.Object,System.Object)">
+ <summary>
+ A string like "NavigationProperty is not valid. Role ‘{0}’ or Role ‘{1}’ is not defined in Relationship ‘{2}’."
+ </summary>
+ </member>
+ <member name="M:System.Data.Edm.Strings.EdmModel_Validator_Semantic_EndWithManyMultiplicityCannotHaveOperationsSpecified(System.Object,System.Object)">
+ <summary>
+ A string like "End '{0}' on relationship '{1}' cannot have an operation specified because its multiplicity is '*'. Operations cannot be specified on ends with multiplicity '*'."
+ </summary>
+ </member>
+ <member name="M:System.Data.Edm.Strings.EdmModel_Validator_Semantic_EndNameAlreadyDefinedDuplicate(System.Object)">
+ <summary>
+ A string like "Each Name and PluralName in a relationship must be unique. '{0}' is already defined."
+ </summary>
+ </member>
+ <member name="M:System.Data.Edm.Strings.EdmModel_Validator_Semantic_SameRoleReferredInReferentialConstraint(System.Object)">
+ <summary>
+ A string like "In relationship '{0}', the Principal and Dependent Role of the referential constraint refer to the same Role in the relationship type."
+ </summary>
+ </member>
+ <member name="M:System.Data.Edm.Strings.EdmModel_Validator_Semantic_InvalidMultiplicityFromRoleUpperBoundMustBeOne(System.Object,System.Object)">
+ <summary>
+ A string like "Multiplicity is not valid in Role '{0}' in relationship '{1}'. Valid values for multiplicity for the Principal Role are '0..1' or '1'."
+ </summary>
+ </member>
+ <member name="M:System.Data.Edm.Strings.EdmModel_Validator_Semantic_InvalidMultiplicityFromRoleToPropertyNullableV1(System.Object,System.Object)">
+ <summary>
+ A string like "Multiplicity is not valid in Role '{0}' in relationship '{1}'. Because all the properties in the Dependent Role are nullable, multiplicity of the Principal Role must be '0..1'."
+ </summary>
+ </member>
+ <member name="M:System.Data.Edm.Strings.EdmModel_Validator_Semantic_InvalidMultiplicityFromRoleToPropertyNonNullableV1(System.Object,System.Object)">
+ <summary>
+ A string like "Multiplicity conflicts with the referential constraint in Role '{0}' in relationship '{1}'. Because at least one of the properties in the Dependent Role is non-nullable, multiplicity of the Principal Role must be '1'."
+ </summary>
+ </member>
+ <member name="M:System.Data.Edm.Strings.EdmModel_Validator_Semantic_InvalidMultiplicityFromRoleToPropertyNonNullableV2(System.Object,System.Object)">
+ <summary>
+ A string like "Multiplicity conflicts with the referential constraint in Role '{0}' in relationship '{1}'. Because all of the properties in the Dependent Role are non-nullable, multiplicity of the Principal Role must be '1'."
+ </summary>
+ </member>
+ <member name="M:System.Data.Edm.Strings.EdmModel_Validator_Semantic_InvalidToPropertyInRelationshipConstraint(System.Object,System.Object,System.Object)">
+ <summary>
+ A string like "Properties referred by the Dependent Role ‘{0}’ must be a subset of the key of the EntityType ‘{1}’ referred to by the Dependent Role in the referential constraint for relationship ‘{2}’."
+ </summary>
+ </member>
+ <member name="M:System.Data.Edm.Strings.EdmModel_Validator_Semantic_InvalidMultiplicityToRoleUpperBoundMustBeOne(System.Object,System.Object)">
+ <summary>
+ A string like "Multiplicity is not valid in Role '{0}' in relationship '{1}'. Because the Dependent Role refers to the key properties, the upper bound of the multiplicity of the Dependent Role must be ‘1’."
+ </summary>
+ </member>
+ <member name="M:System.Data.Edm.Strings.EdmModel_Validator_Semantic_InvalidMultiplicityToRoleUpperBoundMustBeMany(System.Object,System.Object)">
+ <summary>
+ A string like "Multiplicity is not valid in Role '{0}' in relationship '{1}'. Because the Dependent Role properties are not the key properties, the upper bound of the multiplicity of the Dependent Role must be ‘*’."
+ </summary>
+ </member>
+ <member name="M:System.Data.Edm.Strings.EdmModel_Validator_Semantic_TypeMismatchRelationshipConstraint(System.Object,System.Object,System.Object,System.Object,System.Object)">
+ <summary>
+ A string like "The types of all properties in the Dependent Role of a referential constraint must be the same as the corresponding property types in the Principal Role. The type of property '{0}' on entity '{1}' does not match the type of property '{2}' on entity '{3}' in the referential constraint '{4}'."
+ </summary>
+ </member>
+ <member name="M:System.Data.Edm.Strings.EdmModel_Validator_Semantic_InvalidPropertyInRelationshipConstraint(System.Object,System.Object)">
+ <summary>
+ A string like "There is no property with name '{0}' defined in the type referred to by Role '{1}'."
+ </summary>
+ </member>
+ <member name="M:System.Data.Edm.Strings.EdmModel_Validator_Semantic_NullableComplexType(System.Object)">
+ <summary>
+ A string like "A nullable ComplexType is not supported. Property '{0}' must not allow nulls."
+ </summary>
+ </member>
+ <member name="M:System.Data.Edm.Strings.EdmModel_Validator_Semantic_InvalidPropertyType(System.Object)">
+ <summary>
+ A string like "A property cannot be of type ‘{0}’. The property type must be a ComplexType or a PrimitiveType."
+ </summary>
+ </member>
+ <member name="M:System.Data.Edm.Strings.EdmModel_Validator_Semantic_DuplicateEntityContainerMemberName(System.Object)">
+ <summary>
+ A string like "Each member name in an EntityContainer must be unique. A member with name '{0}' is already defined."
+ </summary>
+ </member>
+ <member name="M:System.Data.Edm.Strings.EdmModel_Validator_Semantic_TypeNameAlreadyDefinedDuplicate(System.Object)">
+ <summary>
+ A string like "Each type name in a schema must be unique. Type name '{0}' is already defined."
+ </summary>
+ </member>
+ <member name="M:System.Data.Edm.Strings.EdmModel_Validator_Semantic_InvalidMemberNameMatchesTypeName(System.Object,System.Object)">
+ <summary>
+ A string like "Name ‘{0}’ cannot be used in type ‘{1}’. Member names cannot be the same as their enclosing type."
+ </summary>
+ </member>
+ <member name="M:System.Data.Edm.Strings.EdmModel_Validator_Semantic_PropertyNameAlreadyDefinedDuplicate(System.Object)">
+ <summary>
+ A string like "Each property name in a type must be unique. Property name '{0}' is already defined."
+ </summary>
+ </member>
+ <member name="M:System.Data.Edm.Strings.EdmModel_Validator_Semantic_CycleInTypeHierarchy(System.Object)">
+ <summary>
+ A string like "A cycle was detected in the type hierarchy of '{0}'."
+ </summary>
+ </member>
+ <member name="M:System.Data.Edm.Strings.EdmModel_Validator_Semantic_InvalidPropertyType_V1_1(System.Object)">
+ <summary>
+ A string like "A property cannot be of type ‘{0}’. The property type must be a ComplexType, a PrimitiveType, or a CollectionType."
+ </summary>
+ </member>
+ <member name="M:System.Data.Edm.Strings.EdmModel_Validator_Syntactic_EdmModel_NameIsTooLong(System.Object)">
+ <summary>
+ A string like "The specified name must not be longer than 480 characters: '{0}'."
+ </summary>
+ </member>
+ <member name="M:System.Data.Edm.Strings.EdmModel_Validator_Syntactic_EdmModel_NameIsNotAllowed(System.Object)">
+ <summary>
+ A string like "The specified name is not allowed: '{0}'."
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Strings.EdmModel_Validator_Semantic_BadNavigationPropertyRolesCannotBeTheSame">
+ <summary>
+ A string like "NavigationProperty is not valid. The FromRole and ToRole are the same."
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Strings.EdmModel_Validator_Semantic_InvalidOperationMultipleEndsInAssociation">
+ <summary>
+ A string like "OnDelete can be specified on only one End of an EdmAssociation."
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Strings.EdmModel_Validator_Semantic_MismatchNumberOfPropertiesinRelationshipConstraint">
+ <summary>
+ A string like "The number of properties in the Dependent and Principal Roles in a relationship constraint must be identical."
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Strings.EdmModel_Validator_Syntactic_MissingName">
+ <summary>
+ A string like "The name is missing or not valid."
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Strings.EdmModel_Validator_Syntactic_EdmAssociationType_AssocationEndMustNotBeNull">
+ <summary>
+ A string like "AssociationEnd must not be null."
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Strings.EdmModel_Validator_Syntactic_EdmAssociationConstraint_DependentEndMustNotBeNull">
+ <summary>
+ A string like "DependentEnd must not be null."
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Strings.EdmModel_Validator_Syntactic_EdmAssociationConstraint_DependentPropertiesMustNotBeEmpty">
+ <summary>
+ A string like "DependentProperties must not be empty."
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Strings.EdmModel_Validator_Syntactic_EdmNavigationProperty_AssocationMustNotBeNull">
+ <summary>
+ A string like "Association must not be null."
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Strings.EdmModel_Validator_Syntactic_EdmNavigationProperty_ResultEndMustNotBeNull">
+ <summary>
+ A string like "ResultEnd must not be null."
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Strings.EdmModel_Validator_Syntactic_EdmAssociationEnd_EntityTypeMustNotBeNull">
+ <summary>
+ A string like "EntityType must not be null."
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Strings.EdmModel_Validator_Syntactic_EdmEntitySet_ElementTypeMustNotBeNull">
+ <summary>
+ A string like "ElementType must not be null."
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Strings.EdmModel_Validator_Syntactic_EdmAssociationSet_ElementTypeMustNotBeNull">
+ <summary>
+ A string like "ElementType must not be null."
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Strings.EdmModel_Validator_Syntactic_EdmAssociationSet_SourceSetMustNotBeNull">
+ <summary>
+ A string like "SourceSet must not be null."
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Strings.EdmModel_Validator_Syntactic_EdmAssociationSet_TargetSetMustNotBeNull">
+ <summary>
+ A string like "TargetSet must not be null."
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Strings.EdmModel_Validator_Syntactic_EdmTypeReferenceNotValid">
+ <summary>
+ A string like "The type is not a valid EdmTypeReference."
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Strings.Serializer_OneNamespaceAndOneContainer">
+ <summary>
+ A string like "Serializer can only serialize an EdmModel that has one EdmNamespace and one EdmEntityContainer."
+ </summary>
+ </member>
+ <member name="T:System.Data.Edm.Error">
+ <summary>
+ Strongly-typed and parameterized exception factory.
+ </summary>
+ </member>
+ <member name="M:System.Data.Edm.Error.ArgumentNull(System.String)">
+ <summary>
+ The exception that is thrown when a null reference (Nothing in Visual Basic) is passed to a method that does not accept it as a valid argument.
+ </summary>
+ </member>
+ <member name="M:System.Data.Edm.Error.ArgumentOutOfRange(System.String)">
+ <summary>
+ The exception that is thrown when the value of an argument is outside the allowable range of values as defined by the invoked method.
+ </summary>
+ </member>
+ <member name="M:System.Data.Edm.Error.NotImplemented">
+ <summary>
+ The exception that is thrown when the author has yet to implement the logic at this point in the program. This can act as an exception based TODO tag.
+ </summary>
+ </member>
+ <member name="M:System.Data.Edm.Error.NotSupported">
+ <summary>
+ The exception that is thrown when an invoked method is not supported, or when there is an attempt to read, seek, or write to a stream that does not support the invoked functionality.
+ </summary>
+ </member>
+ <member name="T:System.Data.Edm.Common.DataModelAnnotation">
+ <summary>
+ Allows the construction and modification of a user-specified annotation (name-value pair) on a <see cref="T:System.Data.Edm.Common.DataModelItem"/> instance.
+ </summary>
+ </member>
+ <member name="T:System.Data.Edm.Common.INamedDataModelItem">
+ <summary>
+ INamedDataModelItem is implemented by model-specific base types for all types with a <see cref="P:System.Data.Edm.Common.INamedDataModelItem.Name"/> property.
+ <seealso cref="T:System.Data.Edm.EdmNamedMetadataItem"/>
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Common.INamedDataModelItem.Name">
+ <summary>
+ Gets or sets the currently assigned name.
+ </summary>
+ </member>
+ <member name="M:System.Data.Edm.Common.DataModelAnnotation.#ctor">
+ <summary>
+ Constructs a new DataModelAnnotation
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Common.DataModelAnnotation.Namespace">
+ <summary>
+ Gets or sets an optional namespace that can be used to distinguish the annotation from others with the same <see cref="P:System.Data.Edm.Common.DataModelAnnotation.Name"/> value.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Common.DataModelAnnotation.Name">
+ <summary>
+ Gets or sets the name of the annotation.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Common.DataModelAnnotation.Value">
+ <summary>
+ Gets or sets the value of the annotation.
+ </summary>
+ </member>
+ <member name="T:System.Data.Edm.Common.DataModelErrorEventArgs">
+ <summary>
+
+ </summary>
+ </member>
+ <member name="T:System.Data.Edm.Common.DataModelEventArgs">
+ <summary>
+ DataModelEventArgs is the base argument type for all events raised by consumers of Entity Data Model (EDM) models.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Common.DataModelEventArgs.Item">
+ <summary>
+ Gets a value indicating the <see cref="T:System.Data.Edm.Common.DataModelItem"/> that caused the event to be raised.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Common.DataModelErrorEventArgs.PropertyName">
+ <summary>
+ Gets an optional value indicating which property of the source item caused the event to be raised.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Common.DataModelErrorEventArgs.ErrorCode">
+ <summary>
+ Gets a value that identifies the specific error that is being raised.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Common.DataModelErrorEventArgs.ErrorMessage">
+ <summary>
+ Gets an optional descriptive message the describes the error that is being raised.
+ </summary>
+ </member>
+ <member name="T:System.Data.Edm.Common.DataModelItem">
+ <summary>
+ DataModelItem is the base for all types in the EDM metadata reflection, construction and modification API.
+ </summary>
+ </member>
+ <member name="T:System.Data.Edm.Common.IAnnotatedDataModelItem">
+ <summary>
+ IAnnotatedDataModelItem is implemented by model-specific base types for all types with an <see cref="P:System.Data.Edm.Common.IAnnotatedDataModelItem.Annotations"/> property.
+ <seealso cref="T:System.Data.Edm.EdmDataModelItem"/>
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Common.IAnnotatedDataModelItem.Annotations">
+ <summary>
+ Gets or sets the currently assigned annotations.
+ </summary>
+ </member>
+ <member name="T:System.Data.Edm.Db.DbAliasedMetadataItem">
+ <summary>
+ DbAliasedMetadataItem provides the base type for all Database Metadata types that can have an optional <see cref="P:System.Data.Edm.Db.DbAliasedMetadataItem.DatabaseIdentifier"/> that should be used instead of the item's <see cref="P:System.Data.Edm.Db.DbNamedMetadataItem.Name"/> when referring to the item in the database.
+ </summary>
+ </member>
+ <member name="T:System.Data.Edm.Db.DbNamedMetadataItem">
+ <summary>
+ NamedDbItem is the base for all types in the Database Metadata construction and modification API with a <see cref="P:System.Data.Edm.Db.DbNamedMetadataItem.Name"/> property.
+ </summary>
+ </member>
+ <member name="T:System.Data.Edm.Db.DbMetadataItem">
+ <summary>
+ The base for all all Database Metadata types that support annotation using <see cref="T:System.Data.Edm.Common.DataModelAnnotation"/>.
+ </summary>
+ </member>
+ <member name="T:System.Data.Edm.Db.DbDataModelItem">
+ <summary>
+ DbDataModelItem is the base for all types in the Database Metadata construction and modification API.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.DbMetadataItem.Annotations">
+ <summary>
+ Gets or sets the currently assigned annotations.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.DbNamedMetadataItem.Name">
+ <summary>
+ Gets or sets the currently assigned name.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.DbAliasedMetadataItem.DatabaseIdentifier">
+ <summary>
+ Gets an optional alternative identifier that should be used when referring to this item in the database.
+ </summary>
+ </member>
+ <member name="T:System.Data.Edm.Db.DbColumnMetadata">
+ <summary>
+ When implemented in derived types, allows the construction and modification of a column in a Database Metadata table or row.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.DbColumnMetadata.TypeName">
+ <summary>
+ Gets or sets a string indicating the database-specific type of the column.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.DbColumnMetadata.IsNullable">
+ <summary>
+ Gets or sets a value indicating whether the column is nullable.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.DbColumnMetadata.Facets">
+ <summary>
+ Gets or sets an optional <see cref="T:System.Data.Edm.Db.DbPrimitiveTypeFacets"/> instance that applies additional constraints to the referenced database-specific type of the column.
+ </summary>
+ </member>
+ <member name="T:System.Data.Edm.Db.DbDatabaseMetadata">
+ <summary>
+ Allows the construction and modification of a database in a Database Metadata model.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.DbDatabaseMetadata.Version">
+ <summary>
+ Gets or sets an optional value that indicates the database model version.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.DbDatabaseMetadata.Schemas">
+ <summary>
+ Gets or sets the collection of <see cref="T:System.Data.Edm.Db.DbSchemaMetadata"/> instances that specifies the schemas within the database.
+ </summary>
+ </member>
+ <member name="T:System.Data.Edm.Db.DbForeignKeyConstraintMetadata">
+ <summary>
+ Allows the construction and modification of a foreign key constraint sourced by a <see cref="T:System.Data.Edm.Db.DbTableMetadata"/> instance.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.DbForeignKeyConstraintMetadata.DeleteAction">
+ <summary>
+ Gets or sets the <see cref="T:System.Data.Edm.Db.DbOperationAction"/> to take when a delete operation is attempted.
+ </summary>
+ </member>
+ <member name="T:System.Data.Edm.Db.DbItemKind">
+ <summary>
+ Indicates which Database Metadata concept is represented by a given item.
+ </summary>
+ </member>
+ <member name="F:System.Data.Edm.Db.DbItemKind.Database">
+ <summary>
+ Database Kind
+ </summary>
+ </member>
+ <member name="F:System.Data.Edm.Db.DbItemKind.Schema">
+ <summary>
+ Schema Kind
+ </summary>
+ </member>
+ <member name="F:System.Data.Edm.Db.DbItemKind.ForeignKeyConstraint">
+ <summary>
+ Foreign Key Constraint Kind
+ </summary>
+ </member>
+ <member name="F:System.Data.Edm.Db.DbItemKind.Function">
+ <summary>
+ Function Kind
+ </summary>
+ </member>
+ <member name="F:System.Data.Edm.Db.DbItemKind.FunctionParameter">
+ <summary>
+ Function Parameter Kind
+ </summary>
+ </member>
+ <member name="F:System.Data.Edm.Db.DbItemKind.FunctionType">
+ <summary>
+ Function Return or Parameter Type Kind
+ </summary>
+ </member>
+ <member name="F:System.Data.Edm.Db.DbItemKind.RowColumn">
+ <summary>
+ Row Column Kind
+ </summary>
+ </member>
+ <member name="F:System.Data.Edm.Db.DbItemKind.Table">
+ <summary>
+ Table Kind
+ </summary>
+ </member>
+ <member name="F:System.Data.Edm.Db.DbItemKind.TableColumn">
+ <summary>
+ Table Column Kind
+ </summary>
+ </member>
+ <member name="F:System.Data.Edm.Db.DbItemKind.PrimitiveTypeFacets">
+ <summary>
+ Primitive Facets Kind
+ </summary>
+ </member>
+ <member name="T:System.Data.Edm.Db.DbOperationAction">
+ <summary>
+ Specifies the action to take on a given operation.
+ </summary>
+ </member>
+ <member name="F:System.Data.Edm.Db.DbOperationAction.None">
+ <summary>
+ Default behavior
+ </summary>
+ </member>
+ <member name="F:System.Data.Edm.Db.DbOperationAction.Restrict">
+ <summary>
+ Restrict the operation
+ </summary>
+ </member>
+ <member name="F:System.Data.Edm.Db.DbOperationAction.Cascade">
+ <summary>
+ Cascade the operation
+ </summary>
+ </member>
+ <member name="T:System.Data.Edm.Db.DbPrimitiveTypeFacets">
+ <summary>
+ Allows the construction and modification of additional constraints that can be applied to a specific use of a primitive type in a Database Metadata item.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.DbPrimitiveTypeFacets.HasValue">
+ <summary>
+ Returns <code>true</code> if any facet value property currently has a non-null value; otherwise returns <code>false</code>.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.DbPrimitiveTypeFacets.IsFixedLength">
+ <summary>
+ Gets or sets an optional value indicating whether the referenced type should be considered to have a fixed or variable length.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.DbPrimitiveTypeFacets.IsMaxLength">
+ <summary>
+ Gets or sets an optional value indicating whether the referenced type should be considered to have its intrinsic maximum length, rather than a specific value.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.DbPrimitiveTypeFacets.IsUnicode">
+ <summary>
+ Gets or sets an optional value indicating whether the referenced type should be considered to be Unicode or non-Unicode.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.DbPrimitiveTypeFacets.MaxLength">
+ <summary>
+ Gets or sets an optional value indicating the current constraint on the type's maximum length.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.DbPrimitiveTypeFacets.Precision">
+ <summary>
+ Gets or sets an optional value indicating the current constraint on the type's precision.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.DbPrimitiveTypeFacets.Scale">
+ <summary>
+ Gets or sets an optional value indicating the current constraint on the type's scale.
+ </summary>
+ </member>
+ <member name="T:System.Data.Edm.Db.DbSchemaMetadata">
+ <summary>
+ Allows the construction and modification of a database schema in a <see cref="T:System.Data.Edm.Db.DbDatabaseMetadata"/> database model.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.DbSchemaMetadata.Tables">
+ <summary>
+ Gets or sets the collection of <see cref="T:System.Data.Edm.Db.DbTableMetadata"/> instances that specifies the tables declared within the schema.
+ </summary>
+ </member>
+ <member name="T:System.Data.Edm.Db.DbSchemaMetadataItem">
+ <summary>
+ DbSchemaMetadataItem is the base for all types that can be contained in a <see cref="T:System.Data.Edm.Db.DbSchemaMetadata"/> schema.
+ </summary>
+ </member>
+ <member name="T:System.Data.Edm.Db.DbTableColumnMetadata">
+ <summary>
+ Allows the construction and modification of a column in a <see cref="T:System.Data.Edm.Db.DbTableMetadata"/> table.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.DbTableColumnMetadata.IsPrimaryKeyColumn">
+ <summary>
+ Gets or sets a value indicating whether the column is part of the table's primary key.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.DbTableColumnMetadata.StoreGeneratedPattern">
+ <summary>
+ Gets or sets a <see cref="T:System.Data.Edm.Db.DbStoreGeneratedPattern"/> value indicating if and how the value of the column is automatically generated.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.DbTableColumnMetadata.Collation">
+ <summary>
+ Gets or sets an optional value indicating the collation specific to this table column.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.DbTableColumnMetadata.DefaultValue">
+ <summary>
+ Gets or sets an optional value that specifies the default value for the column.
+ </summary>
+ </member>
+ <member name="T:System.Data.Edm.Db.DbTableMetadata">
+ <summary>
+ Allows the construction and modification a table in a <see cref="T:System.Data.Edm.Db.DbSchemaMetadata"/> database schema.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.DbTableMetadata.Columns">
+ <summary>
+ Gets or sets the collection of <see cref="T:System.Data.Edm.Db.DbTableColumnMetadata"/> instances that specifies the columns present within the table.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.DbTableMetadata.KeyColumns">
+ <summary>
+ Gets or sets the collection of <see cref="T:System.Data.Edm.Db.DbTableColumnMetadata"/> instances from the <see cref="P:System.Data.Edm.Db.DbTableMetadata.Columns"/> collection of the table that are part of the primary key.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.DbTableMetadata.ForeignKeyConstraints">
+ <summary>
+ Gets or sets the collection of <see cref="T:System.Data.Edm.Db.DbForeignKeyConstraintMetadata"/> instances that defines the foreign key constraints sourced from the table.
+ </summary>
+ </member>
+ <member name="T:System.Data.Edm.Db.DbTypeMetadata">
+ <summary>
+ Represents a specific use of a type in a Database Metadata item.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.DbTypeMetadata.Facets">
+ <summary>
+ Gets or sets an optional <see cref="T:System.Data.Edm.Db.DbPrimitiveTypeFacets"/> instance that applies additional constraints to a referenced primitive type.
+ </summary>
+ <remarks>Accessing this property forces the creation of a DbPrimitiveTypeFacets value if no value has previously been set. Use <see cref="P:System.Data.Edm.Db.DbTypeMetadata.HasFacets"/> to determine whether or not this property currently has a value.</remarks>
+ </member>
+ <member name="P:System.Data.Edm.Db.DbTypeMetadata.IsCollection">
+ <summary>
+ Gets or sets a value indicating whether the represented type is a collection type.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.DbTypeMetadata.IsNullable">
+ <summary>
+ Gets or sets an optional value indicating whether the referenced type should be considered nullable.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.DbTypeMetadata.IsRow">
+ <summary>
+ Gets a value indicating whether the type has been configured as a row type by the addition of one or more RowColumns.
+ </summary>
+ </member>
+ <member name="T:System.Data.Edm.Db.Mapping.DbAssociationEndMapping">
+ <summary>
+ Represents the mapping of an EDM association end (<see cref="T:System.Data.Edm.EdmAssociationEnd"/>) as a collection of property mappings (<see cref="T:System.Data.Edm.Db.Mapping.DbEdmPropertyMapping"/>).
+ </summary>
+ </member>
+ <member name="T:System.Data.Edm.Db.Mapping.DbMappingMetadataItem">
+ <summary>
+ DbMappingMetadataItem is the base for all types in the EDM-to-Database Mapping construction and modification API that support annotation using <see cref="T:System.Data.Edm.Common.DataModelAnnotation"/>.
+ </summary>
+ </member>
+ <member name="T:System.Data.Edm.Db.Mapping.DbMappingModelItem">
+ <summary>
+ DbMappingModelItem is the base for all types in the EDM-to-Database Mapping construction and modification API.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.Mapping.DbMappingMetadataItem.Annotations">
+ <summary>
+ Gets or sets the currently assigned annotations.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.Mapping.DbAssociationEndMapping.AssociationEnd">
+ <summary>
+ Gets an <see cref="T:System.Data.Edm.EdmAssociationEnd"/> value representing the association end that is being mapped.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.Mapping.DbAssociationEndMapping.PropertyMappings">
+ <summary>
+ Gets the collection of <see cref="T:System.Data.Edm.Db.Mapping.DbEdmPropertyMapping"/>s that specifies how the association end key properties are mapped to the table.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.Mapping.DbAssociationSetMapping.AssociationSet">
+ <summary>
+ Gets an <see cref="T:System.Data.Edm.EdmAssociationSet"/> value representing the association set that is being mapped.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.Mapping.DbAssociationSetMapping.Table">
+ <summary>
+ Gets a <see cref="T:System.Data.Edm.Db.DbTableMetadata"/> value representing the table to which the entity type's properties are being mapped.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.Mapping.DbAssociationSetMapping.ColumnConditions">
+ <summary>
+ Gets the collection of <see cref="T:System.Data.Edm.Db.Mapping.DbColumnCondition"/>s that specifies the constant or null values that columns in <see cref="P:System.Data.Edm.Db.Mapping.DbAssociationSetMapping.Table"/> must have for this type mapping to apply.
+ </summary>
+ </member>
+ <member name="T:System.Data.Edm.Db.Mapping.DbColumnCondition">
+ <summary>
+ Allows the construction and modification of a condition for a column in a database table.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.Mapping.DbColumnCondition.Column">
+ <summary>
+ Gets or sets a <see cref="T:System.Data.Edm.Db.DbTableColumnMetadata"/> value representing the table column which must contain <see cref="P:System.Data.Edm.Db.Mapping.DbColumnCondition.Value"/> for this condition to hold.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.Mapping.DbColumnCondition.Value">
+ <summary>
+ Gets or sets the value that <see cref="P:System.Data.Edm.Db.Mapping.DbColumnCondition.Column"/> must contain for this condition to hold.
+ </summary>
+ </member>
+ <member name="T:System.Data.Edm.Db.Mapping.DbEdmPropertyMapping">
+ <summary>
+ Represents the mapping of an entity property to a column in a database table.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.Mapping.DbEdmPropertyMapping.PropertyPath">
+ <summary>
+ Gets or sets the collection of <see cref="T:System.Data.Edm.EdmProperty"/> instances that defines the mapped property, beginning from a property declared by the mapped entity type and optionally proceeding through properties of complex property result types.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.Mapping.DbEdmPropertyMapping.Column">
+ <summary>
+ Gets or sets a <see cref="T:System.Data.Edm.Db.DbTableColumnMetadata"/> value representing the table column to which the entity property is being mapped.
+ </summary>
+ </member>
+ <member name="T:System.Data.Edm.Db.Mapping.DbEntityContainerMapping">
+ <summary>
+ Allows the construction and modification of the mapping of an EDM entity container (<see cref="T:System.Data.Edm.EdmEntityContainer"/>) to a database (<see cref="T:System.Data.Edm.Db.DbDatabaseMetadata"/>).
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.Mapping.DbEntityContainerMapping.EntityContainer">
+ <summary>
+ Gets or sets an <see cref="T:System.Data.Edm.EdmEntityContainer"/> value representing the entity container that is being mapped.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.Mapping.DbEntityContainerMapping.EntitySetMappings">
+ <summary>
+ Gets or sets the collection of <see cref="T:System.Data.Edm.Db.Mapping.DbEntitySetMapping"/>s that specifies how the container's entity sets are mapped to the database.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.Mapping.DbEntityContainerMapping.AssociationSetMappings">
+ <summary>
+ Gets the collection of <see cref="T:System.Data.Edm.Db.Mapping.DbAssociationSetMapping"/>s that specifies how the container's association sets are mapped to the database.
+ </summary>
+ </member>
+ <member name="T:System.Data.Edm.Db.Mapping.DbEntitySetMapping">
+ <summary>
+ Allows the construction and modification of the mapping of an EDM entity set (<see cref="T:System.Data.Edm.EdmEntitySet"/>) to a database (<see cref="T:System.Data.Edm.Db.DbDatabaseMetadata"/>).
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.Mapping.DbEntitySetMapping.EntitySet">
+ <summary>
+ Gets or sets an <see cref="T:System.Data.Edm.EdmEntitySet"/> value representing the entity set that is being mapped.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.Mapping.DbEntitySetMapping.EntityTypeMappings">
+ <summary>
+ Gets or sets the collection of <see cref="T:System.Data.Edm.Db.Mapping.DbEntityTypeMapping"/>s that specifies how the set's entity types are mapped to the database.
+ </summary>
+ </member>
+ <member name="T:System.Data.Edm.Db.Mapping.DbEntityTypeMapping">
+ <summary>
+ Allows the construction and modification of a complete or partial mapping of an EDM entity type (<see cref="T:System.Data.Edm.EdmEntityType"/>) or type hierarchy to a specific database table (<see cref="T:System.Data.Edm.Db.DbTableMetadata"/>).
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.Mapping.DbEntityTypeMapping.EntityType">
+ <summary>
+ Gets or sets an <see cref="T:System.Data.Edm.EdmEntityType"/> value representing the entity type or hierarchy that is being mapped.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.Mapping.DbEntityTypeMapping.IsHierarchyMapping">
+ <summary>
+ Gets or sets a value indicating whether this type mapping applies to <see cref="P:System.Data.Edm.Db.Mapping.DbEntityTypeMapping.EntityType"/> and all its direct or indirect subtypes (<code>true</code>), or only to <see cref="P:System.Data.Edm.Db.Mapping.DbEntityTypeMapping.EntityType"/> (<code>false</code>).
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.Mapping.DbEntityTypeMappingFragment.Table">
+ <summary>
+ Gets a <see cref="T:System.Data.Edm.Db.DbTableMetadata"/> value representing the table to which the entity type's properties are being mapped.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.Mapping.DbEntityTypeMappingFragment.PropertyMappings">
+ <summary>
+ Gets the collection of <see cref="T:System.Data.Edm.Db.Mapping.DbEdmPropertyMapping"/>s that specifies how the type's properties are mapped to the table.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.Db.Mapping.DbEntityTypeMappingFragment.ColumnConditions">
+ <summary>
+ Gets the collection of <see cref="T:System.Data.Edm.Db.Mapping.DbColumnCondition"/>s that specifies the constant or null values that columns in <see cref="P:System.Data.Edm.Db.Mapping.DbEntityTypeMappingFragment.Table"/> must have for this type mapping fragment to apply.
+ </summary>
+ </member>
+ <member name="T:System.Data.Edm.Db.Mapping.DbMappingItemKind">
+ <summary>
+ Indicates which EDM-to-Database Mapping concept is represented by a given item.
+ </summary>
+ </member>
+ <member name="F:System.Data.Edm.Db.Mapping.DbMappingItemKind.DatabaseMapping">
+ <summary>
+ Database Mapping Kind
+ </summary>
+ </member>
+ <member name="F:System.Data.Edm.Db.Mapping.DbMappingItemKind.EntityContainerMapping">
+ <summary>
+ Entity Container Mapping Kind
+ </summary>
+ </member>
+ <member name="F:System.Data.Edm.Db.Mapping.DbMappingItemKind.EntitySetMapping">
+ <summary>
+ Entity Set Mapping Kind
+ </summary>
+ </member>
+ <member name="F:System.Data.Edm.Db.Mapping.DbMappingItemKind.AssociationSetMapping">
+ <summary>
+ Association Set Mapping Kind
+ </summary>
+ </member>
+ <member name="F:System.Data.Edm.Db.Mapping.DbMappingItemKind.EntityTypeMapping">
+ <summary>
+ Entity Type Mapping Kind
+ </summary>
+ </member>
+ <member name="F:System.Data.Edm.Db.Mapping.DbMappingItemKind.QueryViewMapping">
+ <summary>
+ Query View Mapping Kind
+ </summary>
+ </member>
+ <member name="F:System.Data.Edm.Db.Mapping.DbMappingItemKind.EntityTypeMappingFragment">
+ <summary>
+ Entity Type Mapping Fragment Kind
+ </summary>
+ </member>
+ <member name="F:System.Data.Edm.Db.Mapping.DbMappingItemKind.EdmPropertyMapping">
+ <summary>
+ Edm Property Mapping Kind
+ </summary>
+ </member>
+ <member name="F:System.Data.Edm.Db.Mapping.DbMappingItemKind.AssociationEndMapping">
+ <summary>
+ Association End Mapping Kind
+ </summary>
+ </member>
+ <member name="F:System.Data.Edm.Db.Mapping.DbMappingItemKind.ColumnCondition">
+ <summary>
+ Column Condition Kind
+ </summary>
+ </member>
+ <member name="F:System.Data.Edm.Db.Mapping.DbMappingItemKind.PropertyCondition">
+ <summary>
+ Property Condition Kind
+ </summary>
+ </member>
+ <member name="T:System.Data.Edm.EdmAssociationConstraint">
+ <summary>
+ Allows the construction and modification of a constraint applied to an Entity Data Model (EDM) association.
+ </summary>
+ </member>
+ <member name="T:System.Data.Edm.EdmMetadataItem">
+ <summary>
+ The base for all all Entity Data Model (EDM) types that support annotation using <see cref="T:System.Data.Edm.Common.DataModelAnnotation"/>.
+ </summary>
+ </member>
+ <member name="T:System.Data.Edm.EdmDataModelItem">
+ <summary>
+ EdmDataModelItem is the base for all types in the Entity Data Model (EDM) metadata construction and modification API.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.EdmDataModelItem.ItemKind">
+ <summary>
+ Gets an <see cref="T:System.Data.Edm.EdmItemKind"/> value indicating which Entity Data Model (EDM) concept is represented by this item.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.EdmMetadataItem.Annotations">
+ <summary>
+ Gets or sets the currently assigned annotations.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.EdmMetadataItem.ChildItems">
+ <summary>
+ Returns all EdmItem children directly contained by this EdmItem.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.EdmAssociationConstraint.DependentEnd">
+ <summary>
+ Gets or sets the <see cref="T:System.Data.Edm.EdmAssociationEnd"/> that represents the 'dependent' end of the constraint; properties from this association end's entity type contribute to the <see cref="P:System.Data.Edm.EdmAssociationConstraint.DependentProperties"/> collection.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.EdmAssociationConstraint.DependentProperties">
+ <summary>
+ Gets or sets the collection of <see cref="T:System.Data.Edm.EdmProperty"/> instances from the <see cref="P:System.Data.Edm.EdmAssociationConstraint.DependentEnd"/> of the constraint. The values of these properties are constrained against the primary key values of the remaining, 'principal' association end's entity type.
+ </summary>
+ </member>
+ <member name="T:System.Data.Edm.EdmAssociationEnd">
+ <summary>
+ Allows the construction and modification of one end of an Entity Data Model (EDM) association.
+ </summary>
+ </member>
+ <member name="T:System.Data.Edm.EdmStructuralMember">
+ <summary>
+ EdmStructuralMember is the base for all types that represent members of structural items in the Entity Data Model (EDM) metadata construction and modification API.
+ </summary>
+ </member>
+ <member name="T:System.Data.Edm.EdmNamedMetadataItem">
+ <summary>
+ The base for all all Entity Data Model (EDM) item types that with a <see cref="P:System.Data.Edm.EdmNamedMetadataItem.Name"/> property.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.EdmNamedMetadataItem.Name">
+ <summary>
+ Gets or sets the currently assigned name.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.EdmAssociationEnd.EntityType">
+ <summary>
+ Gets or sets the entity type referenced by this association end.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.EdmAssociationEnd.EndKind">
+ <summary>
+ Gets or sets the <see cref="T:System.Data.Edm.EdmAssociationEndKind"/> of this association end, which indicates the multiplicity of the end and whether or not it is required.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.EdmAssociationEnd.DeleteAction">
+ <summary>
+ Gets or sets the <see cref="T:System.Data.Edm.EdmOperationAction"/> to take when a delete operation is attempted.
+ </summary>
+ </member>
+ <member name="T:System.Data.Edm.EdmAssociationEndKind">
+ <summary>
+ Indicates the multiplicity of an <see cref="T:System.Data.Edm.EdmAssociationEnd"/> and whether or not it is required.
+ </summary>
+ </member>
+ <member name="T:System.Data.Edm.EdmAssociationSet">
+ <summary>
+ Allows the construction and modification of an association set in an Entity Data Model (EDM) <see cref="T:System.Data.Edm.EdmEntityContainer"/>).
+ </summary>
+ </member>
+ <member name="T:System.Data.Edm.EdmEntityContainerItem">
+ <summary>
+ Represents an item in an Entity Data Model (EDM) <see cref="T:System.Data.Edm.EdmEntityContainer"/>.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.EdmAssociationSet.ElementType">
+ <summary>
+ Gets or sets the <see cref="T:System.Data.Edm.EdmAssociationType"/> that specifies the association type for the set.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.EdmAssociationSet.SourceSet">
+ <summary>
+ Gets or sets the <see cref="T:System.Data.Edm.EdmEntitySet"/> that specifies the entity set corresponding to the <see cref="P:System.Data.Edm.EdmAssociationType.SourceEnd"/> association end for this association set.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.EdmAssociationSet.TargetSet">
+ <summary>
+ Gets or sets the <see cref="T:System.Data.Edm.EdmEntitySet"/> that specifies the entity set corresponding to the <see cref="P:System.Data.Edm.EdmAssociationType.TargetEnd"/> association end for this association set.
+ </summary>
+ </member>
+ <!-- Badly formed XML comment ignored for member "T:System.Data.Edm.EdmAssociationType" -->
+ <member name="T:System.Data.Edm.EdmStructuralType">
+ <summary>
+ The base for all all Entity Data Model (EDM) types that represent a structured type from the EDM type system.
+ </summary>
+ </member>
+ <member name="T:System.Data.Edm.EdmDataModelType">
+ <summary>
+ The base for all all Entity Data Model (EDM) types that represent a type from the EDM type system.
+ </summary>
+ </member>
+ <member name="T:System.Data.Edm.EdmNamespaceItem">
+ <summary>
+ Represents an item in an Entity Data Model (EDM) <see cref="T:System.Data.Edm.EdmNamespace"/>.
+ </summary>
+ </member>
+ <member name="T:System.Data.Edm.EdmQualifiedNameMetadataItem">
+ <summary>
+ The base for all all Entity Data Model (EDM) item types that with a Name property
+ that represents a qualified (can be dotted) name.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.EdmDataModelType.IsAbstract">
+ <summary>
+ Gets a value indicating whether this type is abstract.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.EdmDataModelType.BaseType">
+ <summary>
+ Gets the optional base type of this type.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.EdmAssociationType.SourceEnd">
+ <summary>
+ Gets or sets the <see cref="T:System.Data.Edm.EdmAssociationEnd"/> that defines the source end of the association.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.EdmAssociationType.TargetEnd">
+ <summary>
+ Gets or sets the <see cref="T:System.Data.Edm.EdmAssociationEnd"/> that defines the target end of the association.
+ </summary>
+ </member>
+ <member name="P:System.Data.Edm.EdmAssociationType.Constraint">
+ <summary>
+ Gets or sets the optional constraint that indicates whether the relationship is an independent association (no constraint present) or a foreign key relationship (<see cref="T:System.Data.Edm.EdmAssociationConstraint"/> specified).
+ </summary>
+ </member>
+ <member name="T:System.Data.Edm.EdmCollectionKind">
+ <summary>
+ Collection semantics for properties.
+ </summary>
+ </member>
+ <member name="F:System.Data.Edm.EdmCollectionKind.Default">
+ <summary>
+ The property does not have a collection type or does not specify explicit collection semantics.
+ </summary>
+ </member>
+ <member name="F:System.Data.Edm.EdmCollectionKind.Bag">
+ <summary>
+ The property is an unordered collection that may contain duplicates.
+ </summary>
+ </member>
+ <member name="F:System.Data.Edm.EdmCollectionKind.List">
+ <summary>
+ The property is an ordered collection that may contai...
[truncated message content] |
|
From: <gib...@su...> - 2011-11-25 20:44:11
|
Author: gibman_dk Date: 2011-11-25 21:44:03 +0100 (Fri, 25 Nov 2011) New Revision: 28326 Added: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TVDatabase/TvBusinessLayer/WeekEndTool.cs Log: missing file Added: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TVDatabase/TvBusinessLayer/WeekEndTool.cs =================================================================== --- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TVDatabase/TvBusinessLayer/WeekEndTool.cs (rev 0) +++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TVDatabase/TvBusinessLayer/WeekEndTool.cs 2011-11-25 20:44:03 UTC (rev 28326) @@ -0,0 +1,250 @@ +#region Copyright (C) 2005-2011 Team MediaPortal + +// Copyright (C) 2005-2011 Team MediaPortal +// http://www.team-mediaportal.com +// +// MediaPortal is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 2 of the License, or +// (at your option) any later version. +// +// MediaPortal is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>. + +#endregion + +using System; +using MediaPortal.Common.Utils; +using Mediaportal.TV.Server.TVControl.Interfaces; +using Mediaportal.TV.Server.TVDatabase.Entities; +using Mediaportal.TV.Server.TVService.Interfaces.Services; + +namespace Mediaportal.TV.Server.TVDatabase.TVBusinessLayer +{ + /// <summary> + /// Specifies types of days in the week + /// </summary> + public enum DayType + { + /// <summary> + /// The first working day + /// </summary> + FirstWorkingDay, + /// <summary> + /// The last working day + /// </summary> + LastWorkingDay, + /// <summary> + /// The first weekend day + /// </summary> + FirstWeekendDay, + /// <summary> + /// The last weekend day + /// </summary> + LastWeekendDay, + /// <summary> + /// The working day + /// </summary> + WorkingDays, + /// <summary> + /// The record working days + /// </summary> + Record_WorkingDays, + /// <summary> + /// The weekend day + /// </summary> + WeekendDays, + /// <summary> + /// The record weekend day + /// </summary> + Record_WeekendDays + } + + /// <summary> + /// Class for support weekend starting on Saturday or Friday + /// </summary> + public class WeekEndTool + { + + private static bool _startDayLoaded = false; + private static DayOfWeek _firstWorkingDay = DayOfWeek.Monday; + + #region public method + + private static int GetDayIndex(DayOfWeek day) + { + return ((int)day + 7 - (int)GetFirstWorkingDay()) % 7; + } + + private static DayOfWeek GetDayByIndex(int dayIndex) + { + return (DayOfWeek)((dayIndex + (int)GetFirstWorkingDay()) % 7); + } + + /// <summary> + /// Returns true if the day is a weekend day + /// </summary> + /// <value>true for weekend day, false for working day.</value> + public static bool IsWeekend(DayOfWeek today) + { + int index = GetDayIndex(today); + return index == 5 || index == 6; + } + + private static DayOfWeek GetFirstWorkingDay() + { + if (!_startDayLoaded) + { + // load first working day from database + //var setting = Setting.RetrieveByTag("FirstDayOfWeekend"); + Setting setting = GlobalServiceProvider.Get<ISettingService>().GetSetting("FirstDayOfWeekend"); + if (setting == null) + { + _firstWorkingDay = DayOfWeek.Monday; + } + else + { + int dayOfWeek = Convert.ToInt16(setting.value); + // in DayOfWeek enum Sunday = 0 so need to convert from value stored in database + // which is Saturday = 0, Sunday=1 etc + _firstWorkingDay = (DayOfWeek)((dayOfWeek + 1) % 7); + } + _startDayLoaded = true; + } + + return _firstWorkingDay; + } + + /// <summary> + /// Returns true if the day is a working day + /// </summary> + /// <value>true for working day, false for weekend day.</value> + public static bool IsWorkingDay(DayOfWeek today) + { + return !IsWeekend(today); + } + + private static int GetText(DayOfWeek dayOfWeek) + { + switch (dayOfWeek) + { + case DayOfWeek.Monday: + return 657; + case DayOfWeek.Tuesday: + return 658; + case DayOfWeek.Wednesday: + return 659; + case DayOfWeek.Thursday: + return 660; + case DayOfWeek.Friday: + return 661; + case DayOfWeek.Saturday: + return 662; + case DayOfWeek.Sunday: + return 663; + default: + return -1; + } + } + + /// <summary> + /// Returns the localiztion text of a specified week day type + /// </summary> + public static int GetText(DayType dayType) + { + switch (dayType) + { + case DayType.FirstWorkingDay: + return GetText(GetDayByIndex(0)); + case DayType.LastWorkingDay: + return GetText(GetDayByIndex(4)); + case DayType.FirstWeekendDay: + return GetText(FirstWeekendDay); + case DayType.LastWeekendDay: + return GetText(SecondWeekendDay); + case DayType.WorkingDays: + return 680; + case DayType.Record_WorkingDays: + return 672; + case DayType.WeekendDays: + return 1050; + case DayType.Record_WeekendDays: + return 1051; + default: + return -1; + } + } + + /// <summary> + /// Is this the first day of the weekend? + /// </summary> + /// <value>true for the first weekend day.</value> + public static bool IsFirstWeekendDay(DayOfWeek today) + { + return today == FirstWeekendDay; + } + + /// <summary> + /// Returns the value of the first weekend day. + /// </summary> + /// <value>the first weekend day</value> + public static DayOfWeek FirstWeekendDay + { + get { return GetDayByIndex(5); } + } + + /// <summary> + /// Returns the value of the second weekend day. + /// </summary> + /// <value>the second weekend day</value> + public static DayOfWeek SecondWeekendDay + { + get { return GetDayByIndex(6); } + } + + /// <summary> + /// Returns a comma separated list of the weekend days as + /// numbers suitable for use in SQL queries + /// </summary> + /// <value>the weekend days list</value> + public static string SqlWeekendDays + { + get + { + int firstWeekend = (int)FirstWeekendDay + 1; + int secondWeekend = (int)SecondWeekendDay + 1; + return "" + firstWeekend + "," + secondWeekend; + } + } + + /// <summary> + /// Returns a comma separated list of the working days as + /// numbers suitable for use in SQL queries + /// </summary> + /// <value>the working days list</value> + public static string SqlWorkingDays + { + get + { + string result = ""; + for (int i = 0; i < 5; i++) + { + int sqlDayNumber = (int)GetDayByIndex(i) + 1; + if (i != 0) + { + result += ","; + } + result += sqlDayNumber; + } + return result; + } + } + + #endregion + } +} \ No newline at end of file |
|
From: <gib...@su...> - 2011-11-25 20:42:53
|
Author: gibman_dk
Date: 2011-11-25 21:42:46 +0100 (Fri, 25 Nov 2011)
New Revision: 28325
Added:
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardHandler/IEpgGrabbing.cs
Log:
missing file
Added: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardHandler/IEpgGrabbing.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardHandler/IEpgGrabbing.cs (rev 0)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardHandler/IEpgGrabbing.cs 2011-11-25 20:42:46 UTC (rev 28325)
@@ -0,0 +1,39 @@
+using System.Collections.Generic;
+using Mediaportal.TV.Server.TVLibrary.Interfaces.Epg;
+using Mediaportal.TV.Server.TVLibrary.Interfaces.Interfaces;
+using Mediaportal.TV.Server.TVService.Interfaces.Services;
+
+namespace Mediaportal.TV.Server.TVService.Interfaces.CardHandler
+{
+ public interface IEpgGrabbing
+ {
+ /// <summary>
+ /// grabs the epg.
+ /// </summary>
+ /// <returns></returns>
+ bool Start(BaseEpgGrabber grabber);
+
+ /// <summary>
+ /// Aborts grabbing the epg. This also triggers the OnEpgReceived callback.
+ /// </summary>
+ void Abort();
+
+ /// <summary>
+ /// Gets the epg.
+ /// </summary>
+ /// <value>The epg.</value>
+ List<EpgChannel> Epg { get; }
+
+ /// <summary>
+ /// Returns if the card is grabbing the epg or not
+ /// </summary>
+ /// <returns>true when card is grabbing the epg otherwise false</returns>
+ bool IsGrabbing { get; }
+
+ /// <summary>
+ /// Stops the grabbing epg.
+ /// </summary>
+ /// <param name="user">User</param>
+ void Stop(IUser user);
+ }
+}
\ No newline at end of file
|
|
From: <gib...@su...> - 2011-11-25 20:23:14
|
Author: gibman_dk
Date: 2011-11-25 21:23:04 +0100 (Fri, 25 Nov 2011)
New Revision: 28324
Added:
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardHandler/
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardHandler/IAudioStreams.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardHandler/ICardTuner.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardHandler/IChannelScanning.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardHandler/IDisEqcManagement.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardHandler/IRecorder.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardHandler/ITeletextManagement.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardHandler/ITimeShifter.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardHandler/ITvCardHandler.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardHandler/IUserManagement.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardReservation/
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardReservation/ICardReservation.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardReservation/ICardStopReservationTicket.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardReservation/ICardTuneReservationTicket.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/Enums/
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/Enums/CardStopState.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/Enums/CardTuneState.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/Enums/ChannelState.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/Enums/TvResult.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/Enums/TvStoppedReason.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/IVirtualCard.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/Properties/
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/Properties/AssemblyInfo.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/Properties/Resources.Designer.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/Properties/Resources.resx
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/Properties/Settings.Designer.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/Properties/Settings.settings
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/Services/
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/Services/IUser.cs
branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/TvService.Interfaces.csproj
Log:
adding TvService.Interfaces
Added: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardHandler/IAudioStreams.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardHandler/IAudioStreams.cs (rev 0)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardHandler/IAudioStreams.cs 2011-11-25 20:23:04 UTC (rev 28324)
@@ -0,0 +1,27 @@
+using Mediaportal.TV.Server.TVLibrary.Interfaces.Interfaces;
+using Mediaportal.TV.Server.TVService.Interfaces.Services;
+
+namespace Mediaportal.TV.Server.TVService.Interfaces.CardHandler
+{
+ public interface IAudioStreams
+ {
+ /// <summary>
+ /// Gets the available audio streams.
+ /// </summary>
+ /// <value>The available audio streams.</value>
+ IAudioStream[] Streams(IUser user);
+
+ /// <summary>
+ /// Gets the current audio stream.
+ /// </summary>
+ /// <returns></returns>
+ IAudioStream GetCurrent(IUser user);
+
+ /// <summary>
+ /// Sets the current audio stream.
+ /// </summary>
+ /// <param name="user">User</param>
+ /// <param name="stream">The stream.</param>
+ void Set(IUser user, IAudioStream stream);
+ }
+}
\ No newline at end of file
Added: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardHandler/ICardTuner.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardHandler/ICardTuner.cs (rev 0)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardHandler/ICardTuner.cs 2011-11-25 20:23:04 UTC (rev 28324)
@@ -0,0 +1,74 @@
+using System.Collections.Generic;
+using Mediaportal.TV.Server.TVDatabase.Entities;
+using Mediaportal.TV.Server.TVLibrary.Interfaces.Interfaces;
+using Mediaportal.TV.Server.TVService.Interfaces.CardReservation;
+using Mediaportal.TV.Server.TVService.Interfaces.Enums;
+using Mediaportal.TV.Server.TVService.Interfaces.Services;
+
+namespace Mediaportal.TV.Server.TVService.Interfaces.CardHandler
+{
+ public delegate void OnAfterCancelTuneDelegate(int subchannel);
+ public delegate void OnAfterTuneDelegate(ITvCardHandler cardHandler);
+ public delegate void OnBeforeTuneDelegate(ITvCardHandler cardHandler);
+
+ public interface ICardTuner
+ {
+ object CardReservationsLock { get; }
+ CardTuneState CardTuneState { get; set; }
+ ICardTuneReservationTicket ActiveCardTuneReservationTicket { get; set; }
+ List<ICardTuneReservationTicket> ReservationsForTune { get; }
+ CardStopState CardStopState { get; set; }
+ List<ICardStopReservationTicket> ReservationsForStop { get; }
+ bool HasActiveCardTuneReservationTicket { get; }
+
+ /// <summary>
+ /// Scans the the specified card to the channel.
+ /// </summary>
+ /// <param name="user">User</param>
+ /// <param name="channel">The channel.</param>
+ /// <param name="idChannel">The channel id</param>
+ /// <returns></returns>
+ TvResult Scan(ref IUser user, IChannel channel, int idChannel);
+
+ void CancelTune(int subchannel);
+
+ /// <summary>
+ /// Tunes the the specified card to the channel.
+ /// </summary>
+ /// <param name="user">User</param>
+ /// <param name="channel">The channel.</param>
+ /// <param name="idChannel">The channel id</param>
+ /// <returns></returns>
+ TvResult Tune(ref IUser user, IChannel channel, int idChannel);
+
+ void CleanUpPendingTune(int pendingSubchannel);
+ event OnAfterCancelTuneDelegate OnAfterCancelTuneEvent;
+ event OnAfterTuneDelegate OnAfterTuneEvent;
+ event OnBeforeTuneDelegate OnBeforeTuneEvent;
+
+ /// <summary>
+ /// Tune the card to the specified channel
+ /// </summary>
+ /// <param name="user">User</param>
+ /// <param name="channel">The channel.</param>
+ /// <param name="dbChannel">The db channel</param>
+ /// <returns>TvResult indicating whether method succeeded</returns>
+ TvResult CardTune(ref IUser user, IChannel channel, Channel dbChannel);
+
+ /// <summary>
+ /// Determines whether card is tuned to the transponder specified by transponder
+ /// </summary>
+ /// <param name="transponder">The transponder.</param>
+ /// <returns>
+ /// <c>true</c> if card is tuned to the transponder; otherwise, <c>false</c>.
+ /// </returns>
+ bool IsTunedToTransponder(IChannel transponder);
+
+ /// <summary>
+ /// Method to check if card can tune to the channel specified
+ /// </summary>
+ /// <param name="channel">channel.</param>
+ /// <returns>true if card can tune to the channel otherwise false</returns>
+ bool CanTune(IChannel channel);
+ }
+}
\ No newline at end of file
Added: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardHandler/IChannelScanning.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardHandler/IChannelScanning.cs (rev 0)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardHandler/IChannelScanning.cs 2011-11-25 20:23:04 UTC (rev 28324)
@@ -0,0 +1,24 @@
+using Mediaportal.TV.Server.TVLibrary.Interfaces;
+using Mediaportal.TV.Server.TVLibrary.Interfaces.Interfaces;
+
+namespace Mediaportal.TV.Server.TVService.Interfaces.CardHandler
+{
+ public interface IChannelScanning
+ {
+ /// <summary>
+ /// Returns if the card is scanning or not
+ /// </summary>
+ /// <returns>true when card is scanning otherwise false</returns>
+ bool IsScanning { get; }
+
+ /// <summary>
+ /// scans current transponder for more channels.
+ /// </summary>
+ /// <param name="channel">IChannel containing the transponder tuning details.</param>
+ /// <param name="settings">Scan settings</param>
+ /// <returns>list of channels found</returns>
+ IChannel[] Scan(IChannel channel, ScanParameters settings);
+
+ IChannel[] ScanNIT(IChannel channel, ScanParameters settings);
+ }
+}
\ No newline at end of file
Added: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardHandler/IDisEqcManagement.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardHandler/IDisEqcManagement.cs (rev 0)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardHandler/IDisEqcManagement.cs 2011-11-25 20:23:04 UTC (rev 28324)
@@ -0,0 +1,65 @@
+using Mediaportal.TV.Server.TVLibrary.Interfaces.Interfaces;
+
+namespace Mediaportal.TV.Server.TVService.Interfaces.CardHandler
+{
+ public interface IDisEqcManagement
+ {
+ /// <summary>
+ /// returns the current diseqc motor position
+ /// </summary>
+ /// <param name="satellitePosition">The satellite position.</param>
+ /// <param name="stepsAzimuth">The steps azimuth.</param>
+ /// <param name="stepsElevation">The steps elevation.</param>
+ void GetPosition(out int satellitePosition, out int stepsAzimuth, out int stepsElevation);
+
+ /// <summary>
+ /// resets the diseqc motor.
+ /// </summary>
+ void Reset();
+
+ /// <summary>
+ /// stops the diseqc motor
+ /// </summary>
+ void StopMotor();
+
+ /// <summary>
+ /// sets the east limit of the diseqc motor
+ /// </summary>
+ void SetEastLimit();
+
+ /// <summary>
+ /// sets the west limit of the diseqc motor
+ /// </summary>
+ void SetWestLimit();
+
+ /// <summary>
+ /// Enables or disables the use of the west/east limits
+ /// </summary>
+ /// <param name="onOff">if set to <c>true</c> [on off].</param>
+ void EnableEastWestLimits(bool onOff);
+
+ /// <summary>
+ /// Drives the diseqc motor in the direction specified by the number of steps
+ /// </summary>
+ /// <param name="direction">The direction.</param>
+ /// <param name="numberOfSteps">The number of steps.</param>
+ void DriveMotor(DiSEqCDirection direction, byte numberOfSteps);
+
+ /// <summary>
+ /// Stores the current diseqc motor position
+ /// </summary>
+ /// <param name="position">The position.</param>
+ void StoreCurrentPosition(byte position);
+
+ /// <summary>
+ /// Drives the diseqc motor to the reference positition
+ /// </summary>
+ void GotoReferencePosition();
+
+ /// <summary>
+ /// Drives the diseqc motor to the specified position
+ /// </summary>
+ /// <param name="position">The position.</param>
+ void GotoStoredPosition(byte position);
+ }
+}
\ No newline at end of file
Added: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardHandler/IRecorder.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardHandler/IRecorder.cs (rev 0)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardHandler/IRecorder.cs 2011-11-25 20:23:04 UTC (rev 28324)
@@ -0,0 +1,53 @@
+using System;
+using Mediaportal.TV.Server.TVService.Interfaces.Enums;
+using Mediaportal.TV.Server.TVService.Interfaces.Services;
+
+namespace Mediaportal.TV.Server.TVService.Interfaces.CardHandler
+{
+ public interface IRecorder
+ {
+ /// <summary>
+ /// Starts recording.
+ /// </summary>
+ /// <param name="user">User</param>
+ /// <param name="fileName">Name of the recording file.</param>
+ /// <returns></returns>
+ TvResult Start(ref IUser user, ref string fileName);
+
+ /// <summary>
+ /// Stops recording.
+ /// </summary>
+ /// <param name="user">User</param>
+ /// <returns></returns>
+ bool Stop(ref IUser user);
+
+ /// <summary>
+ /// Gets a value indicating whether this card is recording.
+ /// </summary>
+ /// <value>
+ /// <c>true</c> if this card is recording; otherwise, <c>false</c>.
+ /// </value>
+ bool IsAnySubChannelRecording { get; }
+
+ /// <summary>
+ /// Returns if the card is recording or not
+ /// </summary>
+ /// <param name="user">User</param>
+ /// <returns>true when card is recording otherwise false</returns>
+ bool IsRecording(ref IUser user);
+
+ /// <summary>
+ /// Returns the current filename used for recording
+ /// </summary>
+ /// <param name="user">User</param>
+ /// <returns>filename or null when not recording</returns>
+ string FileName(ref IUser user);
+
+ /// <summary>
+ /// returns the date/time when recording has been started for the card specified
+ /// </summary>
+ /// <param name="user">User</param>
+ /// <returns>DateTime containg the date/time when recording was started</returns>
+ DateTime RecordingStarted(IUser user);
+ }
+}
\ No newline at end of file
Added: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardHandler/ITeletextManagement.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardHandler/ITeletextManagement.cs (rev 0)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardHandler/ITeletextManagement.cs 2011-11-25 20:23:04 UTC (rev 28324)
@@ -0,0 +1,83 @@
+using System;
+using Mediaportal.TV.Server.TVService.Interfaces.Services;
+
+namespace Mediaportal.TV.Server.TVService.Interfaces.CardHandler
+{
+ public interface ITeletextManagement
+ {
+ /// <summary>
+ /// Returns if the card is grabbing teletext or not
+ /// </summary>
+ /// <param name="user">USer</param>
+ /// <returns>true when card is grabbing teletext otherwise false</returns>
+ bool IsGrabbingTeletext(IUser user);
+
+ /// <summary>
+ /// Returns if the channel to which the card is currently tuned
+ /// has teletext or not
+ /// </summary>
+ /// <param name="user">User</param>
+ /// <returns>yes if channel has teletext otherwise false</returns>
+ bool HasTeletext(IUser user);
+
+ /// <summary>
+ /// Returns the rotation time for a specific teletext page
+ /// </summary>
+ /// <param name="user">User</param>
+ /// <param name="pageNumber">The pagenumber (0x100-0x899)</param>
+ /// <returns>timespan containing the rotation time</returns>
+ TimeSpan TeletextRotation(IUser user, int pageNumber);
+
+ /// <summary>
+ /// turn on/off teletext grabbing
+ /// </summary>
+ /// <param name="user">User</param>
+ /// <param name="onOff">turn on/off teletext grabbing</param>
+ void GrabTeletext(IUser user, bool onOff);
+
+ /// <summary>
+ /// Gets the teletext page.
+ /// </summary>
+ /// <param name="user">User</param>
+ /// <param name="pageNumber">The page number.</param>
+ /// <param name="subPageNumber">The sub page number.</param>
+ /// <returns></returns>
+ byte[] GetTeletextPage(IUser user, int pageNumber, int subPageNumber);
+
+ /// <summary>
+ /// Gets the number of subpages for a teletext page.
+ /// </summary>
+ /// <param name="user">User</param>
+ /// <param name="pageNumber">The page number.</param>
+ /// <returns></returns>
+ int SubPageCount(IUser user, int pageNumber);
+
+ /// <summary>
+ /// Gets the teletext pagenumber for the red button
+ /// </summary>
+ /// <param name="user">The user.</param>
+ /// <returns>Teletext pagenumber for the red button</returns>
+ int GetTeletextRedPageNumber(IUser user);
+
+ /// <summary>
+ /// Gets the teletext pagenumber for the green button
+ /// </summary>
+ /// <param name="user">The user.</param>
+ /// <returns>Teletext pagenumber for the green button</returns>
+ int GetTeletextGreenPageNumber(IUser user);
+
+ /// <summary>
+ /// Gets the teletext pagenumber for the yellow button
+ /// </summary>
+ /// <param name="user">The user.</param>
+ /// <returns>Teletext pagenumber for the yellow button</returns>
+ int GetTeletextYellowPageNumber(IUser user);
+
+ /// <summary>
+ /// Gets the teletext pagenumber for the blue button
+ /// </summary>
+ /// <param name="user">The user.</param>
+ /// <returns>Teletext pagenumber for the blue button</returns>
+ int GetTeletextBluePageNumber(IUser user);
+ }
+}
\ No newline at end of file
Added: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardHandler/ITimeShifter.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardHandler/ITimeShifter.cs (rev 0)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardHandler/ITimeShifter.cs 2011-11-25 20:23:04 UTC (rev 28324)
@@ -0,0 +1,69 @@
+using System;
+using Mediaportal.TV.Server.TVService.Interfaces.Enums;
+using Mediaportal.TV.Server.TVService.Interfaces.Services;
+
+namespace Mediaportal.TV.Server.TVService.Interfaces.CardHandler
+{
+ public interface ITimeShifter
+ {
+ /// <summary>
+ /// Gets the name of the time shift file.
+ /// </summary>
+ /// <value>The name of the time shift file.</value>
+ string FileName(ref IUser user);
+
+ /// <summary>
+ /// Returns the position in the current timeshift file and the id of the current timeshift file
+ /// </summary>
+ /// <param name="user">The user.</param>
+ /// <param name="position">The position in the current timeshift buffer file</param>
+ /// <param name="bufferId">The id of the current timeshift buffer file</param>
+ bool GetCurrentFilePosition(ref IUser user, ref Int64 position, ref long bufferId);
+
+ /// <summary>
+ /// Gets a value indicating whether this card is recording.
+ /// </summary>
+ /// <value>
+ /// <c>true</c> if this card is recording; otherwise, <c>false</c>.
+ /// </value>
+ bool IsAnySubChannelTimeshifting { get; }
+
+ /// <summary>
+ /// Returns if the card is timeshifting or not
+ /// </summary>
+ /// <returns>true when card is timeshifting otherwise false</returns>
+ bool IsTimeShifting(ref IUser user);
+
+ /// <summary>
+ /// returns the date/time when timeshifting has been started for the card specified
+ /// </summary>
+ /// <returns>DateTime containg the date/time when timeshifting was started</returns>
+ DateTime TimeShiftStarted(IUser user);
+
+ /// <summary>
+ /// Start timeshifting.
+ /// </summary>
+ /// <param name="user">User</param>
+ /// <param name="fileName">Name of the timeshiftfile.</param>
+ /// <returns>TvResult indicating whether method succeeded</returns>
+ TvResult Start(ref IUser user, ref string fileName);
+
+ /// <summary>
+ /// Stops the time shifting.
+ /// </summary>
+ /// <returns></returns>
+ bool Stop(ref IUser user);
+
+ /// <summary>
+ /// Fetches the stream quality information
+ /// </summary>
+ /// <param name="user">user</param>
+ /// <param name="totalTSpackets">Amount of packets processed</param>
+ /// <param name="discontinuityCounter">Number of stream discontinuities</param>
+ /// <returns></returns>
+ void GetStreamQualityCounters(IUser user, out int totalTSpackets, out int discontinuityCounter);
+
+ void OnBeforeTune();
+ void OnAfterTune();
+ }
+}
\ No newline at end of file
Added: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardHandler/ITvCardHandler.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardHandler/ITvCardHandler.cs (rev 0)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardHandler/ITvCardHandler.cs 2011-11-25 20:23:04 UTC (rev 28324)
@@ -0,0 +1,72 @@
+#region Copyright (C) 2005-2011 Team MediaPortal
+
+// Copyright (C) 2005-2011 Team MediaPortal
+// http://www.team-mediaportal.com
+//
+// MediaPortal is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
+//
+// MediaPortal is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>.
+
+#endregion
+
+using Mediaportal.TV.Server.TVDatabase.Entities;
+using Mediaportal.TV.Server.TVLibrary.Interfaces;
+using Mediaportal.TV.Server.TVLibrary.Interfaces.Interfaces;
+using Mediaportal.TV.Server.TVService.Interfaces.Services;
+
+namespace Mediaportal.TV.Server.TVService.Interfaces.CardHandler
+{
+ public interface ITvCardHandler
+ {
+ IUserManagement Users { get; }
+ IDisEqcManagement DisEqC { get; }
+ ITeletextManagement Teletext { get; }
+ IChannelScanning Scanner { get; }
+ IEpgGrabbing Epg { get; }
+ IAudioStreams Audio { get; }
+ IRecorder Recorder { get; }
+ ITimeShifter TimeShifter { get; }
+ ICardTuner Tuner { get; }
+ ICiMenuActions CiMenuActions { get; }
+
+ bool CiMenuSupported { get; }
+
+ ITVCard Card { get; set; }
+ bool IsIdle { get; }
+ Card DataBaseCard { get; set; }
+ CardType Type { get; }
+ string CardName { get; }
+ string CardDevice();
+ int NumberOfChannelsDecrypting { get; }
+ bool HasCA { get; }
+
+ bool SupportsSubChannels { get; }
+
+ void UpdateSignalSate();
+ bool TunerLocked { get; }
+ int SignalQuality { get; }
+ int SignalLevel { get; }
+ int MinChannel { get; }
+ int MaxChannel { get; }
+
+ IChannel CurrentChannel(ref IUser user);
+ int CurrentDbChannel(ref IUser user);
+ string CurrentChannelName(ref IUser user);
+ IVideoStream GetCurrentVideoStream(IUser user);
+ bool IsScrambled(ref IUser user);
+
+ void StopCard(IUser user);
+ void PauseCard(IUser user);
+ void SetParameters();
+ void Dispose();
+ }
+}
\ No newline at end of file
Added: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardHandler/IUserManagement.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardHandler/IUserManagement.cs (rev 0)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardHandler/IUserManagement.cs 2011-11-25 20:23:04 UTC (rev 28324)
@@ -0,0 +1,57 @@
+using Mediaportal.TV.Server.TVService.Interfaces.Enums;
+using Mediaportal.TV.Server.TVService.Interfaces.Services;
+
+namespace Mediaportal.TV.Server.TVService.Interfaces.CardHandler
+{
+ public interface IUserManagement
+ {
+ /// <summary>
+ /// Locks the card to the user specified
+ /// </summary>
+ /// <param name="user">The user.</param>
+ void Lock(IUser user);
+
+ /// <summary>
+ /// Unlocks this card.
+ /// </summary>
+ /// <param name="user">The user.</param>
+ ///
+ void Unlock(IUser user);
+
+ /// <summary>
+ /// Determines whether the specified user is owner of this card
+ /// </summary>
+ /// <param name="user">The user.</param>
+ /// <returns>
+ /// <c>true</c> if the specified user is owner; otherwise, <c>false</c>.
+ /// </returns>
+ bool IsOwner(IUser user);
+
+ /// <summary>
+ /// Removes the user from this card
+ /// </summary>
+ /// <param name="user">The user.</param>
+ void RemoveUser(IUser user);
+
+ TvStoppedReason GetTvStoppedReason(IUser user);
+ void SetTvStoppedReason(IUser user, TvStoppedReason reason);
+
+ /// <summary>
+ /// Determines whether the card is locked and ifso returns by which user
+ /// </summary>
+ /// <param name="user">The user.</param>
+ /// <returns>
+ /// <c>true</c> if the specified card is locked; otherwise, <c>false</c>.
+ /// </returns>
+ bool IsLocked(out IUser user);
+
+ /// <summary>
+ /// Gets the users for this card.
+ /// </summary>
+ /// <returns></returns>
+ IUser[] GetUsers();
+
+ bool HasEqualOrHigherPriority(IUser user);
+ bool HasHighestPriority(IUser user);
+ }
+}
\ No newline at end of file
Added: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardReservation/ICardReservation.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardReservation/ICardReservation.cs (rev 0)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardReservation/ICardReservation.cs 2011-11-25 20:23:04 UTC (rev 28324)
@@ -0,0 +1,35 @@
+#region Copyright (C) 2005-2010 Team MediaPortal
+
+// Copyright (C) 2005-2010 Team MediaPortal
+// http://www.team-mediaportal.com
+//
+// MediaPortal is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
+//
+// MediaPortal is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>.
+
+#endregion
+
+using Mediaportal.TV.Server.TVDatabase.Entities;
+using Mediaportal.TV.Server.TVLibrary.Interfaces.Interfaces;
+using Mediaportal.TV.Server.TVService.Interfaces.CardHandler;
+using Mediaportal.TV.Server.TVService.Interfaces.Enums;
+using Mediaportal.TV.Server.TVService.Interfaces.Services;
+
+namespace Mediaportal.TV.Server.TVService.Interfaces.CardReservation
+{
+ public interface ICardReservation
+ {
+ ICardTuneReservationTicket RequestCardTuneReservation(ITvCardHandler tvcard, IChannel tuningDetail, IUser user);
+ TvResult CardTune(ITvCardHandler tvcard, ref IUser user, IChannel channel, Channel dbChannel, ICardTuneReservationTicket ticket);
+ TvResult Tune(ITvCardHandler tvcard, ref IUser user, IChannel channel, int idChannel, ICardTuneReservationTicket ticket);
+ }
+}
Added: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardReservation/ICardStopReservationTicket.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardReservation/ICardStopReservationTicket.cs (rev 0)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardReservation/ICardStopReservationTicket.cs 2011-11-25 20:23:04 UTC (rev 28324)
@@ -0,0 +1,27 @@
+#region Copyright (C) 2005-2010 Team MediaPortal
+
+// Copyright (C) 2005-2010 Team MediaPortal
+// http://www.team-mediaportal.com
+//
+// MediaPortal is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
+//
+// MediaPortal is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>.
+
+#endregion
+
+namespace Mediaportal.TV.Server.TVService.Interfaces.CardReservation
+{
+ public interface ICardStopReservationTicket
+ {
+ int Id { get; }
+ }
+}
Added: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardReservation/ICardTuneReservationTicket.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardReservation/ICardTuneReservationTicket.cs (rev 0)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/CardReservation/ICardTuneReservationTicket.cs 2011-11-25 20:23:04 UTC (rev 28324)
@@ -0,0 +1,57 @@
+#region Copyright (C) 2005-2010 Team MediaPortal
+
+// Copyright (C) 2005-2010 Team MediaPortal
+// http://www.team-mediaportal.com
+//
+// MediaPortal is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
+//
+// MediaPortal is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>.
+
+#endregion
+
+using System.Collections.Generic;
+using Mediaportal.TV.Server.TVLibrary.Interfaces.Interfaces;
+using Mediaportal.TV.Server.TVService.Interfaces.Services;
+
+namespace Mediaportal.TV.Server.TVService.Interfaces.CardReservation
+{
+ public interface ICardTuneReservationTicket
+ {
+ IChannel TuningDetail { get; }
+
+ IList<IUser> InactiveUsers { get; }
+ IList<IUser> ActiveUsers { get; }
+ IList<IUser> Users { get; }
+ List<IUser> RecordingUsers { get; }
+ IList<IUser> TimeshiftingUsers { get; }
+
+ bool IsSameTransponder { get; }
+ bool IsOwner { get; }
+ bool IsAnySubChannelTimeshifting { get; }
+ bool IsFreeToAir { get; }
+ bool ConflictingSubchannelFound { get; }
+
+ int NumberOfOtherUsersOnSameChannel { get; }
+ int NumberOfOtherUsersOnCurrentCard { get; }
+ int NumberOfUsersOnSameCurrentChannel { get; }
+
+ int Id { get; }
+ int OwnerSubchannel { get; }
+ int CardId { get; }
+ int NumberOfChannelsDecrypting { get; }
+ bool IsCamAlreadyDecodingChannel { get; }
+ IUser User { get; }
+ int PendingSubchannel { get; set; }
+ bool HasHighestPriority { get; }
+ bool HasEqualOrHigherPriority { get; }
+ }
+}
Added: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/Enums/CardStopState.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/Enums/CardStopState.cs (rev 0)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/Enums/CardStopState.cs 2011-11-25 20:23:04 UTC (rev 28324)
@@ -0,0 +1,11 @@
+namespace Mediaportal.TV.Server.TVService.Interfaces.Enums
+{
+ public enum CardStopState
+ {
+ Idle,
+ StopPending,
+ Stopping,
+ Stopped,
+ StopFailed
+ }
+}
\ No newline at end of file
Added: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/Enums/CardTuneState.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/Enums/CardTuneState.cs (rev 0)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/Enums/CardTuneState.cs 2011-11-25 20:23:04 UTC (rev 28324)
@@ -0,0 +1,12 @@
+namespace Mediaportal.TV.Server.TVService.Interfaces.Enums
+{
+ public enum CardTuneState
+ {
+ Idle,
+ TunePending,
+ Tuning,
+ Tuned,
+ TuneCancelled,
+ TuneFailed
+ }
+}
\ No newline at end of file
Added: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/Enums/ChannelState.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/Enums/ChannelState.cs (rev 0)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/Enums/ChannelState.cs 2011-11-25 20:23:04 UTC (rev 28324)
@@ -0,0 +1,45 @@
+#region Copyright (C) 2005-2011 Team MediaPortal
+
+// Copyright (C) 2005-2011 Team MediaPortal
+// http://www.team-mediaportal.com
+//
+// MediaPortal is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
+//
+// MediaPortal is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>.
+
+#endregion
+
+namespace Mediaportal.TV.Server.TVService.Interfaces.Enums
+{
+ /// <summary>
+ /// current availability of a specific channel
+ /// </summary>
+ public enum ChannelState
+ {
+ /// <summary>
+ /// the channel cannot be tuned right now - maybe all cards are busy
+ /// </summary>
+ nottunable = 0,
+ /// <summary>
+ /// the channel can be zapped
+ /// </summary>
+ tunable = 1,
+ /// <summary>
+ /// this channel is currently timeshifted by one card
+ /// </summary>
+ timeshifting = 2,
+ /// <summary>
+ /// this channel is currently being recorded
+ /// </summary>
+ recording = 3,
+ }
+}
\ No newline at end of file
Added: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/Enums/TvResult.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/Enums/TvResult.cs (rev 0)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/Enums/TvResult.cs 2011-11-25 20:23:04 UTC (rev 28324)
@@ -0,0 +1,101 @@
+#region Copyright (C) 2005-2011 Team MediaPortal
+
+// Copyright (C) 2005-2011 Team MediaPortal
+// http://www.team-mediaportal.com
+//
+// MediaPortal is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
+//
+// MediaPortal is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>.
+
+#endregion
+
+namespace Mediaportal.TV.Server.TVService.Interfaces.Enums
+{
+ /// <summary>
+ /// enum describing the possible result codes for the tv engine
+ /// </summary>
+ public enum TvResult
+ {
+ /// <summary>
+ /// Operation succeeded
+ /// </summary>
+ Succeeded,
+ /// <summary>
+ /// Operation failed since all cards are busy and no free card could be found
+ /// </summary>
+ AllCardsBusy,
+ /// <summary>
+ /// Operation failed since channel is encrypted
+ /// </summary>
+ ChannelIsScrambled,
+ /// <summary>
+ /// Opetation failed since no audio/video was detected after tuning
+ /// </summary>
+ NoVideoAudioDetected,
+ /// <summary>
+ /// Operation failed since no signal was detected
+ /// </summary>
+ NoSignalDetected,
+ /// <summary>
+ /// Operation failed due to an unknown error
+ /// </summary>
+ UnknownError,
+ /// <summary>
+ /// Operation failed since the graph could not be build or started
+ /// </summary>
+ UnableToStartGraph,
+ /// <summary>
+ /// Operation failed since the channel is unknown
+ /// </summary>
+ UnknownChannel,
+ /// <summary>
+ /// Operation failed since the there is no tuning information for the channel
+ /// </summary>
+ NoTuningDetails,
+ /// <summary>
+ /// Operation failed since the channel is not mapped to any card
+ /// </summary>
+ ChannelNotMappedToAnyCard,
+ /// <summary>
+ /// Operation failed since the card is disabled
+ /// </summary>
+ CardIsDisabled,
+ /// <summary>
+ /// Operation failed since we are unable to connect to the slave server
+ /// </summary>
+ ConnectionToSlaveFailed,
+ /// <summary>
+ /// Operation failed since we are not the owner of the card
+ /// </summary>
+ NotTheOwner,
+ /// <summary>
+ /// Operation failed since we are unable to build the graph
+ /// </summary>
+ GraphBuildingFailed,
+ /// <summary>
+ /// Operation failed since we can't find a suitable software encoder
+ /// </summary>
+ SWEncoderMissing,
+ /// <summary>
+ /// Operation failed since there is no free disk space
+ /// </summary>
+ NoFreeDiskSpace,
+ /// <summary>
+ /// No PMT found
+ /// </summary>
+ NoPmtFound,
+ /// <summary>
+ /// A tune operation was cancelled
+ /// </summary>
+ TuneCancelled
+ }
+}
\ No newline at end of file
Added: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/Enums/TvStoppedReason.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/Enums/TvStoppedReason.cs (rev 0)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/Enums/TvStoppedReason.cs 2011-11-25 20:23:04 UTC (rev 28324)
@@ -0,0 +1,52 @@
+#region Copyright (C) 2005-2011 Team MediaPortal
+
+// Copyright (C) 2005-2011 Team MediaPortal
+// http://www.team-mediaportal.com
+//
+// MediaPortal is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
+//
+// MediaPortal is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>.
+
+#endregion
+
+using System;
+
+namespace Mediaportal.TV.Server.TVService.Interfaces.Enums
+{
+ /// <summary>
+ /// enum describing the possible result codes for the tv engine when TV suddenly stops
+ /// </summary>
+ [Serializable]
+ public enum TvStoppedReason
+ {
+ /// <summary>
+ /// Timeshifting stopped because of an unknown reason.
+ /// </summary>
+ UnknownReason,
+ /// <summary>
+ /// Timeshifting stopped because a recording started which needed the card.
+ /// </summary>
+ RecordingStarted,
+ /// <summary>
+ /// Timeshifting stopped because client was kicked by server admin.
+ /// </summary>
+ KickedByAdmin,
+ /// <summary>
+ /// Timeshifting stopped because client heartbeat timed out.
+ /// </summary>
+ HeartBeatTimeOut,
+ /// <summary>
+ /// Timeshifting stopped because the owner of the same transponder has decided to change transponder.
+ /// </summary>
+ OwnerChangedTS
+ }
+}
\ No newline at end of file
Added: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/IVirtualCard.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/IVirtualCard.cs (rev 0)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/IVirtualCard.cs 2011-11-25 20:23:04 UTC (rev 28324)
@@ -0,0 +1,350 @@
+using System;
+using System.Collections.Generic;
+using System.Xml.Serialization;
+using Mediaportal.TV.Server.TVLibrary.Interfaces;
+using Mediaportal.TV.Server.TVLibrary.Interfaces.Interfaces;
+using Mediaportal.TV.Server.TVService.Interfaces.Enums;
+using Mediaportal.TV.Server.TVService.Interfaces.Services;
+
+namespace Mediaportal.TV.Server.TVService.Interfaces
+{
+ public interface IVirtualCard
+ {
+ /// <summary>
+ /// Gets the user.
+ /// </summary>
+ /// <value>The user.</value>
+ IUser User { get; }
+
+ /// <summary>
+ /// returns the card id of this virtual card
+ /// </summary>
+ int Id { get; }
+
+ /// <summary>
+ /// gets the ip adress of the tvservice
+ /// </summary>
+ string RemoteServer { get; set; }
+
+ ///<summary>
+ /// Gets/Set the recording format
+ ///</summary>
+ int RecordingFormat { get; set; }
+
+ /// <summary>
+ /// gets/sets the recording folder for the card
+ /// </summary>
+ [XmlIgnore]
+ string RecordingFolder { get; set; }
+
+ /// <summary>
+ /// gets/sets the timeshifting folder for the card
+ /// </summary>
+ [XmlIgnore]
+ string TimeshiftFolder { get; set; }
+
+ /// <summary>
+ /// Gets the type of card (analog,dvbc,dvbs,dvbt,atsc)
+ /// </summary>
+ /// <value>cardtype</value>
+ [XmlIgnore]
+ CardType Type { get; }
+
+ /// <summary>
+ /// Gets the name
+ /// </summary>
+ /// <returns>name of card</returns>
+ [XmlIgnore]
+ string Name { get; }
+
+ /// <summary>
+ /// Returns the current filename used for recording
+ /// </summary>
+ /// <returns>filename of the recording or null when not recording</returns>
+ [XmlIgnore]
+ string RecordingFileName { get; }
+
+ /// <summary>
+ /// Gets the available audio streams.
+ /// </summary>
+ /// <value>The available audio streams.</value>
+ [XmlIgnore]
+ IEnumerable<IAudioStream> AvailableAudioStreams { get; }
+
+ /// <summary>
+ /// returns which schedule is currently being recorded
+ /// </summary>
+ /// <returns>id of Schedule or -1 if card not recording</returns>
+ [XmlIgnore]
+ int RecordingScheduleId { get; }
+
+ /// <summary>
+ /// Returns the URL for the RTSP stream on which the client can find the
+ /// stream
+ /// </summary>
+ /// <returns>URL containing the RTSP adress on which the card transmits its stream</returns>
+ [XmlIgnore]
+ string RTSPUrl { get; }
+
+ /// <summary>
+ /// turn on/off teletext grabbing
+ /// </summary>
+ [XmlIgnore]
+ bool GrabTeletext { set; }
+
+ /// <summary>
+ /// Returns if the current channel has teletext or not
+ /// </summary>
+ /// <returns>yes if channel has teletext otherwise false</returns>
+ [XmlIgnore]
+ bool HasTeletext { get; }
+
+ /// <summary>
+ /// Returns if we arecurrently grabbing the epg or not
+ /// </summary>
+ /// <returns>true when card is grabbing the epg otherwise false</returns>
+ [XmlIgnore]
+ bool IsGrabbingEpg { get; }
+
+ /// <summary>
+ /// Returns if card is currently recording or not
+ /// </summary>
+ /// <returns>true when card is recording otherwise false</returns>
+ [XmlIgnore]
+ bool IsRecording { get; }
+
+ /// <summary>
+ /// Returns if card is currently scanning or not
+ /// </summary>
+ /// <returns>true when card is scanning otherwise false</returns>
+ [XmlIgnore]
+ bool IsScanning { get; }
+
+ /// <summary>
+ /// Returns whether the current channel is scrambled or not.
+ /// </summary>
+ /// <returns>yes if channel is scrambled and CI/CAM cannot decode it, otherwise false</returns>
+ [XmlIgnore]
+ bool IsScrambled { get; }
+
+ /// <summary>
+ /// Returns if card is currently timeshifting or not
+ /// </summary>
+ /// <returns>true when card is timeshifting otherwise false</returns>
+ [XmlIgnore]
+ bool IsTimeShifting { get; }
+
+ /// <summary>
+ /// Returns the current filename used for timeshifting
+ /// </summary>
+ /// <returns>timeshifting filename null when not timeshifting</returns>
+ [XmlIgnore]
+ string TimeShiftFileName { get; }
+
+ /// <summary>
+ /// Returns if the tuner is locked onto a signal or not
+ /// </summary>
+ /// <returns>true if tuner is locked otherwise false</returns>
+ [XmlIgnore]
+ bool IsTunerLocked { get; }
+
+ /// <summary>
+ /// Gets the name of the tv/radio channel to which we are tuned
+ /// </summary>
+ /// <returns>channel name</returns>
+ [XmlIgnore]
+ string ChannelName { get; }
+
+ /// <summary>
+ /// Gets the of the tv/radio channel to which we are tuned
+ /// </summary>
+ /// <returns>channel name</returns>
+ [XmlIgnore]
+ IChannel Channel { get; }
+
+ /// <summary>
+ /// returns the database channel
+ /// </summary>
+ /// <returns>int</returns>
+ [XmlIgnore]
+ int IdChannel { get; }
+
+ /// <summary>
+ /// Returns the signal level
+ /// </summary>
+ /// <returns>signal level (0-100)</returns>
+ [XmlIgnore]
+ int SignalLevel { get; }
+
+ /// <summary>
+ /// Returns the signal quality
+ /// </summary>
+ /// <returns>signal quality (0-100)</returns>
+ [XmlIgnore]
+ int SignalQuality { get; }
+
+ /// <summary>
+ /// Gets/Sts the quality type
+ /// </summary>
+ QualityType QualityType { get; set; }
+
+ /// <summary>
+ /// Gets/Sts the bitrate mode
+ /// </summary>
+ VIDEOENCODER_BITRATE_MODE BitRateMode { get; set; }
+
+ /// <summary>
+ ///
+ /// </summary>
+ int NrOfOtherUsersTimeshiftingOnCard { get; set; }
+
+ /// <summary>
+ /// Gets the current video stream format.
+ /// </summary>
+ /// <value>The available audio streams.</value>
+ IVideoStream GetCurrentVideoStream(IUser user);
+
+ /// <summary>
+ /// Fetches the stream quality information
+ /// </summary>
+ /// <param name="totalTSpackets">Amount of packets processed</param>
+ /// <param name="discontinuityCounter">Number of stream discontinuities</param>
+ /// <returns></returns>
+ void GetStreamQualityCounters(out int totalTSpackets, out int discontinuityCounter);
+
+ /// <summary>
+ /// Gets a raw teletext page.
+ /// </summary>
+ /// <param name="pageNumber">The page number. (0x100-0x899)</param>
+ /// <param name="subPageNumber">The sub page number.(0x0-0x79)</param>
+ /// <returns>byte[] array containing the raw teletext page or null if page is not found</returns>
+ byte[] GetTeletextPage(int pageNumber, int subPageNumber);
+
+ /// <summary>
+ /// Stops the time shifting.
+ /// </summary>
+ /// <returns>true if success otherwise false</returns>
+ void StopTimeShifting();
+
+ /// <summary>
+ /// Stops recording.
+ /// </summary>
+ /// <returns>true if success otherwise false</returns>
+ void StopRecording();
+
+ /// <summary>
+ /// Starts recording.
+ /// </summary>
+ /// <param name="fileName">Name of the recording file.</param>
+ /// <returns>true if success otherwise false</returns>
+ TvResult StartRecording(ref string fileName);
+
+ /// <summary>
+ /// Gets the number of subpages for a teletext page.
+ /// </summary>
+ /// <param name="pageNumber">The page number (0x100-0x899)</param>
+ /// <returns>number of teletext subpages for the pagenumber</returns>
+ int SubPageCount(int pageNumber);
+
+ /// <summary>
+ /// Gets the teletext pagenumber for the red button
+ /// </summary>
+ /// <returns>Teletext pagenumber for the red button</returns>
+ int GetTeletextRedPageNumber();
+
+ /// <summary>
+ /// Gets the teletext pagenumber for the green button
+ /// </summary>
+ /// <returns>Teletext pagenumber for the green button</returns>
+ int GetTeletextGreenPageNumber();
+
+ /// <summary>
+ /// Gets the teletext pagenumber for the yellow button
+ /// </summary>
+ /// <returns>Teletext pagenumber for the yellow button</returns>
+ int GetTeletextYellowPageNumber();
+
+ /// <summary>
+ /// Gets the teletext pagenumber for the blue button
+ /// </summary>
+ /// <returns>Teletext pagenumber for the blue button</returns>
+ int GetTeletextBluePageNumber();
+
+ /// <summary>f
+ /// Returns the rotation time for a specific teletext page
+ /// </summary>
+ /// <param name="pageNumber">The pagenumber (0x100-0x899)</param>
+ /// <returns>timespan containing the rotation time</returns>
+ TimeSpan TeletextRotation(int pageNumber);
+
+ /// <summary>
+ /// Indicates, if the user is the owner of the card
+ /// </summary>
+ /// <returns>true/false</returns>
+ bool IsOwner();
+
+ /// <summary>
+ /// Indicates, if the card supports quality control
+ /// </summary>
+ /// <returns>true/false</returns>
+ bool SupportsQualityControl();
+
+ /// <summary>
+ /// Indicates, if the card supports bit rates
+ /// </summary>
+ /// <returns>true/false</returns>
+ bool SupportsBitRate();
+
+ /// <summary>
+ /// Indicates, if the card supports bit rate modes
+ /// </summary>
+ /// <returns>true/false</returns>
+ bool SupportsBitRateModes();
+
+ /// <summary>
+ /// Indicates, if the card supports bit rate peak mode
+ /// </summary>
+ /// <returns>true/false</returns>
+ bool SupportsPeakBitRateMode();
+
+ /// <summary>
+ /// Indicates, if the card supports CI Menu
+ /// </summary>
+ /// <returns>true/false</returns>
+ bool CiMenuSupported();
+
+ /// <summary>
+ /// Enters the CI Menu for current card
+ /// </summary>
+ /// <returns>true if successful</returns>
+ bool EnterCiMenu();
+
+ /// <summary>
+ /// Selects a ci menu entry
+ /// </summary>
+ /// <param name="choice">Choice (1 based), 0 for "back"</param>
+ /// <returns>true if successful</returns>
+ bool SelectCiMenu(byte choice);
+
+ /// <summary>
+ /// Closes the CI Menu for current card
+ /// </summary>
+ /// <returns>true if successful</returns>
+ bool CloseMenu();
+
+ /// <summary>
+ /// Sends an answer to CAM after a request
+ /// </summary>
+ /// <param name="cancel">cancel request</param>
+ /// <param name="answer">answer string</param>
+ /// <returns>true if successful</returns>
+ bool SendMenuAnswer(bool cancel, string answer);
+
+ /// <summary>
+ /// Sets a callback handler
+ /// </summary>
+ /// <param name="callbackHandler"></param>
+ /// <returns></returns>
+ bool SetCiMenuHandler(ICiMenuCallbacks callbackHandler);
+ }
+}
\ No newline at end of file
Added: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/Properties/AssemblyInfo.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/Properties/AssemblyInfo.cs (rev 0)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/Properties/AssemblyInfo.cs 2011-11-25 20:23:04 UTC (rev 28324)
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("TvService.Interfaces")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("TvService.Interfaces")]
+[assembly: AssemblyCopyright("Copyright © 2011")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components. If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("ada7837a-0ca0-4a3d-a593-f3a8b0dab931")]
+
+// Version information for an assembly consists of the following four values:
+//
+// Major Version
+// Minor Version
+// Build Number
+// Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
Added: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/Properties/Resources.Designer.cs
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/Properties/Resources.Designer.cs (rev 0)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/Properties/Resources.Designer.cs 2011-11-25 20:23:04 UTC (rev 28324)
@@ -0,0 +1,63 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.239
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Mediaportal.TV.Server.TVService.Interfaces.Properties {
+ using System;
+
+
+ /// <summary>
+ /// A strongly-typed resource class, for looking up localized strings, etc.
+ /// </summary>
+ // This class was auto-generated by the StronglyTypedResourceBuilder
+ // 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", "4.0.0.0")]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ internal class Resources {
+
+ private static global::System.Resources.ResourceManager resourceMan;
+
+ private static global::System.Globalization.CultureInfo resourceCulture;
+
+ [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+ internal Resources() {
+ }
+
+ /// <summary>
+ /// Returns the cached ResourceManager instance used by this class.
+ /// </summary>
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Resources.ResourceManager ResourceManager {
+ get {
+ if (object.ReferenceEquals(resourceMan, null)) {
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Mediaportal.TV.Server.TVService.Interfaces.Properties.Resources", typeof(Resources).Assembly);
+ resourceMan = temp;
+ }
+ return resourceMan;
+ }
+ }
+
+ /// <summary>
+ /// Overrides the current thread's CurrentUICulture property for all
+ /// resource lookups using this strongly typed resource class.
+ /// </summary>
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Globalization.CultureInfo Culture {
+ get {
+ return resourceCulture;
+ }
+ set {
+ resourceCulture = value;
+ }
+ }
+ }
+}
Added: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/Properties/Resources.resx
===================================================================
--- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/Properties/Resources.resx (rev 0)
+++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService.Interfaces/Properties/Resources.resx 2011-11-25 20:23:04 UTC (rev 28324)
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Seria...
[truncated message content] |
|
From: <gib...@su...> - 2011-11-25 20:20:36
|
Author: gibman_dk Date: 2011-11-25 21:20:28 +0100 (Fri, 25 Nov 2011) New Revision: 28323 Added: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Services/TvControllerService.cs Log: adding services Added: branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Services/TvControllerService.cs =================================================================== --- branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Services/TvControllerService.cs (rev 0) +++ branches/TVEngine3-Experimental/Mediaportal/TV/Server/TvService/Services/TvControllerService.cs 2011-11-25 20:20:28 UTC (rev 28323) @@ -0,0 +1,1141 @@ +#region Copyright (C) 2005-2011 Team MediaPortal + +// Copyright (C) 2005-2011 Team MediaPortal +// http://www.team-mediaportal.com +// +// MediaPortal is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 2 of the License, or +// (at your option) any later version. +// +// MediaPortal is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>. + +#endregion + +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.IO; +using System.Linq; +using System.Net; +using System.Net.Sockets; +using System.Reflection; +using System.ServiceModel; +using System.Threading; +using System.Xml; +using MediaPortal.Common.Utils; +using Mediaportal.TV.Server.Plugins.Base.Events; +using Mediaportal.TV.Server.TVControl; +using Mediaportal.TV.Server.TVControl.Interfaces; +using Mediaportal.TV.Server.TVDatabase.Entities; +using Mediaportal.TV.Server.TVDatabase.Entities.Enums; +using Mediaportal.TV.Server.TVDatabase.TVBusinessLayer; +using Mediaportal.TV.Server.TVLibrary.Implementations; +using Mediaportal.TV.Server.TVLibrary.Implementations.Analog.Graphs.Analog; +using Mediaportal.TV.Server.TVLibrary.Implementations.Hybrid; +using Mediaportal.TV.Server.TVLibrary.Interfaces; +using Mediaportal.TV.Server.TVLibrary.Interfaces.Epg; +using Mediaportal.TV.Server.TVLibrary.Interfaces.Interfaces; +using Mediaportal.TV.Server.TVLibrary.Interfaces.Logging; +using Mediaportal.TV.Server.TVLibrary.Streaming; +using Mediaportal.TV.Server.TVService.CardManagement.CardAllocation; +using Mediaportal.TV.Server.TVService.CardManagement.CardHandler; +using Mediaportal.TV.Server.TVService.CardManagement.CardReservation; +using Mediaportal.TV.Server.TVService.CardManagement.CardReservation.Implementations; +using Mediaportal.TV.Server.TVService.DiskManagement; +using Mediaportal.TV.Server.TVService.Epg; +using Mediaportal.TV.Server.TVService.Interfaces; +using Mediaportal.TV.Server.TVService.Interfaces.CardHandler; +using Mediaportal.TV.Server.TVService.Interfaces.CardReservation; +using Mediaportal.TV.Server.TVService.Interfaces.Enums; +using Mediaportal.TV.Server.TVService.Interfaces.Services; +using Mediaportal.TV.Server.TVService.Scheduler; +using Mediaportal.TV.Server.TVService.TCPEventServer; +using RecordingManagement = Mediaportal.TV.Server.TVDatabase.TVBusinessLayer.RecordingManagement; + +namespace Mediaportal.TV.Server.TVService.Services +{ + /// <summary> + /// This class servers all requests from remote clients + /// </summary> + public class TvControllerService : IControllerService + { + private readonly IInternalControllerService _service; + public TvControllerService () + { + _service = GlobalServiceProvider.Get<IInternalControllerService>(); + } + + #region Implementation of IControllerService + + /// <summary> + /// Gets the assembly of tvservice.exe + /// </summary> + /// <value>Returns the AssemblyVersion of tvservice.exe</value> + public string GetAssemblyVersion + { + get + { + return _service.GetAssemblyVersion; + } + } + + ///<summary> + ///Gets the total number of tv-cards installed. + ///</summary> + ///<value>Number which indicates the cards installed</value> + public int Cards + { + get { return _service.Cards; } + } + + /// <summary> + /// Initialized Conditional Access handler + /// </summary> + /// <param name="cardId">id of the card.</param> + /// <returns>true if successful</returns> + public bool InitConditionalAccess(int cardId) + { + return _service.InitConditionalAccess(cardId); + } + + /// <summary> + /// Gets the type of card (analog,dvbc,dvbs,dvbt,atsc) + /// </summary> + /// <param name="cardId">id of the card.</param> + /// <value>cardtype</value> + public CardType Type(int cardId) + { + return _service.Type(cardId); + } + + /// <summary> + /// Gets the name for a card. + /// </summary> + /// <param name="cardId">id of the card.</param> + /// <returns>name of card</returns> + public string CardName(int cardId) + { + return _service.CardName(cardId); + } + + /// <summary> + /// Method to check if card can tune to the channel specified + /// </summary> + /// <returns>true if card can tune to the channel otherwise false</returns> + public bool CanTune(int cardId, IChannel channel) + { + return _service.CanTune(cardId, channel); + } + + /// <summary> + /// Method to check if card is currently present and detected + /// </summary> + /// <returns>true if card is present otherwise false</returns> + public bool CardPresent(int cardId) + { + return _service.CardPresent(cardId); + } + + /// <summary> + /// Method to remove a non-present card from the local card collection + /// </summary> + /// <returns>true if card is present otherwise false</returns> + public void CardRemove(int cardId) + { + _service.CardRemove(cardId); + } + + /// <summary> + /// Gets the device path for a card. + /// </summary> + /// <param name="cardId">id of the card.</param> + /// <returns>devicePath of card</returns> + public string CardDevice(int cardId) + { + return _service.CardDevice(cardId); + } + + /// <summary> + /// Returns if the tuner is locked onto a signal or not + /// </summary> + /// <param name="cardId">id of the card.</param> + /// <returns>true when tuner is locked to a signal otherwise false</returns> + public bool TunerLocked(int cardId) + { + return _service.TunerLocked(cardId); + } + + /// <summary> + /// Returns the signal quality for a card + /// </summary> + /// <param name="cardId">id of the card.</param> + /// <returns>signal quality (0-100)</returns> + public int SignalQuality(int cardId) + { + return _service.SignalQuality(cardId); + } + + /// <summary> + /// Returns the signal level for a card. + /// </summary> + /// <param name="cardId">id of the card.</param> + /// <returns>signal level (0-100)</returns> + public int SignalLevel(int cardId) + { + return _service.SignalLevel(cardId); + } + + /// <summary> + /// Updates the signal state for a card. + /// </summary> + /// <param name="cardId">id of the card.</param> + public void UpdateSignalSate(int cardId) + { + _service.UpdateSignalSate(cardId); + } + + /// <summary> + /// Returns if the card is currently scanning for channels or not + /// </summary> + /// <param name="cardId">id of the card.</param> + /// <returns>true when card is scanning otherwise false</returns> + public bool IsScanning(int cardId) + { + return _service.IsScanning(cardId); + } + + /// <summary> + /// Returns if the card is currently grabbing the epg or not + /// </summary> + /// <param name="cardId">id of the card.</param> + /// <returns>true when card is grabbing the epg otherwise false</returns> + public bool IsGrabbingEpg(int cardId) + { + return _service.IsGrabbingEpg(cardId); + } + + /// <summary> + /// scans current transponder for channels. + /// </summary> + /// <param name="cardId">id of the card.</param> + /// <param name="channel">contains tuningdetails for the transponder.</param> + /// <returns>list of all channels found</returns> + public IChannel[] Scan(int cardId, IChannel channel) + { + return _service.Scan(cardId, channel); + } + + /// <summary> + /// scans nit the current transponder for channels + /// </summary> + /// <param name="cardId">id of the card.</param> + /// <param name="channel">contains tuningdetails for the transponder.</param> + /// <returns>list of all channels found</returns> + public IChannel[] ScanNIT(int cardId, IChannel channel) + { + return _service.ScanNIT(cardId, channel); + } + + /// <summary> + /// returns the minium channel numbers for analog cards + /// </summary> + /// <param name="cardId">id of the card.</param> + /// <returns>minium channel number</returns> + public int MinChannel(int cardId) + { + return _service.MinChannel(cardId); + } + + /// <summary> + /// returns the maximum channel numbers for analog cards + /// </summary> + /// <param name="cardId">id of the card.</param> + /// <returns>maximum channel number</returns> + public int MaxChannel(int cardId) + { + return _service.MaxChannel(cardId); + } + + /// <summary> + /// returns which schedule the card specified is currently recording + /// </summary> + /// <param name="cardId">card id</param> + /// <param name="channelId">channel id</param> + /// <returns>id of Schedule or -1 if card not recording</returns> + public int GetRecordingSchedule(int cardId, int channelId) + { + return _service.GetRecordingSchedule(cardId, channelId); + } + + /// <summary> + /// Returns the URL for the RTSP stream on which the client can find the + /// stream for recording + /// </summary> + /// <param name="idRecording">id of recording</param> + /// <returns>URL containing the RTSP adress on which the recording can be found</returns> + public string GetRecordingUrl(int idRecording) + { + return _service.GetRecordingUrl(idRecording); + } + + /// <summary> + /// Returns the contents of the chapters file (if any) for a recording + /// </summary> + /// <param name="idRecording">id of recording</param> + /// <returns>The contents of the chapters file of the recording</returns> + public string GetRecordingChapters(int idRecording) + { + return _service.GetRecordingChapters(idRecording); + } + + /// <summary> + /// Deletes the recording from database and disk + /// </summary> + /// <param name="idRecording">The id recording.</param> + public bool DeleteRecording(int idRecording) + { + return _service.DeleteRecording(idRecording); + } + + /// <summary> + /// Deletes invalid recordings from database. A recording is invalid if the corresponding file no longer exists. + /// </summary> + public bool DeleteInvalidRecordings() + { + return _service.DeleteInvalidRecordings(); + } + + /// <summary> + /// Deletes watched recordings from database. + /// </summary> + public bool DeleteWatchedRecordings(string currentTitle) + { + return _service.DeleteWatchedRecordings(currentTitle); + } + + /// <summary> + /// Checks if the schedule specified is currently being recorded and ifso + /// returns on which card + /// </summary> + /// <param name="idSchedule">id of the Schedule</param> + /// <param name="card">returns card is recording the channel</param> + /// <returns>true if a card is recording the schedule, otherwise false</returns> + public bool IsRecordingSchedule(int idSchedule, out IVirtualCard card) + { + return _service.IsRecordingSchedule(idSchedule, out card); + } + + /// <summary> + /// Determines whether the specified channel name is recording. + /// </summary> + /// <param name="idChannel"></param> + /// <param name="card">The vcard.</param> + /// <returns> + /// <c>true</c> if the specified channel name is recording; otherwise, <c>false</c>. + /// </returns> + public bool IsRecording(int idChannel, out IVirtualCard card) + { + return _service.IsRecording(idChannel, out card); + } + + /// <summary> + /// Determines if any card is currently busy recording + /// </summary> + /// <returns> + /// <c>true</c> if a card is recording; otherwise, <c>false</c>. + /// </returns> + public bool IsAnyCardRecording() + { + return _service.IsAnyCardRecording(); + } + + /// <summary> + /// Determines if any card is currently busy recording or timeshifting + /// </summary> + /// <param name="userTS">timeshifting user</param> + /// <param name="isUserTS">true if the specified user is timeshifting</param> + /// <param name="isAnyUserTS">true if any user (except for the userTS) is timeshifting</param> + /// <param name="isRec">true if recording</param> + /// <returns> + /// <c>true</c> if a card is recording or timeshifting; otherwise, <c>false</c>. + /// </returns> + public bool IsAnyCardRecordingOrTimeshifting(IUser userTS, out bool isUserTS, out bool isAnyUserTS, out bool isRec) + { + return _service.IsAnyCardRecordingOrTimeshifting(userTS, out isUserTS, out isAnyUserTS, out isRec); + } + + /// <summary> + /// Stops recording the Schedule specified + /// </summary> + /// <param name="idSchedule">id of the Schedule</param> + /// <returns></returns> + public void StopRecordingSchedule(int idSchedule) + { + _service.StopRecordingSchedule(idSchedule); + } + + /// <summary> + /// This method should be called by a client to indicate that + /// there is a new or modified Schedule in the database + /// </summary> + public void OnNewSchedule() + { + _service.OnNewSchedule(); + } + + /// <summary> + /// Enable or disable the epg-grabber + /// </summary> + public bool EpgGrabberEnabled + { + get { return _service.EpgGrabberEnabled; } + set { _service.EpgGrabberEnabled = value; } + } + + /// <summary> + /// Restarts the service. + /// </summary> + public void Restart() + { + _service.Restart(); + } + + /// <summary> + /// Determines whether the card is in use + /// </summary> + /// <param name="cardId">The card id.</param> + /// <param name="user">The user who uses the card.</param> + /// <returns> + /// <c>true</c> if card is in use; otherwise, <c>false</c>. + /// </returns> + public bool IsCardInUse(int cardId, out IUser user) + { + return _service.IsCardInUse(cardId, out user); + } + + /// <summary> + /// Fetches all channel states for a specific user (cached - faster) + /// </summary> + /// <param name="user"></param> + public Dictionary<int, ChannelState> GetAllChannelStatesCached(IUser user) + { + return _service.GetAllChannelStatesCached(user); + } + + /// <summary> + /// Finds out whether a channel is currently tuneable or not + /// </summary> + /// <param name="idChannel">The channel id</param> + /// <param name="user">User</param> + /// <returns>an enum indicating tunable/timeshifting/recording</returns> + public ChannelState GetChannelState(int idChannel, IUser user) + { + return _service.GetChannelState(idChannel, user); + } + + /// <summary> + /// Returns a list of all ip adresses on the server. + /// </summary> + /// <value>The server ip adresses.</value> + public IEnumerable<string> ServerIpAdresses + { + get { return _service.ServerIpAdresses; } + } + + /// <summary> + /// Returns the port used for RTSP streaming. + /// If streaming is not initialized, returns 0. + /// </summary> + /// <value>The streaming port</value> + public int StreamingPort + { + get { return _service.StreamingPort; } + } + + /// <summary> + /// Gets a list of all streaming clients. + /// </summary> + /// <value>The streaming clients.</value> + public List<RtspClient> StreamingClients + { + get { return _service.StreamingClients; } + } + + /// <summary> + /// Reset DiSEqC for the given card + /// </summary> + /// <param name="cardId">card id</param> + public void DiSEqCReset(int cardId) + { + _service.DiSEqCReset(cardId); + } + + /// <summary> + /// Stops the DiSEqC motor for the given card + /// </summary> + /// <param name="cardId">card id</param> + public void DiSEqCStopMotor(int cardId) + { + _service.DiSEqCStopMotor(cardId); + } + + /// <summary> + /// Sets the DiSEqC east limit for the given card + /// </summary> + /// <param name="cardId">card id</param> + public void DiSEqCSetEastLimit(int cardId) + { + _service.DiSEqCSetEastLimit(cardId); + } + + /// <summary> + /// Sets the DiSEqC west limit for the given card + /// </summary> + /// <param name="cardId">card id</param> + public void DiSEqCSetWestLimit(int cardId) + { + _service.DiSEqCSetWestLimit(cardId); + } + + /// <summary> + /// DiSEqC force limit for the given card + /// </summary> + /// <param name="cardId">card id</param> + /// <param name="onoff">on/off</param> + public void DiSEqCForceLimit(int cardId, bool onoff) + { + _service.DiSEqCForceLimit(cardId, onoff); + } + + /// <summary> + /// Moves the DiSEqC motor for the given card + /// </summary> + /// <param name="cardId">card id</param> + /// <param name="direction">direction</param> + /// <param name="numberOfSteps">Number of steps</param> + public void DiSEqCDriveMotor(int cardId, DiSEqCDirection direction, byte numberOfSteps) + { + _service.DiSEqCDriveMotor(cardId, direction, numberOfSteps); + } + + /// <summary> + /// Stores the current DiSEqC position for the given card + /// </summary> + /// <param name="cardId">card id</param> + /// <param name="position">position</param> + public void DiSEqCStorePosition(int cardId, byte position) + { + _service.DiSEqCStorePosition(cardId, position); + } + + /// <summary> + /// DiSEqC move to the reference position for the given card + /// </summary> + /// <param name="cardId">card id</param> + public void DiSEqCGotoReferencePosition(int cardId) + { + _service.DiSEqCGotoReferencePosition(cardId); + } + + /// <summary> + /// Go to the DiSEqC position for the given card + /// </summary> + /// <param name="cardId">card id</param> + /// <param name="position">position</param> + public void DiSEqCGotoPosition(int cardId, byte position) + { + _service.DiSEqCGotoPosition(cardId, position); + } + + /// <summary> + /// Gets the DiSEqC position for the given card + /// </summary> + /// <param name="cardId">card id</param> + /// <param name="satellitePosition">satellite position</param> + /// <param name="stepsAzimuth">azimuth</param> + /// <param name="stepsElevation">elvation</param> + public void DiSEqCGetPosition(int cardId, out int satellitePosition, out int stepsAzimuth, out int stepsElevation) + { + _service.DiSEqCGetPosition(cardId, out satellitePosition, out stepsAzimuth, out stepsElevation); + } + + /// <summary> + /// Returns the subchannels count for the selected card + /// stream for the selected card + /// </summary> + /// <param name="idCard">card id.</param> + /// <returns> + /// subchannels count + /// </returns> + public int GetSubChannels(int idCard) + { + return _service.GetSubChannels(idCard); + } + + /// <summary> + /// Returns the URL for the RTSP stream on which the client can find the + /// stream for the selected card + /// </summary> + /// <param name="user">The user.</param> + /// <returns> + /// URL containing the RTSP adress on which the card transmits its stream + /// </returns> + public string GetStreamingUrl(IUser user) + { + return _service.GetStreamingUrl(user); + } + + /// <summary> + /// Returns the current filename used for recording + /// </summary> + /// <param name="user">The user.</param> + /// <returns> + /// filename of the recording or null when not recording + /// </returns> + public string RecordingFileName(ref IUser user) + { + return _service.RecordingFileName(ref user); + } + + /// <summary> + /// Gets the tv/radio channel on which the card is currently tuned + /// </summary> + /// <param name="user">The user.</param> + /// <returns>IChannel</returns> + public IChannel CurrentChannel(ref IUser user) + { + return _service.CurrentChannel(ref user); + } + + /// <summary> + /// returns the id of the current channel. + /// </summary> + /// <param name="user">The user.</param> + /// <returns></returns> + public int CurrentDbChannel(ref IUser user) + { + return _service.CurrentDbChannel(ref user); + } + + /// <summary> + /// Gets the name of the tv/radio channel on which the card is currently tuned + /// </summary> + /// <param name="user">The user.</param> + /// <returns>channel name</returns> + public string CurrentChannelName(ref IUser user) + { + return _service.CurrentChannelName(ref user); + } + + /// <summary> + /// Returns whether the channel to which the card is tuned is + /// scrambled or not. + /// </summary> + /// <param name="user">The user.</param> + /// <returns> + /// yes if channel is scrambled and CI/CAM cannot decode it, otherwise false + /// </returns> + public bool IsScrambled(ref IUser user) + { + return _service.IsScrambled(ref user); + } + + /// <summary> + /// Returns the current filename used for timeshifting + /// </summary> + /// <param name="user">The user.</param> + /// <returns> + /// timeshifting filename null when not timeshifting + /// </returns> + public string TimeShiftFileName(ref IUser user) + { + return _service.TimeShiftFileName(ref user); + } + + /// <summary> + /// Returns the position in the current timeshift file and the id of the current timeshift file + /// </summary> + /// <param name="user">The user.</param> + /// <param name="position">The position in the current timeshift buffer file</param> + /// <param name="bufferId">The id of the current timeshift buffer file</param> + public bool TimeShiftGetCurrentFilePosition(ref IUser user, ref long position, ref long bufferId) + { + return _service.TimeShiftGetCurrentFilePosition(ref user, ref position, ref bufferId); + } + + /// <summary> + /// Returns if the card is currently timeshifting or not + /// </summary> + /// <param name="user">The user.</param> + /// <returns>true when card is timeshifting otherwise false</returns> + public bool IsTimeShifting(ref IUser user) + { + return _service.IsTimeShifting(ref user); + } + + /// <summary> + /// Returns the rotation time for a specific teletext page + /// </summary> + /// <param name="user">The user.</param> + /// <param name="pageNumber">The pagenumber (0x100-0x899)</param> + /// <returns>timespan containing the rotation time</returns> + public TimeSpan TeletextRotation(IUser user, int pageNumber) + { + return _service.TeletextRotation(user, pageNumber); + } + + /// <summary> + /// Returns if the channel to which the card is currently tuned + /// has teletext or not + /// </summary> + /// <param name="user">The user.</param> + /// <returns> + /// yes if channel has teletext otherwise false + /// </returns> + public bool HasTeletext(IUser user) + { + return _service.HasTeletext(user); + } + + /// <summary> + /// turn on/off teletext grabbing for a card + /// </summary> + /// <param name="user">The user.</param> + /// <param name="onOff">boolean indicating if teletext grabbing should be enabled or not</param> + public void GrabTeletext(IUser user, bool onOff) + { + _service.GrabTeletext(user, onOff); + } + + /// <summary> + /// Gets a raw teletext page. + /// </summary> + /// <param name="user">The user.</param> + /// <param name="pageNumber">The page number. (0x100-0x899)</param> + /// <param name="subPageNumber">The sub page number.(0x0-0x79)</param> + /// <returns> + /// byte[] array containing the raw teletext page or null if page is not found + /// </returns> + public byte[] GetTeletextPage(IUser user, int pageNumber, int subPageNumber) + { + return _service.GetTeletextPage(user, pageNumber, subPageNumber); + } + + /// <summary> + /// Gets the number of subpages for a teletext page. + /// </summary> + /// <param name="user">The user.</param> + /// <param name="pageNumber">The page number (0x100-0x899)</param> + /// <returns> + /// number of teletext subpages for the pagenumber + /// </returns> + public int SubPageCount(IUser user, int pageNumber) + { + return _service.SubPageCount(user, pageNumber); + } + + /// <summary> + /// Gets the teletext pagenumber for the red button + /// </summary> + /// <param name="user">The user.</param> + /// <returns>Teletext pagenumber for the red button</returns> + public int GetTeletextRedPageNumber(IUser user) + { + return _service.GetTeletextRedPageNumber(user); + } + + /// <summary> + /// Gets the teletext pagenumber for the green button + /// </summary> + /// <param name="user">The user.</param> + /// <returns>Teletext pagenumber for the green button</returns> + public int GetTeletextGreenPageNumber(IUser user) + { + return _service.GetTeletextGreenPageNumber(user); + } + + /// <summary> + /// Gets the teletext pagenumber for the yellow button + /// </summary> + /// <param name="user">The user.</param> + /// <returns>Teletext pagenumber for the yellow button</returns> + public int GetTeletextYellowPageNumber(IUser user) + { + return _service.GetTeletextYellowPageNumber(user); + } + + /// <summary> + /// Gets the teletext pagenumber for the blue button + /// </summary> + /// <param name="user">The user.</param> + /// <returns>Teletext pagenumber for the blue button</returns> + public int GetTeletextBluePageNumber(IUser user) + { + return _service.GetTeletextBluePageNumber(user); + } + + /// <summary> + /// + /// </summary> + /// <param name="position1"></param> + /// <param name="bufferFile1"></param> + /// <param name="position2"></param> + /// <param name="bufferFile2"></param> + /// <param name="recordingFile"></param> + public void CopyTimeShiftFile(long position1, string bufferFile1, long position2, string bufferFile2, string recordingFile) + { + _service.CopyTimeShiftFile(position1, bufferFile1, position2, bufferFile2, recordingFile); + } + + /// <summary> + /// returns the list of available audio streams for the card specified + /// </summary> + /// <param name="user">The user.</param> + /// <returns>List containing all audio streams</returns> + public IEnumerable<IAudioStream> AvailableAudioStreams(IUser user) + { + return _service.AvailableAudioStreams(user); + } + + /// <summary> + /// returns the current video stream on the virtual card. + /// </summary> + /// <param name="user">The user.</param> + /// <returns>List containing all audio streams</returns> + public IVideoStream GetCurrentVideoStream(IUser user) + { + return _service.GetCurrentVideoStream(user); + } + + /// <summary> + /// Stops the card. + /// </summary> + /// <param name="user">The user.</param> + public void StopCard(IUser user) + { + _service.StopCard(user); + } + + /// <summary> + /// Query what card would be used for timeshifting on any given channel + /// </summary> + /// <param name="user">user credentials.</param> + /// <param name="idChannel">The id channel.</param> + /// <returns> + /// returns card id which would be used when doing the actual timeshifting. + /// </returns> + public int TimeShiftingWouldUseCard(ref IUser user, int idChannel) + { + return _service.TimeShiftingWouldUseCard(ref user, idChannel); + } + + /// <summary> + /// Start timeshifting on a specific channel + /// </summary> + /// <param name="user">user credentials.</param> + /// <param name="idChannel">The id channel.</param> + /// <param name="card">returns on which card timeshifting is started</param> + /// <param name="forceCardId">Indicated, if the card should be forced</param> + /// <returns> + /// TvResult indicating whether method succeeded + /// </returns> + public TvResult StartTimeShifting(ref IUser user, int idChannel, out IVirtualCard card, bool forceCardId) + { + return _service.StartTimeShifting(ref user, idChannel, out card, forceCardId); + } + + /// <summary> + /// Start timeshifting on a specific channel + /// </summary> + /// <param name="user">user credentials.</param> + /// <param name="idChannel">The id channel.</param> + /// <param name="card">returns on which card timeshifting is started</param> + /// <param name="cardChanged">indicates if card was changed</param> + /// <returns> + /// TvResult indicating whether method succeeded + /// </returns> + public TvResult StartTimeShifting(ref IUser user, int idChannel, out IVirtualCard card, out bool cardChanged) + { + return _service.StartTimeShifting(ref user, idChannel, out card, out cardChanged); + } + + /// <summary> + /// Start timeshifting on a specific channel + /// </summary> + /// <param name="user">user credentials.</param> + /// <param name="idChannel">The id channel.</param> + /// <param name="card">returns on which card timeshifting is started</param> + /// <returns> + /// TvResult indicating whether method succeeded + /// </returns> + public TvResult StartTimeShifting(ref IUser user, int idChannel, out IVirtualCard card) + { + return _service.StartTimeShifting(ref user, idChannel, out card); + } + + /// <summary> + /// Stops the time shifting. + /// </summary> + /// <param name="user">user credentials.</param> + /// <param name="reason">reason why timeshifting is stopped.</param> + /// <returns>true if success otherwise false</returns> + public bool StopTimeShifting(ref IUser user, TvStoppedReason reason) + { + return _service.StopTimeShifting(ref user, reason); + } + + /// <summary> + /// Stops the time shifting. + /// </summary> + /// <param name="user">user credentials.</param> + /// <returns>true if success otherwise false</returns> + public bool StopTimeShifting(ref IUser user) + { + return _service.StopTimeShifting(ref user); + } + + /// <summary> + /// Starts recording. + /// </summary> + /// <param name="user">The user.</param> + /// <param name="fileName">Name of the recording file.</param> + /// <returns>true if success otherwise false</returns> + public TvResult StartRecording(ref IUser user, ref string fileName) + { + return _service.StartRecording(ref user, ref fileName); + } + + /// <summary> + /// Stops recording. + /// </summary> + /// <param name="user">The user.</param> + /// <returns>true if success otherwise false</returns> + public bool StopRecording(ref IUser user) + { + return _service.StopRecording(ref user); + } + + /// <summary> + /// Scan the specified card to the channel. + /// </summary> + /// <param name="user">The user.</param> + /// <param name="channel">The channel.</param> + /// <param name="idChannel">The id channel.</param> + /// <returns>true if succeeded</returns> + public TvResult Scan(ref IUser user, IChannel channel, int idChannel) + { + return _service.Scan(ref user, channel, idChannel); + } + + /// <summary> + /// Tunes the the specified card to the channel. + /// </summary> + /// <param name="user">The user.</param> + /// <param name="channel">The channel.</param> + /// <param name="idChannel">The id channel.</param> + /// <returns>true if succeeded</returns> + public TvResult Tune(ref IUser user, IChannel channel, int idChannel) + { + return _service.Tune(ref user, channel, idChannel); + } + + /// <summary> + /// Gets the users for card. + /// </summary> + /// <param name="cardId">The card id.</param> + /// <returns></returns> + public IUser[] GetUsersForCard(int cardId) + { + return _service.GetUsersForCard(cardId); + } + + /// <summary> + /// Determines whether the the user is the owner of the card + /// </summary> + /// <param name="cardId">The card id.</param> + /// <param name="user">The user.</param> + /// <returns> + /// <c>true</c> if the specified user is the card owner; otherwise, <c>false</c>. + /// </returns> + public bool IsOwner(int cardId, IUser user) + { + return _service.IsOwner(cardId, user); + } + + /// <summary> + /// Indicates if bit rate modes are supported + /// </summary> + /// <param name="cardId">Unique id of the card</param> + /// <returns>true/false</returns> + public bool SupportsQualityControl(int cardId) + { + return _service.SupportsQualityControl(cardId); + } + + /// <summary> + /// Indicates if bit rate modes are supported + /// </summary> + /// <param name="cardId">Unique id of the card</param> + /// <returns>true/false</returns> + public bool SupportsBitRateModes(int cardId) + { + return _service.SupportsBitRateModes(cardId); + } + + /// <summary> + /// Indicates if peak bit rate mode is supported + /// </summary> + /// <param name="cardId">Unique id of the card</param> + /// <returns>true/false</returns> + public bool SupportsPeakBitRateMode(int cardId) + { + return _service.SupportsPeakBitRateMode(cardId); + } + + /// <summary> + /// Indicates if bit rate control is supported + /// </summary> + /// <param name="cardId">Unique id of the card</param> + /// <returns>true/false</returns> + public bool SupportsBitRate(int cardId) + { + return _service.SupportsBitRate(cardId); + } + + /// <summary> + /// Reloads the configuration for the given card + /// </summary> + /// <param name="cardId">Unique id of the card</param> + public void ReloadCardConfiguration(int cardId) + { + _service.ReloadCardConfiguration(cardId); + } + + /// <summary> + /// Gets the current quality type + /// </summary> + /// <param name="cardId">Unique id of the card</param> + /// <returns>QualityType</returns> + public QualityType GetQualityType(int cardId) + { + return _service.GetQualityType(cardId); + } + + /// <summary> + /// Sets the quality type + /// </summary> + /// <param name="cardId">Unique id of the card</param> + /// <param name="qualityType">The new quality type</param> + public void SetQualityType(int cardId, QualityType qualityType) + { + _service.SetQualityType(cardId, qualityType); + } + + /// <summary> + /// Gets the current bitrate mdoe + /// </summary> + /// <param name="cardId">Unique id of the card</param> + /// <returns>QualityType</returns> + public VIDEOENCODER_BITRATE_MODE GetBitRateMode(int cardId) + { + return _service.GetBitRateMode(cardId); + } + + /// <summary> + /// Sets the bitrate mode + /// </summary> + /// <param name="cardId">Unique id of the card</param> + /// <param name="bitRateMode">The new bitrate mdoe</param> + public void SetBitRateMode(int cardId, VIDEOENCODER_BITRATE_MODE bitRateMode) + { + _service.SetBitRateMode(cardId, bitRateMode); + } + + /// <summary> + /// Indicates if CI Menu is supported + /// </summary> + /// <param name="cardId">Unique id of the card</param> + /// <returns>true/false</returns> + public bool CiMenuSupported(int cardId) + { + return _service.CiMenuSupported(cardId); + } + + /// <summary> + /// Enters the ci menu of card + /// </summary> + /// <param name="cardId">card</param> + /// <returns>true if successful</returns> + public bool EnterCiMenu(int cardId) + { + return _service.EnterCiMenu(cardId); + } + + /// <summary> + /// Selects a ci menu option + /// </summary> + /// <param name="cardId">card</param> + /// <param name="choice">choice</param> + /// <returns>true if successful</returns> + public bool SelectMenu(int cardId, byte choice) + { + return _service.SelectMenu(cardId, choice); + } + + /// <summary> + /// CloseMenu closes the menu + /// </summary> + /// <param name="cardId">card</param> + /// <returns>true if successful</returns> + public bool CloseMenu(int cardId) + { + return _service.CloseMenu(cardId); + } + + /// <summary> + /// Sends a answer to cam after a request + /// </summary> + /// <param name="cardId">card</param> + /// <param name="cancel">cancel request</param> + /// <param name="answer">answer string</param> + /// <returns></returns> + public bool SendMenuAnswer(int cardId, bool cancel, string answer) + { + return _service.SendMenuAnswer(cardId, cancel, answer); + } + + /// <summary> + /// Registers a ci menu callback handler for user interaction + /// </summary> + /// <param name="cardId"></param> + /// <param name="callbackHandler"></param> + /// <returns></returns> + public bool SetCiMenuHandler(int cardId, ICiMenuCallbacks callbackHandler) + { + return _service.SetCiMenuHandler(cardId, callbackHandler); + } + + public event CiMenuCallback OnCiMenu; + + /// <summary> + /// Fetches the stream quality information + /// </summary> + /// <param name="user">user</param> + /// <param name="totalTSpackets">Amount of packets processed</param> + /// <param name="discontinuityCounter">Number of stream discontinuities</param> + /// <returns></returns> + public void GetStreamQualityCounters(IUser user, out int totalTSpackets, out int discontinuityCounter) + { + _service.GetStreamQualityCounters(user, out totalTSpackets, out discontinuityCounter); + } + + #endregion + } +} \ No newline at end of file |