--- trunk/libxmltv/Interfaces/Interfaces.cs	2013/03/10 14:28:57	110
+++ trunk/libxmltv/Interfaces/Interfaces.cs	2013/05/18 02:45:35	256
@@ -23,43 +23,92 @@
     //    Dictionary<int, IXMLTVProgram> Programs { get; }
     //}
 
-    public interface IXMLTVSource
+    public interface IXMLTVSource : IDataSourceBindable
     {
         string SourceName { get; }
         string GeneratorName { get; }
         string GeneratorUrl { get; }
         string ToString();
     }
+
+    public interface IRawDataSource : IRawDataSource<object> { }
+    public interface IRawDataSource<T> {
+         [Browsable(false)]
+        T RawDataSource { get; } }
+    public interface IProgramDefinitionList : IList<IProgramDefinition>, IDataSourceSortable, IDataSourceFilterable { } //, IRawDataSource<IProgramDefinitionList> { }
+    public interface IChannelDefintionList : IList<IChannelDefintion>, IDataSourceSortable, IDataSourceFilterable { }//, IRawDataSource<IChannelDefintionList> { }
+
+
+    public interface IChannelDefintion : IEquatable<IChannelDefintion>, IRawDataSource<IXMLTVChannel>
+    {
+        string ChannelId { get; }
+        string ChannelName { get; }
+        string ToString();
+    }
+    public interface IProgramDefinition : IEquatable<IProgramDefinition>, IRawDataSource<IXMLTVProgram>
+    {
+        //string ChannelId { get;  }
+        int ChannelNumber { get; } // column index: 0
+        string ChannelName { get; }// column index: 1
+        string Start { get; }// column index: 2
+        string Stop { get; }// column index: 3
+        string Title { get; }// column index: 4
+        string SubTitle { get; }// column index: 5
+        string Description { get; }// column index: 6
+        string Rating { get; }// column index: 7
+        string ToString();
+    }
     public interface IXMLTVChannel
     {
         string Id { get; }
         //int Number { get; }
         //string CallSign { get; }
         //string Name { get; }    
-        PropertyList MetaData { get; }
+        IPropertyList MetaData { get; }
         string ToString();
     }
-    public interface IXMLTVProgram
+    public interface IXMLTVProgram 
     {
-        PropertyDictionary MetaData { get; }
+        IPropertyDictionary MetaData { get; }
+        List<IExtraMetaData> GetExtraMetaData();
     }
-    
+
     public interface IExtraMetaData : IExtraMetaData<string, string> { }
     public interface IExtraMetaData<TKey, TValue> : IPropertyValuePair<TKey, TValue> 
     {
         XElement AsXElement();
     }
-    public interface IXMLTVProgramCollection : IXMLTVDictionaryCollection<string, IXMLTVProgram> { }
-    public interface IXMLTVChannelCollection : IXMLTVDictionaryCollection<string, IXMLTVChannel> { }
-    public interface IXMLTVDictionaryCollection<TKey, TValue> { Dictionary<TKey, TValue> Collection { get; } }
-    public interface IXMLTVListCollection<TValue> { List<TValue> Collection { get; } }
 
-    public interface IXMLTVHandler : IXMLTVHandler<object> { }
-    public interface IXMLTVHandler<T> { T Handler { get; } }
+    //public interface IDataConverter { object ConvertObjectData(object source); }
+    //public interface IDataConverter<T>
+    //{
+    //    T ConvertData(object source);
+    //}
+    public interface IDataSourceBindable //: IDataConverter
+    {
+        object CreateBindableDataSource(out Type type);
+    }
+
+    public interface IDataSourceFilterable
+    {
+        void Filter(ref object source, params string[] args);
+    }
+    public interface IDataSourceSortable
+    {
+        void Sort(ref object source, bool descending, params string[] args);
+    }
+
+    internal interface IXMLTVProgramCollection : IXMLTVDictionaryCollection<string, IXMLTVProgram> { }
+    internal interface IXMLTVChannelCollection : IXMLTVDictionaryCollection<string, IXMLTVChannel> { }
+    internal interface IXMLTVDictionaryCollection<TKey, TValue> { Dictionary<TKey, TValue> Collection { get; } }
+    internal interface IXMLTVListCollection<TValue> { List<TValue> Collection { get; } }
+
+    internal interface IXMLTVHandler : IXMLTVHandler<object> { }
+    internal interface IXMLTVHandler<T> { T Handler { get; } }
 
     //public interface IXMLTVBase : IXMLTVBase<object> { }
-    public interface IXMLTVBase<T> : IGetInstance<T>, IXMLTVHandler { }
-    public interface IXMLTVRuntimeInstance : IOnInstanceCreated
+    internal interface IXMLTVBase<T> : IGetInstance<T>, IXMLTVHandler { }
+    internal interface IXMLTVRuntimeInstance : IOnInstanceCreated
     {
         bool IsAborting { get; } 
         //FileInfo XmlFile { get; }
@@ -67,47 +116,50 @@
         string XmlFile_FullName { get; }
         string XmlDoc { get; }
         IXMLTVSource Source { get; }
-        List<IXMLTVChannel> Channels { get; }
-        List<IXMLTVProgram> Programs { get; }
-        List<IExtraMetaData> ExtraEntries { get; }
+        ChannelList Channels { get; }
+        ProgramList Programs { get; }
+       ExtraList ExtraEntries { get; }
     }
