Changeset 19308 for lang/csharp/iTunesCOMWrap/trunk/iTunesCOMWrap/Base.cs

Timestamp:

09/15/08 01:35:51 (4 months ago)

Author:

topia

Message:

update supported iTunesLib version to 1.11 (iTunes 7.7).
* support PersistentID and Playlists property.
* support ITArtwork.Description property.

Files:

• lang/csharp/iTunesCOMWrap/trunk/iTunesCOMWrap/Base.cs (modified) (7 diffs)

lang/csharp/iTunesCOMWrap/trunk/iTunesCOMWrap/Base.cs

@@ -5 +5 @@
 using System.Linq;
 using Clovery.iTunesHelper.COMWrap.Interfaces;
+using Clovery.iTunesHelper.COMWrap.Interfaces.Internal;
+using Clovery.iTunesHelper.COMWrap.Internal;
 
 namespace Clovery.iTunesHelper.COMWrap
@@ -69 +71 @@
         protected internal readonly int _TrackDatabaseID;
         protected internal readonly int _trackID;
+        protected internal readonly long? _persistentID;
         protected internal string _name;
 
@@ -75 +78 @@
             _internal.GetITObjectIDs(out this._sourceID, out this._playlistID, out this._trackID,
                                      out this._TrackDatabaseID);
+            {
+                int high, low;
+                this._app._asIiTunes.GetITObjectPersistentIDs(ref this._internal, out high, out low);
+                this._persistentID = Utils.JoinInt32ToInt64(high, low);
+            }
             this._name = _internal.Name;
         }
 
-        protected internal ITObject(int sourceID, int playlistID, int trackID, int TrackDatabaseID, ITunesApp app) : base(app)
+        /// <summary>
+        /// Create Abstract ITObject.
+        /// </summary>
+        protected internal ITObject(int sourceID, int playlistID, int trackID, int TrackDatabaseID, long? PersistentID, ITunesApp app)
+            : base(app)
         {
             this._sourceID = sourceID;
@@ -84 +96 @@
             this._trackID = trackID;
             this._TrackDatabaseID = TrackDatabaseID;
+            this._persistentID = PersistentID;
+        }
+
+        /// <summary>
+        /// Create Abstract ITObject.
+        /// </summary>
+        protected internal ITObject(int sourceID, int playlistID, int trackID, int TrackDatabaseID, ITunesApp app)
+            : this(sourceID, playlistID, trackID, TrackDatabaseID, null, app)
+        {
         }
 
@@ -105 +126 @@
         public void GetITObjectIDs(out int sourceID, out int playlistID, out int trackID, out int databaseID)
         {
-            //this._asIITObject.GetITObjectIDs(out sourceID, out playlistID, out trackID, out databaseID);
             sourceID = this.sourceID;
             playlistID = this.playlistID;
@@ -160 +180 @@
         }
 
+        public long PersistentID
+        {
+            get
+            {
+                if (this._persistentID.HasValue)
+                {
+                    return this._persistentID.Value;
+                }
+                throw new InvalidOperationException("This object is abstract.");
+            }
+        }
+
         ///<summary>
         ///Indicates whether the current object is equal to another object of the same type.
@@ -231 +263 @@
     }
 
