--- trunk/libxmltv/Core/XMLTVInstance.cs	2013/03/08 02:13:59	36
+++ trunk/libxmltv/Core/XMLTVInstance.cs	2013/03/08 04:01:25	46
@@ -3,13 +3,22 @@
 using System.Linq;
 using System.Text;
 using libxmltv.Interfaces;
+using System.ComponentModel;
 
 namespace libxmltv.Core
 {
     internal class XMLTVRuntimeInstance : MarshalByRefObject, IXMLTVRuntimeInstance
     {
-        public XMLTVRuntimeInstance(string xmlfile) { CreateInstance(xmlfile); }
-        private void CreateInstance(string xmlfile) { Instance = new XMLTVInstance(xmlfile, this); }
+        public XMLTVRuntimeInstance(string xmlfile) : this(xmlfile, null) { }
+        public XMLTVRuntimeInstance(string xmlfile, EventHandler<CancelEventArgs> t) { CreateInstance(xmlfile,t); }
+        private void CreateInstance(string xmlfile, EventHandler<CancelEventArgs> t)
+        {
+            CancelEvent = t;
+            using (Instance = new XMLTVInstance(xmlfile, this))
+            {
+            }
+        }
+
         internal XMLTVInstance Instance { get; private set; }
 
         #region IXMLTV_LOADER members
@@ -21,9 +30,39 @@
         public Dictionary<string, IXMLTVChannel> Channels { get; set; }
         public Dictionary<int, IXMLTVProgram> Programs { get; set; }
         #endregion   
+    
+        //public void Dispose()
+        //{
+        //    IsDisposing = true;
+        //    //throw new NotImplementedException();
+        //}
+        //public bool IsDisposing { get; private set; }
+
+
+        private event EventHandler<CancelEventArgs> CancelEvent = null;
+
+        public bool IsAborting
+        {
+            get
+            {
+                if (CancelEvent != null)
+                {
+                    CancelEventArgs e = new CancelEventArgs();
+                    CancelEvent.Invoke(this, e);
+                    if (e.Cancel)
+                    {
+                        xmltv_logger.Log.Verbose.Debug.WriteLine("Detected Instance abort event...");
+                    }
+                    return e.Cancel;
+                }
+                return false;
+            }
+        }
+
+
     }
 
-    internal class XMLTVInstance
+    internal class XMLTVInstance : IDisposable
     {
         public XMLTVInstance(string xmlfile, XMLTVRuntimeInstance instance) 
         { 
@@ -33,11 +72,18 @@
 
         private void CreateLoader(string xml_file, XMLTVRuntimeInstance instance)
         {
-            XMLTVLoader loader = new XMLTVLoader(xml_file, instance);
+            //XMLTVLoader loader = new XMLTVLoader(xml_file, instance);
+            XMLTVLoader.CreateInstance(xml_file, instance);
         }
         private void CreateParser(XMLTVRuntimeInstance instance)
         {
-            XMLTVParser parser = new XMLTVParser(instance);
+            //XMLTVParser parser = new XMLTVParser(instance);
+            XMLTVParser.CreateInstance(instance);
+        }
+
+        public void Dispose()
+        {
+            //throw new NotImplementedException();
         }
     }
 }