-    public interface IXMLTVSerializer : IXMLTVSerializer<object> { }
-    public interface IXMLTVSerializer<T>
+    internal interface IXMLTVSerializer : IXMLTVSerializer<object> { }
+    internal interface IXMLTVSerializer<T>
     {
         bool Serialize(string file);
         bool Serialize(Stream stream);
         T DeSerialize(string file, out bool status);
         T DeSerialize(Stream stream, out bool status);
     }
-    public interface IXMLTV<INTERFACE, CLASS> : IXMLTV<INTERFACE, CLASS, EventArgs> where CLASS : class,INTERFACE { }
-    public interface IXMLTV<INTERFACE, CLASS, INSTANCECREATED_EVENTAGS> : IXMLTVSerializer<INTERFACE>, IDestroyInstance, IOnInstanceCreated, IGetInstance<INTERFACE>
+    internal interface IXMLTV<INTERFACE, CLASS> : IXMLTV<INTERFACE, CLASS, EventArgs> where CLASS : class,INTERFACE { }
+    internal interface IXMLTV<INTERFACE, CLASS, INSTANCECREATED_EVENTAGS> : IXMLTVSerializer<INTERFACE>, IDestroyInstance, IOnInstanceCreated, IGetInstance<INTERFACE>, ISetInstance<INTERFACE>
         where CLASS : class,INTERFACE
         where INSTANCECREATED_EVENTAGS : EventArgs { }
 
-    public interface IInstance : IInstance<object> { }
-    public interface IInstance<T> { T Instance { get; set; } }
-    public interface ICreateSerializer : ICreateSerializer<object> { }
-    public interface ICreateSerializer<CLASS> { IXMLTVSerializer<CLASS> CreateSerializer(); }
+    internal interface IInstance : IInstance<object> { }
+    internal interface IInstance<T> { T Instance { get; set; } }
+    internal interface ICreateSerializer : ICreateSerializer<object> { }
+    internal interface ICreateSerializer<CLASS> { IXMLTVSerializer<CLASS> CreateSerializer(); }
 
     //public interface IGetInstanceT : IGetInstanceT<object> { }
     //public interface IGetInstanceT<T> { T GetInstance<T>();  }
-    public interface IGetInstance : IGetInstance<object> { }
-    public interface IGetInstance<T> { T GetInstance();    }
+    internal interface IGetInstance : IGetInstance<object> { }
+    internal interface IGetInstance<T> { T GetInstance();    }
 
-    public interface IOnInstanceCreated : IOnInstanceCreated<EventArgs> { }
-    public interface IOnInstanceCreated<T> where T : EventArgs { EventHandler<T> OnInstanceCreated { get; set; } }
-    public interface ISerializer<T> { IXMLTVSerializer<T> Serializer { get; } }
-    public interface IDestroyInstance { void DestroyInstance();    }
-    public interface IGetCreatedInstanceEvent : IGetCreatedInstanceEvent<EventArgs> { }
-    public interface IGetCreatedInstanceEvent<T> where T : EventArgs { EventHandler<T> GetOnInstanceCreated();    }
-    public interface ISetCreatedInstanceEvent : ISetCreatedInstanceEvent<EventArgs> { }
-    public interface ISetCreatedInstanceEvent<T> where T : EventArgs { void SetOnInstanceCreated(EventHandler<T> event_instance);    }
-    public interface IRuntimeInstanceLoader : IRuntimeInstanceLoader<object> { }
-    public interface IRuntimeInstanceLoader<T> { T LoadFromInstance(T instance);    }
+    internal interface ISetInstance : ISetInstance<object> { }
+    internal interface ISetInstance<T> { void SetInstance(T instance);    }
+
+    internal interface IOnInstanceCreated : IOnInstanceCreated<EventArgs> { }
+    internal interface IOnInstanceCreated<T> where T : EventArgs { EventHandler<T> OnInstanceCreated { get; set; } }
+    internal interface ISerializer<T> { IXMLTVSerializer<T> Serializer { get; } }
+    internal interface IDestroyInstance { void DestroyInstance();    }
+    internal interface IGetCreatedInstanceEvent : IGetCreatedInstanceEvent<EventArgs> { }
+    internal interface IGetCreatedInstanceEvent<T> where T : EventArgs { EventHandler<T> GetOnInstanceCreated();    }
+    internal interface ISetCreatedInstanceEvent : ISetCreatedInstanceEvent<EventArgs> { }
+    internal interface ISetCreatedInstanceEvent<T> where T : EventArgs { void SetOnInstanceCreated(EventHandler<T> event_instance);    }
+    internal interface IRuntimeInstanceLoader : IRuntimeInstanceLoader<object> { }
+    internal interface IRuntimeInstanceLoader<T> { T LoadFromInstance(T instance);    }
 
 
 #region Property Dictionary support
-    public interface IPropertyDictionary : IPropertyDictionary<string,object> { }
+    public interface IPropertyDictionary : IPropertyDictionary<string, object> { }
     public interface IPropertyDictionary<TKey, TValue> : IPropertyCollection<IPropertyValuePair<TKey, TValue>>, IEnumerable<IPropertyValuePair<TKey, TValue>>, IEnumerable
     {
         IPropertyCollection<TKey> PropertyKeys { get; }
@@ -149,8 +201,7 @@
 
     #region PropertyValuePair support
 
-    public interface IPropertyValuePair : IPropertyValuePair<string,object>    {
-    }
+    public interface IPropertyValuePair : IPropertyValuePair<string, object>    {    }
     public interface IPropertyValuePair<TKey, TValue>
     {
         TKey Name { get; }