-    internal class ParentStringIndexerReferrer<TCollection, TItem> : IIndexedCollection<string, TItem>
-        where TCollection : IIndexedCollection<string, TItem>
+    namespace Internal
     {
-        protected internal readonly TCollection _parent;
-
-        internal ParentStringIndexerReferrer(TCollection _parent)
-        {
-            this._parent = _parent;
-        }
-
-        public TItem this[string Name]
-        {
-            get { return this._parent[Name]; }
-        }
-    }
-
-    internal abstract class ITBaseCollection<TItem> : ITFactory, IITBaseCollection<TItem>
-        where TItem : class
-    {
-        protected ITBaseCollection(object _internal, ITunesApp app) : base(_internal, app)
-        {
-        }
-
-        public abstract int Count { get; }
-
-        ///<summary>
-        ///Returns an enumerator that iterates through the collection.
-        ///</summary>
-        ///
-        ///<returns>
-        ///A <see cref="T:System.Collections.Generic.IEnumerator`1"></see> that can be used to iterate through the collection.
-        ///</returns>
-        ///<filterpriority>1</filterpriority>
-        public IEnumerator<TItem> GetEnumerator()
-        {
-            return this._GetEnumerator();
-        }
-
-        ///<summary>
-        ///Returns an enumerator that iterates through a collection.
-        ///</summary>
-        ///
-        ///<returns>
-        ///An <see cref="T:System.Collections.IEnumerator"></see> object that can be used to iterate through the collection.
-        ///</returns>
-        ///<filterpriority>2</filterpriority>
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return this._GetEnumerator();
-        }
-
-        protected internal abstract IEnumerator<TItem> _GetEnumerator();
-    }
-
-    internal class ITBaseEnumerator<TITunesItem, TItem, TBaseCollection> : IEnumerator<TItem>
-        where TBaseCollection : IITBaseCollection<TItem>, ItemCreatableCollection<TITunesItem, TItem>
-        where TItem : class
-    {
-        protected internal readonly TBaseCollection _collection;
-        protected internal readonly IEnumerator _internal;
-        protected TItem _current;
-
-        internal ITBaseEnumerator(IEnumerator internalEnumerator, TBaseCollection baseCollection)
-        {
-            this._internal = internalEnumerator;
-            this._collection = baseCollection;
-        }
-
-        ///<summary>
-        ///Advances the enumerator to the next element of the collection.
-        ///</summary>
-        ///
-        ///<returns>
-        ///true if the enumerator was successfully advanced to the next element; false if the enumerator has passed the end of the collection.
-        ///</returns>
-        ///
-        ///<exception cref="T:System.InvalidOperationException">The collection was modified after the enumerator was created. </exception><filterpriority>2</filterpriority>
-        public bool MoveNext()
-        {
-            this._current = null;
-            return this._internal.MoveNext();
-        }
-
-        ///<summary>
-        ///Sets the enumerator to its initial position, which is before the first element in the collection.
-        ///</summary>
-        ///
-        ///<exception cref="T:System.InvalidOperationException">The collection was modified after the enumerator was created. </exception><filterpriority>2</filterpriority>
-        public void Reset()
-        {
-            this._internal.Reset();
-        }
-
-        ///<summary>
-        ///Gets the current element in the collection.
-        ///</summary>
-        ///
-        ///<returns>
-        ///The current element in the collection.
-        ///</returns>
-        ///
-        ///<exception cref="T:System.InvalidOperationException">The enumerator is positioned before the first element of the collection or after the last element. </exception><filterpriority>2</filterpriority>
-        object IEnumerator.Current
-        {
-            get { return this.GetCurrent(); }
-        }
-
-        ///<summary>
-        ///Gets the element in the collection at the current position of the enumerator.
-        ///</summary>
-        ///
-        ///<returns>
-        ///The element in the collection at the current position of the enumerator.
-        ///</returns>
-        ///
-        TItem IEnumerator<TItem>.Current
-        {
-            get { return this.GetCurrent(); }
-        }
-
-        ///<summary>
-        ///Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
-        ///</summary>
-        ///<filterpriority>2</filterpriority>
-        public void Dispose()
-        {
-        }
-
-        protected TItem GetCurrent()
-        {
-            if (this._current == null)
-            {
-                this._current = this._GetCurrent();
-            }
-
-            return this._current;
-        }
-
-        protected TItem _GetCurrent()
-        {
-            return this._collection.CreateItem((TITunesItem) this._internal.Current);
+        internal class ParentStringIndexerReferrer<TCollection, TItem> : IIndexedCollection<string, TItem>
+            where TCollection : IIndexedCollection<string, TItem>
+        {
+            protected internal readonly TCollection _parent;
+
+            internal ParentStringIndexerReferrer(TCollection _parent)
+            {
+                this._parent = _parent;
+            }
+
+            public TItem this[string Name]
+            {
+                get { return this._parent[Name]; }
+            }
+        }
+
+        internal abstract class ITBaseCollection<TItem> : ITFactory, IITBaseCollection<TItem>
+            where TItem : class
+        {
+            protected ITBaseCollection(object _internal, ITunesApp app)
+                : base(_internal, app)
+            {
+            }
+
+            public abstract int Count { get; }
+
+            ///<summary>
+            ///Returns an enumerator that iterates through the collection.
+            ///</summary>
+            ///
+            ///<returns>
+            ///A <see cref="T:System.Collections.Generic.IEnumerator`1"></see> that can be used to iterate through the collection.
+            ///</returns>
+            ///<filterpriority>1</filterpriority>
+            public IEnumerator<TItem> GetEnumerator()
+            {
+                return this._GetEnumerator();
+            }
+
+            ///<summary>
+            ///Returns an enumerator that iterates through a collection.
+            ///</summary>
+            ///
+            ///<returns>
+            ///An <see cref="T:System.Collections.IEnumerator"></see> object that can be used to iterate through the collection.
+            ///</returns>
+            ///<filterpriority>2</filterpriority>
+            IEnumerator IEnumerable.GetEnumerator()
+            {
+                return this._GetEnumerator();
+            }
+
+            protected internal abstract IEnumerator<TItem> _GetEnumerator();
+        }
+
+        internal class ITBaseEnumerator<TITunesItem, TItem, TBaseCollection> : IEnumerator<TItem>
+            where TBaseCollection : IITBaseCollection<TItem>, ItemCreatableCollection<TITunesItem, TItem>
+            where TItem : class
+        {
+            protected internal readonly TBaseCollection _collection;
+            protected internal readonly IEnumerator _internal;
+            protected TItem _current;
+
+            internal ITBaseEnumerator(IEnumerator internalEnumerator, TBaseCollection baseCollection)
+            {
+                this._internal = internalEnumerator;
+                this._collection = baseCollection;
+            }
+
+            ///<summary>
+            ///Advances the enumerator to the next element of the collection.
+            ///</summary>
+            ///
+            ///<returns>
+            ///true if the enumerator was successfully advanced to the next element; false if the enumerator has passed the end of the collection.
+            ///</returns>
+            ///
+            ///<exception cref="T:System.InvalidOperationException">The collection was modified after the enumerator was created. </exception><filterpriority>2</filterpriority>
+            public bool MoveNext()
+            {
+                this._current = null;
+                return this._internal.MoveNext();
+            }
+
+            ///<summary>
+            ///Sets the enumerator to its initial position, which is before the first element in the collection.
+            ///</summary>
+            ///
+            ///<exception cref="T:System.InvalidOperationException">The collection was modified after the enumerator was created. </exception><filterpriority>2</filterpriority>
+            public void Reset()
+            {
+                this._internal.Reset();
+            }
+
+            ///<summary>
+            ///Gets the current element in the collection.
+            ///</summary>
+            ///
+            ///<returns>
+            ///The current element in the collection.
+            ///</returns>
+            ///
+            ///<exception cref="T:System.InvalidOperationException">The enumerator is positioned before the first element of the collection or after the last element. </exception><filterpriority>2</filterpriority>
+            object IEnumerator.Current
+            {
+                get { return this.GetCurrent(); }
+            }
+
+            ///<summary>
+            ///Gets the element in the collection at the current position of the enumerator.
+            ///</summary>
+            ///
+            ///<returns>
+            ///The element in the collection at the current position of the enumerator.
+            ///</returns>
+            ///
+            TItem IEnumerator<TItem>.Current
+            {
+                get { return this.GetCurrent(); }
+            }
+
+            ///<summary>
+            ///Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+            ///</summary>
+            ///<filterpriority>2</filterpriority>
+            public void Dispose()
+            {
+            }
+
+            protected TItem GetCurrent()
+            {
+                if (this._current == null)
+                {
+                    this._current = this._GetCurrent();
+                }
+
+                return this._current;
+            }
+
+            protected TItem _GetCurrent()
+            {
+                return this._collection.CreateItem((TITunesItem)this._internal.Current);
+            }
         }
     }