--- trunk/libxmltv/Core/XMLTVRuntimeInstance.cs 2013/03/10 15:37:16 111 +++ trunk/libxmltv/Core/XMLTVRuntimeInstance.cs 2013/03/16 13:26:09 167 @@ -10,6 +10,8 @@ using System.Globalization; using System.Diagnostics; using System.Xml.Linq; +using Enterprise.Logging; +using System.IO; namespace libxmltv.Core { @@ -49,13 +51,13 @@ private void init() { this.Source = new XMLTVSource(); - this.Channels = new List(); - this.Programs = new List(); + this.Channels = new ChannelList(); + this.Programs = new ProgramList(); this.XmlFile_Name = string.Empty; this.XmlFile_FullName = string.Empty; this.XmlDoc = string.Empty; this.OnInstanceCreated = null; - this.ExtraEntries = new List(); + this.ExtraEntries = new ExtraList(); } #region IXMLTVRuntimeInstance members @@ -72,13 +74,13 @@ public string XmlDoc { get { return _XmlDoc; } set { _XmlDoc = value; } } private IXMLTVSource _Source; public IXMLTVSource Source { get { return _Source; } set { _Source = value; } } - private List _Channels; - public List Channels { get { return _Channels; } set { _Channels = value; } } - private List _Programs; - public List Programs { get { return _Programs; } set { _Programs = value; } } + private ChannelList _Channels; + public ChannelList Channels { get { return _Channels; } set { _Channels = value; } } + private ProgramList _Programs; + public ProgramList Programs { get { return _Programs; } set { _Programs = value; } } - private List _ExtraEntries; - public List ExtraEntries { get { return _ExtraEntries; } set { _ExtraEntries = value; } } + private ExtraList _ExtraEntries; + public ExtraList ExtraEntries { get { return _ExtraEntries; } set { _ExtraEntries = value; } } #endregion #region IOnInstanceCreated members [NonSerialized] @@ -310,7 +312,7 @@ if (!CreateHandlerForNode(node)) { xmltv_logger.Verbose.Debug.WriteLine("Unable to create handler for node: '{0}'", node.Name.ToString()); } node_index++; progress = 100.0 * (node_index / total_nodes); - xmltv_logger.ReportProgress(this, new Enterprise.Logging.ReportProgressEventArgs((int)progress)); + xmltv_logger.ReportProgress(this, new ReportProgressEventArgs((int)progress, string.Format("Loading {0} ==> {1:00}%", this.gInstance.XmlFile_Name, (int)progress))); Application.DoEvents(); } }