Changeset 19308

Timestamp:

09/15/08 01:35:51 (5 years ago)

Author:

topia

Message:

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

Location:

lang/csharp/iTunesCOMWrap/trunk/iTunesCOMWrap

Files:

• Application.cs (modified) (2 diffs)
• Artworks.cs (modified) (3 diffs)
• Base.cs (modified) (7 diffs)
• EQPresets.cs (modified) (1 diff)
• Encoders.cs (modified) (1 diff)
• Enums.cs (modified) (2 diffs)
• Factory.cs (modified) (2 diffs)
• Interfaces/IArtwork.cs (modified) (2 diffs)
• Interfaces/IBase.cs (modified) (3 diffs)
• Interfaces/IEQPresets.cs (modified) (1 diff)
• Interfaces/IEncoders.cs (modified) (1 diff)
• Interfaces/IPlaylists.cs (modified) (4 diffs)
• Interfaces/ISources.cs (modified) (2 diffs)
• Interfaces/ITracks.cs (modified) (3 diffs)
• Interfaces/IVisuals.cs (modified) (1 diff)
• Interfaces/IWindows.cs (modified) (1 diff)
• Playlists.cs (modified) (6 diffs)
• Properties/AssemblyInfo.cs (modified) (2 diffs)
• Sources.cs (modified) (5 diffs)
• Tracks.cs (modified) (8 diffs)
• Utils.cs (added)
• Visuals.cs (modified) (1 diff)
• Windows.cs (modified) (1 diff)
• iTunesCOMWrap.csproj (modified) (3 diffs)

lang/csharp/iTunesCOMWrap/trunk/iTunesCOMWrap/Application.cs

@@ -6 +6 @@
 using System.Runtime.InteropServices;
 using Clovery.iTunesHelper.COMWrap.Interfaces;
+using Clovery.iTunesHelper.COMWrap.Interfaces.Internal;
+using Clovery.iTunesHelper.COMWrap.Internal;
 using iTunes = iTunesLib;
 
@@ -553 +555 @@
     }
 
-    internal class CanSetShufflePlaylistCollection : IIndexedCollection<IPlaylist, bool>
+    namespace Internal
     {
-        public bool this[IPlaylist Playlist]
-        {
-            get { return Playlist.CanSetShuffle; }
-        }
-    }
-
-    internal class CanSetSongRepeatPlaylistCollection : IIndexedCollection<IPlaylist, bool>
-    {
-        public bool this[IPlaylist Playlist]
-        {
-            get { return Playlist.CanSetSongRepeat; }
-        }
+        internal class CanSetShufflePlaylistCollection : IIndexedCollection<IPlaylist, bool>
+        {
+            public bool this[IPlaylist Playlist]
+            {
+                get { return Playlist.CanSetShuffle; }
+            }
+        }
+
+        internal class CanSetSongRepeatPlaylistCollection : IIndexedCollection<IPlaylist, bool>
+        {
+            public bool this[IPlaylist Playlist]
+            {
+                get { return Playlist.CanSetSongRepeat; }
+            }
+        }        
     }
 

lang/csharp/iTunesCOMWrap/trunk/iTunesCOMWrap/Artworks.cs

@@ -5 +5 @@
 using System.Linq;
 using Clovery.iTunesHelper.COMWrap.Interfaces;
+using Clovery.iTunesHelper.COMWrap.Interfaces.Internal;
+using Clovery.iTunesHelper.COMWrap.Internal;
 using iTunes = iTunesLib;
 
@@ -15 +17 @@
         }
 
-        protected internal iTunes.IITArtwork __asIITArtwork
+        protected internal iTunes.IITArtwork _asIITArtwork
         {
             get { return (iTunes.IITArtwork) this._internal; }
@@ -22 +24 @@
         public void Delete()
         {
-            this.__asIITArtwork.Delete();
+            this._asIITArtwork.Delete();
         }
 
         public ArtworkFormat Format
         {
-            get { return (ArtworkFormat) this.__asIITArtwork.Format; }
+            get { return (ArtworkFormat) this._asIITArtwork.Format; }
         }
 
         public bool IsDownloadedArtwork
         {
-            get { return this.__asIITArtwork.IsDownloadedArtwork; }
+            get { return this._asIITArtwork.IsDownloadedArtwork; }
+        }
+
+        public string Description
+        {
+            get { return this._asIITArtwork.Description; }
+            set { this._asIITArtwork.Description = value; }
         }
 
         public void SaveArtworkToFile(string filePath)
         {
-            this.__asIITArtwork.SaveArtworkToFile(filePath);
+            this._asIITArtwork.SaveArtworkToFile(filePath);
         }
 
         public void SetArtworkFromFile(string filePath)
         {
-            this.__asIITArtwork.SetArtworkFromFile(filePath);
+            this._asIITArtwork.SetArtworkFromFile(filePath);
         }
     }

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);
+            }
         }
     }

lang/csharp/iTunesCOMWrap/trunk/iTunesCOMWrap/EQPresets.cs

@@ -4 +4 @@
 using System.Linq;
 using Clovery.iTunesHelper.COMWrap.Interfaces;
+using Clovery.iTunesHelper.COMWrap.Interfaces.Internal;
+using Clovery.iTunesHelper.COMWrap.Internal;
 using iTunes = iTunesLib;
 

lang/csharp/iTunesCOMWrap/trunk/iTunesCOMWrap/Encoders.cs

@@ -4 +4 @@
 using System.Linq;
 using Clovery.iTunesHelper.COMWrap.Interfaces;
+using Clovery.iTunesHelper.COMWrap.Interfaces.Internal;
+using Clovery.iTunesHelper.COMWrap.Internal;
 using iTunes = iTunesLib;
 

lang/csharp/iTunesCOMWrap/trunk/iTunesCOMWrap/Enums.cs

@@ -542 +542 @@
     ///     <item><term>1.8</term><description>iTunes 7.0</description></item>
     ///     <item><term>1.9</term><description>iTunes 7.1</description></item>
-    ///     <item><term>1.10</term><description>iTunes 7.2?</description></item>
+    ///     <item><term>1.10</term><description>iTunes 7.4</description></item>
+    ///     <item><term>1.11</term><description>iTunes 7.7</description></item>
     /// </list>
     /// </summary>
@@ -555 +556 @@
         /// iTunes type library minor version
         /// </summary>
-        MinorVersion = 10
+        MinorVersion = 11
     }
 

lang/csharp/iTunesCOMWrap/trunk/iTunesCOMWrap/Factory.cs

@@ -4 +4 @@
 using System.Collections.Generic;
 using System.Linq;
+using Clovery.iTunesHelper.COMWrap.Interfaces.Internal;
 using iTunesLib;
 
@@ -41 +42 @@
         public IITObject CreateAbstractObject(int sourceID, int playlistID, int trackID, int TrackDatabaseID)
         {
-            return new ITObject(sourceID, playlistID, trackID, TrackDatabaseID, this.app);
+            return new ITObject(sourceID, playlistID, trackID, TrackDatabaseID, null, this.app);
         }
 

lang/csharp/iTunesCOMWrap/trunk/iTunesCOMWrap/Interfaces/IArtwork.cs

@@ -1 +1 @@
 // $Id$
+using Clovery.iTunesHelper.COMWrap.Interfaces.Internal;
+
 namespace Clovery.iTunesHelper.COMWrap.Interfaces
 {
@@ -24 +26 @@
         /// </summary>
         bool IsDownloadedArtwork { get; }
+
+        /// <summary>
+        /// get/set the description for the artwork.
+        /// </summary>
+        /// <remarks>
+        /// Artwork descriptions are only supported in files that use ID3 tags (i.e. MP3 files). 
+        /// </remarks>
+        string Description { get; set; }
 
         /// <summary>

lang/csharp/iTunesCOMWrap/trunk/iTunesCOMWrap/Interfaces/IBase.cs

@@ -2 +2 @@
 using System;
 using System.Collections.Generic;
+using Clovery.iTunesHelper.COMWrap.Interfaces.Internal;
 using iTunes = iTunesLib;
 
@@ -99 +100 @@
         /// </remarks>
         int TrackDatabaseID { get; }
+
+        /// <summary>
+        /// Get the persistent ID.
+        /// </summary>
+        /// <remarks>
+        /// <para>64-bit persistent which can be used to identify
+        /// the IITObject across multiple invocations of iTunes.</para>
+        /// </remarks>
+        long PersistentID { get; }
 
         /// <summary>
@@ -136 +146 @@
     }
 
-
-    /// <summary>
-    /// Interface of a index enabled collection.
-    /// </summary>
-    /// <typeparam name="TIndex">Index type</typeparam>
-    /// <typeparam name="TItem">Item type</typeparam>
-    public interface IIndexedCollection<TIndex, TItem>
+    namespace Internal
     {
         /// <summary>
-        /// collection indexer of specified type.
-        /// </summary>
-        /// <param name="Index"><typeparamref name="TIndex"/>'s index of <typeparamref name="TItem"/> to retrive.</param>
-        /// <returns>Returns an <typeparamref name="TItem"/> object corresponding to the specified index.</returns>
-        TItem this[TIndex Index] { get; }
-    }
-
-    /// <summary>
-    /// Base interface of iTunes collections.
-    /// </summary>
-    /// <typeparam name="TItem">Wrapped item type</typeparam>
-    public interface IITBaseCollection<TItem> : IEnumerable<TItem>, IITFactory
-    {
-        /// <summary>
-        /// Get count of items.
-        /// </summary>
-        int Count { get; }
-    }
-
-    /// <summary>
-    /// interface of iTunes item creatable collections.
-    /// </summary>
-    /// <typeparam name="TITunesItem">Native iTunes item type</typeparam>
-    /// <typeparam name="TItem">Wrapped item type</typeparam>
-    internal interface ItemCreatableCollection<TITunesItem, TItem>
-    {
-        /// <summary>
-        /// Create item from Native iTunes item.
-        /// </summary>
-        /// <param name="item">Native iTunes item of <typeparamref name="TITunesItem"/>'s object.</param>
-        /// <returns>Wrapped item of <typeparamref name="TItem"/>'s object.</returns>
-        TItem CreateItem(TITunesItem item);
-    }
-
-    /// <summary>
-    /// interface of iTunes named collections.
-    /// </summary>
-    /// <typeparam name="TItem">Wrapped item type</typeparam>
-    public interface INamedCollection<TItem> :
-        IITBaseCollection<TItem>, IIndexedCollection<string, TItem>, IIndexedCollection<int, TItem>
-    {
-        /// <summary>
-        /// Returns an ItemByName indexer collection.
-        /// </summary>
-        IIndexedCollection<string, TItem> ItemByName { get; }
-    }
-
-    /// <summary>
-    /// object factory of wrapped iTunes object.
-    /// </summary>
-    public interface IITunesWrappedObjectFactory
-    {
-        IITObject GetCachedIITObject(int sourceID, int playlistID, int trackID, int TrackDatabaseID);
-        IITObject GetCachedIITObject(iTunesLib.IITObject _internal);
-        void PurgeObjectCache();
-
-        TResult GetCacheOrAbstractObject<TResult>(int sourceID, int playlistID, int trackID, int TrackDatabaseID)
-            where TResult : class, IITObject;
-
-        /// <summary>
-        /// Returns an abstract iTunes object corresponding to the specified IDs.
-        /// </summary>
-        /// <remarks>
-        /// The object may be a source, playlist, or track.
-        /// </remarks>
-        /// <param name="sourceID">The ID that identifies the source. Valid for a source, playlist, or track.</param>
-        /// <param name="playlistID">The ID that identifies the playlist. Valid for a playlist or track.
-        /// Must be zero for a source.</param>
-        /// <param name="trackID">The ID that identifies the track within the playlist. Valid for a track.
-        /// Must be zero for a source or playlist.</param>
-        /// <param name="TrackDatabaseID">The ID that identifies the track, independent of its playlist.
-        /// Valid for a track. Must be zero for a source or playlist.</param>
-        /// <returns>Returns an <see cref="ITObject"/> object corresponding to the specified IDs.</returns>
-        IITObject CreateAbstractObject(int sourceID, int playlistID, int trackID, int TrackDatabaseID);
-
-        /// <summary>
-        /// Returns a wrapped object implements iTunes object corresponding to a native.
-        /// </summary>
-        /// <param name="_internal">internal <see cref="iTunes.IITObject" /> object.</param>
-        /// <returns>Returns a wrapped object implements <see cref="ITObject"/>.</returns>
-        IITObject CreateObject(iTunes.IITObject _internal);
-
-        /// <summary>
-        /// Returns a wrapped object implements playlist object corresponding to a native playlist.
-        /// </summary>
-        /// <param name="_internal">internal <see cref="iTunes.IITPlaylist"/> object.</param>
-        /// <returns>Returns a wrapped object implements <see cref="IPlaylist"/>.</returns>
-        IPlaylist CreatePlaylist(iTunes.IITPlaylist _internal);
-
-        /// <summary>
-        /// Returns a wrapped object implements library playlist object corresponding to a native library playlist.
-        /// </summary>
-        /// <param name="_internal">internal <see cref="iTunes.IITLibraryPlaylist"/> object.</param>
-        /// <returns>Returns a wrapped object implements <see cref="ILibraryPlaylist"/>.</returns>
-        ILibraryPlaylist CreateLibraryPlaylist(iTunes.IITLibraryPlaylist _internal);
-
-        /// <summary>
-        /// Returns a wrapped object implements user playlist object corresponding to a native user playlist.
-        /// </summary>
-        /// <param name="_internal">internal <see cref="iTunes.IITUserPlaylist"/> object.</param>
-        /// <returns>Returns a wrapped object implements <see cref="IUserPlaylist"/>.</returns>
-        IUserPlaylist CreateUserPlaylist(iTunes.IITUserPlaylist _internal);
-
-        /// <summary>
-        /// Returns a wrapped object implements playlist collection object correspoding to a native playlist collection.
-        /// </summary>
-        /// <param name="_internal">internal <see cref="iTunes.IITPlaylistCollection"/> object.</param>
-        /// <returns>Returns a wrapped object implements <see cref="IPlaylistCollection"/>.</returns>
-        IPlaylistCollection CreatePlaylistCollection(iTunes.IITPlaylistCollection _internal);
-
-        /// <summary>
-        /// Returns a wrapped object implements source object corresponding to a native source.
-        /// </summary>
-        /// <param name="_internal">internal <see cref="iTunes.IITSource"/> object.</param>
-        /// <returns>Returns a wrapped object implements <see cref="ISource"/>.</returns>
-        ISource CreateSource(iTunes.IITSource _internal);
-
-        /// <summary>
-        /// Returns a wrapped object implements source collection object corresponding to a native source collection.
-        /// </summary>
-        /// <param name="_internal">internal <see cref="iTunes.IITSourceCollection"/> object.</param>
-        /// <returns>Returns a wrapped object implements <see cref="ISourceCollection"/>.</returns>
-        ISourceCollection CreateSourceCollection(iTunes.IITSourceCollection _internal);
-
-        /// <summary>
-        /// Returns a wrapped object implements track object corresponding to a native track.
-        /// </summary>
-        /// <param name="_internal">internal <see cref="iTunes.IITTrack"/> object.</param>
-        /// <returns>Returns a wrapped object implements <see cref="ITrack"/>.</returns>
-        ITrack CreateTrack(iTunes.IITTrack _internal);
-
-        /// <summary>
-        /// Returns a wrapped object implements url track object corresponding to a native url track.
-        /// </summary>
-        /// <param name="_internal">internal <see cref="iTunes.IITURLTrack"/> object.</param>
-        /// <returns>Returns a wrapped object implements <see cref="IURLTrack"/>.</returns>
-        IURLTrack CreateURLTrack(iTunes.IITURLTrack _internal);
-
-        /// <summary>
-        /// Returns a wrapped object implements track collection object corresponding to a native track collection.
-        /// </summary>
-        /// <param name="_internal">internal <see cref="iTunes.IITTrackCollection"/> object.</param>
-        /// <returns>Returns a wrapped object implements <see cref="ITrackCollection"/>.</returns>
-        ITrackCollection CreateTrackCollection(iTunes.IITTrackCollection _internal);
-
-        /// <summary>
-        /// Returns a wrapped object implements window object corresponding to a native window.
-        /// </summary>
-        /// <param name="_internal">internal <see cref="iTunes.IITWindow"/> object.</param>
-        /// <returns>Returns a wrapped object implements <see cref="IWindow"/>.</returns>
-        IWindow CreateWindow(iTunes.IITWindow _internal);
-
-        /// <summary>
-        /// Returns a wrapped object implements browser window object corresponding to a native browser window.
-        /// </summary>
-        /// <param name="_internal">internal <see cref="iTunes.IITBrowserWindow"/> object.</param>
-        /// <returns>Returns a wrapped object implements <see cref="IBrowserWindow"/>.</returns>
-        IBrowserWindow CreateBrowserWindow(iTunes.IITBrowserWindow _internal);
-
-        /// <summary>
-        /// Returns a wrapped object implements window collection object corresponding to a native window collection.
-        /// </summary>
-        /// <param name="_internal">internal <see cref="iTunes.IITWindowCollection"/> object.</param>
-        /// <returns>Returns a wrapped object implements <see cref="IWindowCollection"/>.</returns>
-        IWindowCollection CreateWindowCollection(iTunes.IITWindowCollection _internal);
-
-        /// <summary>
-        /// Returns a wrapped object implements artwork object corresponding to a native artwork.
-        /// </summary>
-        /// <param name="_internal">internal <see cref="iTunes.IITArtwork"/> object.</param>
-        /// <returns>Returns a wrapped object implements <see cref="IArtwork"/>.</returns>
-        IArtwork CreateArtwork(iTunes.IITArtwork _internal);
-
-        /// <summary>
-        /// Returns a wrapped object implements artwork collection object corresponding to a native artwork collection.
-        /// </summary>
-        /// <param name="_internal">internal <see cref="iTunes.IITArtworkCollection"/> object.</param>
-        /// <returns>Returns a wrapped object implements <see cref="IArtworkCollection"/>.</returns>
-        IArtworkCollection CreateArtworkCollection(iTunes.IITArtworkCollection _internal);
-
-        /// <summary>
-        /// Returns a wrapped object implements encoder object corresponding to a native encoder.
-        /// </summary>
-        /// <param name="_internal">internal <see cref="iTunes.IITEncoder"/> object.</param>
-        /// <returns>Returns a wrapped object implements <see cref="IEncoder"/>.</returns>
-        IEncoder CreateEncoder(iTunes.IITEncoder _internal);
-
-        /// <summary>
-        /// Returns a encoder collection object corresponding to a native encoder collection object.
-        /// </summary>
-        /// <param name="_internal">internal <see cref="iTunes.IITEncoderCollection"/> object.</param>
-        /// <returns>Returns a wrapped object implements <see cref="IEncoderCollection"/>.</returns>
-        IEncoderCollection CreateEncoderCollection(iTunes.IITEncoderCollection _internal);
-
-        /// <summary>
-        /// Returns a equalizer preset object corresponding to a native equalizer preset object.
-        /// </summary>
-        /// <param name="_internal">internal <see cref="iTunes.IITEQPreset"/> object.</param>
-        /// <returns>Returns a wrapped object implements <see cref="IEQPreset"/>.</returns>
-        IEQPreset CreateEQPreset(iTunes.IITEQPreset _internal);
-
-        /// <summary>
-        /// Returns a equalizer preset collection object corresponding to a native equalizer preset collection object.
-        /// </summary>
-        /// <param name="_internal">internal <see cref="iTunes.IITEQPresetCollection"/> object.</param>
-        /// <returns>Returns a wrapped object implements <see cref="IEQPresetCollection"/>.</returns>
-        IEQPresetCollection CreateEQPresetCollection(iTunes.IITEQPresetCollection _internal);
-
-        /// <summary>
-        /// Returns a visual object corresponding to a native visual object.
-        /// </summary>
-        /// <param name="_internal">internal <see cref="iTunes.IITVisual"/> object.</param>
-        /// <returns>Returns a wrapped object implements <see cref="IVisual"/>.</returns>
-        IVisual CreateVisual(iTunes.IITVisual _internal);
-
-        /// <summary>
-        /// Returns a visual collection object corresponding to a native visual collection object.
-        /// </summary>
-        /// <param name="_internal">internal <see cref="iTunes.IITVisualCollection"/> object.</param>
-        /// <returns>Returns a wrapped object implements <see cref="IVisualCollection"/>.</returns>
-        IVisualCollection CreateVisualCollection(iTunes.IITVisualCollection _internal);
-
-        /// <summary>
-        /// Returns a operation status object corresponding to a native operation status object.
-        /// </summary>
-        /// <param name="_internal">internal <see cref="iTunes.IITOperationStatus"/> object.</param>
-        /// <returns>Returns a wrapped object implements <see cref="IOperationStatus"/>.</returns>
-        IOperationStatus CreateOperationStatus(iTunes.IITOperationStatus _internal);
-
-        /// <summary>
-        /// Returns a convert operation status object corresponding to a native convert operation status object.
-        /// </summary>
-        /// <param name="_internal">internal <see cref="iTunes.iTunesConvertOperationStatus"/> object.</param>
-        /// <returns>Returns a wrapped object implements <see cref="IConvertOperationStatusWithEvents"/>.</returns>
-        IConvertOperationStatusWithEvents CreateConvertOperationStatus(iTunes.iTunesConvertOperationStatus _internal);
+        /// Interface of a index enabled collection.
+        /// </summary>
+        /// <typeparam name="TIndex">Index type</typeparam>
+        /// <typeparam name="TItem">Item type</typeparam>
+        public interface IIndexedCollection<TIndex, TItem>
+        {
+            /// <summary>
+            /// collection indexer of specified type.
+            /// </summary>
+            /// <param name="Index"><typeparamref name="TIndex"/>'s index of <typeparamref name="TItem"/> to retrive.</param>
+            /// <returns>Returns an <typeparamref name="TItem"/> object corresponding to the specified index.</returns>
+            TItem this[TIndex Index] { get; }
+        }
+
+        /// <summary>
+        /// Base interface of iTunes collections.
+        /// </summary>
+        /// <typeparam name="TItem">Wrapped item type</typeparam>
+        public interface IITBaseCollection<TItem> : IEnumerable<TItem>, IITFactory
+        {
+            /// <summary>
+            /// Get count of items.
+            /// </summary>
+            int Count { get; }
+        }
+
+        /// <summary>
+        /// interface of iTunes item creatable collections.
+        /// </summary>
+        /// <typeparam name="TITunesItem">Native iTunes item type</typeparam>
+        /// <typeparam name="TItem">Wrapped item type</typeparam>
+        internal interface ItemCreatableCollection<TITunesItem, TItem>
+        {
+            /// <summary>
+            /// Create item from Native iTunes item.
+            /// </summary>
+            /// <param name="item">Native iTunes item of <typeparamref name="TITunesItem"/>'s object.</param>
+            /// <returns>Wrapped item of <typeparamref name="TItem"/>'s object.</returns>
+            TItem CreateItem(TITunesItem item);
+        }
+
+        /// <summary>
+        /// interface of iTunes named collections.
+        /// </summary>
+        /// <typeparam name="TItem">Wrapped item type</typeparam>
+        public interface INamedCollection<TItem> :
+            IITBaseCollection<TItem>, IIndexedCollection<string, TItem>, IIndexedCollection<int, TItem>
+        {
+            /// <summary>
+            /// Returns an ItemByName indexer collection.
+            /// </summary>
+            IIndexedCollection<string, TItem> ItemByName { get; }
+        }
+
+        /// <summary>
+        /// object factory of wrapped iTunes object.
+        /// </summary>
+        public interface IITunesWrappedObjectFactory
+        {
+            IITObject GetCachedIITObject(int sourceID, int playlistID, int trackID, int TrackDatabaseID);
+            IITObject GetCachedIITObject(iTunesLib.IITObject _internal);
+            void PurgeObjectCache();
+
+            TResult GetCacheOrAbstractObject<TResult>(int sourceID, int playlistID, int trackID, int TrackDatabaseID)
+                where TResult : class, IITObject;
+
+            /// <summary>
+            /// Returns an abstract iTunes object corresponding to the specified IDs.
+            /// </summary>
+            /// <remarks>
+            /// The object may be a source, playlist, or track.
+            /// </remarks>
+            /// <param name="sourceID">The ID that identifies the source. Valid for a source, playlist, or track.</param>
+            /// <param name="playlistID">The ID that identifies the playlist. Valid for a playlist or track.
+            /// Must be zero for a source.</param>
+            /// <param name="trackID">The ID that identifies the track within the playlist. Valid for a track.
+            /// Must be zero for a source or playlist.</param>
+            /// <param name="TrackDatabaseID">The ID that identifies the track, independent of its playlist.
+            /// Valid for a track. Must be zero for a source or playlist.</param>
+            /// <returns>Returns an <see cref="ITObject"/> object corresponding to the specified IDs.</returns>
+            IITObject CreateAbstractObject(int sourceID, int playlistID, int trackID, int TrackDatabaseID);
+
+            /// <summary>
+            /// Returns a wrapped object implements iTunes object corresponding to a native.
+            /// </summary>
+            /// <param name="_internal">internal <see cref="iTunes.IITObject" /> object.</param>
+            /// <returns>Returns a wrapped object implements <see cref="ITObject"/>.</returns>
+            IITObject CreateObject(iTunes.IITObject _internal);
+
+            /// <summary>
+            /// Returns a wrapped object implements playlist object corresponding to a native playlist.
+            /// </summary>
+            /// <param name="_internal">internal <see cref="iTunes.IITPlaylist"/> object.</param>
+            /// <returns>Returns a wrapped object implements <see cref="IPlaylist"/>.</returns>
+            IPlaylist CreatePlaylist(iTunes.IITPlaylist _internal);
+
+            /// <summary>
+            /// Returns a wrapped object implements library playlist object corresponding to a native library playlist.
+            /// </summary>
+            /// <param name="_internal">internal <see cref="iTunes.IITLibraryPlaylist"/> object.</param>
+            /// <returns>Returns a wrapped object implements <see cref="ILibraryPlaylist"/>.</returns>
+            ILibraryPlaylist CreateLibraryPlaylist(iTunes.IITLibraryPlaylist _internal);
+
+            /// <summary>
+            /// Returns a wrapped object implements user playlist object corresponding to a native user playlist.
+            /// </summary>
+            /// <param name="_internal">internal <see cref="iTunes.IITUserPlaylist"/> object.</param>
+            /// <returns>Returns a wrapped object implements <see cref="IUserPlaylist"/>.</returns>
+            IUserPlaylist CreateUserPlaylist(iTunes.IITUserPlaylist _internal);
+
+            /// <summary>
+            /// Returns a wrapped object implements playlist collection object correspoding to a native playlist collection.
+            /// </summary>
+            /// <param name="_internal">internal <see cref="iTunes.IITPlaylistCollection"/> object.</param>
+            /// <returns>Returns a wrapped object implements <see cref="IPlaylistCollection"/>.</returns>
+            IPlaylistCollection CreatePlaylistCollection(iTunes.IITPlaylistCollection _internal);
+
+            /// <summary>
+            /// Returns a wrapped object implements source object corresponding to a native source.
+            /// </summary>
+            /// <param name="_internal">internal <see cref="iTunes.IITSource"/> object.</param>
+            /// <returns>Returns a wrapped object implements <see cref="ISource"/>.</returns>
+            ISource CreateSource(iTunes.IITSource _internal);
+
+            /// <summary>
+            /// Returns a wrapped object implements source collection object corresponding to a native source collection.
+            /// </summary>
+            /// <param name="_internal">internal <see cref="iTunes.IITSourceCollection"/> object.</param>
+            /// <returns>Returns a wrapped object implements <see cref="ISourceCollection"/>.</returns>
+            ISourceCollection CreateSourceCollection(iTunes.IITSourceCollection _internal);
+
+            /// <summary>
+            /// Returns a wrapped object implements track object corresponding to a native track.
+            /// </summary>
+            /// <param name="_internal">internal <see cref="iTunes.IITTrack"/> object.</param>
+            /// <returns>Returns a wrapped object implements <see cref="ITrack"/>.</returns>
+            ITrack CreateTrack(iTunes.IITTrack _internal);
+
+            /// <summary>
+            /// Returns a wrapped object implements url track object corresponding to a native url track.
+            /// </summary>
+            /// <param name="_internal">internal <see cref="iTunes.IITURLTrack"/> object.</param>
+            /// <returns>Returns a wrapped object implements <see cref="IURLTrack"/>.</returns>
+            IURLTrack CreateURLTrack(iTunes.IITURLTrack _internal);
+
+            /// <summary>
+            /// Returns a wrapped object implements track collection object corresponding to a native track collection.
+            /// </summary>
+            /// <param name="_internal">internal <see cref="iTunes.IITTrackCollection"/> object.</param>
+            /// <returns>Returns a wrapped object implements <see cref="ITrackCollection"/>.</returns>
+            ITrackCollection CreateTrackCollection(iTunes.IITTrackCollection _internal);
+
+            /// <summary>
+            /// Returns a wrapped object implements window object corresponding to a native window.
+            /// </summary>
+            /// <param name="_internal">internal <see cref="iTunes.IITWindow"/> object.</param>
+            /// <returns>Returns a wrapped object implements <see cref="IWindow"/>.</returns>
+            IWindow CreateWindow(iTunes.IITWindow _internal);
+
+            /// <summary>
+            /// Returns a wrapped object implements browser window object corresponding to a native browser window.
+            /// </summary>
+            /// <param name="_internal">internal <see cref="iTunes.IITBrowserWindow"/> object.</param>
+            /// <returns>Returns a wrapped object implements <see cref="IBrowserWindow"/>.</returns>
+            IBrowserWindow CreateBrowserWindow(iTunes.IITBrowserWindow _internal);
+
+            /// <summary>
+            /// Returns a wrapped object implements window collection object corresponding to a native window collection.
+            /// </summary>
+            /// <param name="_internal">internal <see cref="iTunes.IITWindowCollection"/> object.</param>
+            /// <returns>Returns a wrapped object implements <see cref="IWindowCollection"/>.</returns>
+            IWindowCollection CreateWindowCollection(iTunes.IITWindowCollection _internal);
+
+            /// <summary>
+            /// Returns a wrapped object implements artwork object corresponding to a native artwork.
+            /// </summary>
+            /// <param name="_internal">internal <see cref="iTunes.IITArtwork"/> object.</param>
+            /// <returns>Returns a wrapped object implements <see cref="IArtwork"/>.</returns>
+            IArtwork CreateArtwork(iTunes.IITArtwork _internal);
+
+            /// <summary>
+            /// Returns a wrapped object implements artwork collection object corresponding to a native artwork collection.
+            /// </summary>
+            /// <param name="_internal">internal <see cref="iTunes.IITArtworkCollection"/> object.</param>
+            /// <returns>Returns a wrapped object implements <see cref="IArtworkCollection"/>.</returns>
+            IArtworkCollection CreateArtworkCollection(iTunes.IITArtworkCollection _internal);
+
+            /// <summary>
+            /// Returns a wrapped object implements encoder object corresponding to a native encoder.
+            /// </summary>
+            /// <param name="_internal">internal <see cref="iTunes.IITEncoder"/> object.</param>
+            /// <returns>Returns a wrapped object implements <see cref="IEncoder"/>.</returns>
+            IEncoder CreateEncoder(iTunes.IITEncoder _internal);
+
+            /// <summary>
+            /// Returns a encoder collection object corresponding to a native encoder collection object.
+            /// </summary>
+            /// <param name="_internal">internal <see cref="iTunes.IITEncoderCollection"/> object.</param>
+            /// <returns>Returns a wrapped object implements <see cref="IEncoderCollection"/>.</returns>
+            IEncoderCollection CreateEncoderCollection(iTunes.IITEncoderCollection _internal);
+
+            /// <summary>
+            /// Returns a equalizer preset object corresponding to a native equalizer preset object.
+            /// </summary>
+            /// <param name="_internal">internal <see cref="iTunes.IITEQPreset"/> object.</param>
+            /// <returns>Returns a wrapped object implements <see cref="IEQPreset"/>.</returns>
+            IEQPreset CreateEQPreset(iTunes.IITEQPreset _internal);
+
+            /// <summary>
+            /// Returns a equalizer preset collection object corresponding to a native equalizer preset collection object.
+            /// </summary>
+            /// <param name="_internal">internal <see cref="iTunes.IITEQPresetCollection"/> object.</param>
+            /// <returns>Returns a wrapped object implements <see cref="IEQPresetCollection"/>.</returns>
+            IEQPresetCollection CreateEQPresetCollection(iTunes.IITEQPresetCollection _internal);
+
+            /// <summary>
+            /// Returns a visual object corresponding to a native visual object.
+            /// </summary>
+            /// <param name="_internal">internal <see cref="iTunes.IITVisual"/> object.</param>
+            /// <returns>Returns a wrapped object implements <see cref="IVisual"/>.</returns>
+            IVisual CreateVisual(iTunes.IITVisual _internal);
+
+            /// <summary>
+            /// Returns a visual collection object corresponding to a native visual collection object.
+            /// </summary>
+            /// <param name="_internal">internal <see cref="iTunes.IITVisualCollection"/> object.</param>
+            /// <returns>Returns a wrapped object implements <see cref="IVisualCollection"/>.</returns>
+            IVisualCollection CreateVisualCollection(iTunes.IITVisualCollection _internal);
+
+            /// <summary>
+            /// Returns a operation status object corresponding to a native operation status object.
+            /// </summary>
+            /// <param name="_internal">internal <see cref="iTunes.IITOperationStatus"/> object.</param>
+            /// <returns>Returns a wrapped object implements <see cref="IOperationStatus"/>.</returns>
+            IOperationStatus CreateOperationStatus(iTunes.IITOperationStatus _internal);
+
+            /// <summary>
+            /// Returns a convert operation status object corresponding to a native convert operation status object.
+            /// </summary>
+            /// <param name="_internal">internal <see cref="iTunes.iTunesConvertOperationStatus"/> object.</param>
+            /// <returns>Returns a wrapped object implements <see cref="IConvertOperationStatusWithEvents"/>.</returns>
+            IConvertOperationStatusWithEvents CreateConvertOperationStatus(iTunes.iTunesConvertOperationStatus _internal);
+        }
     }
 }

lang/csharp/iTunesCOMWrap/trunk/iTunesCOMWrap/Interfaces/IEQPresets.cs

@@ -1 +1 @@
 // $Id$
+using Clovery.iTunesHelper.COMWrap.Interfaces.Internal;
 using iTunes = iTunesLib;
 

lang/csharp/iTunesCOMWrap/trunk/iTunesCOMWrap/Interfaces/IEncoders.cs

@@ -1 +1 @@
 // $Id$
+using Clovery.iTunesHelper.COMWrap.Interfaces.Internal;
 using iTunes = iTunesLib;
 

lang/csharp/iTunesCOMWrap/trunk/iTunesCOMWrap/Interfaces/IPlaylists.cs

@@ -1 +1 @@
 // $Id$
 using System.Collections.Generic;
-
+using Clovery.iTunesHelper.COMWrap.Interfaces.Internal;
 using iTunes = iTunesLib;
 namespace Clovery.iTunesHelper.COMWrap.Interfaces
@@ -16 +16 @@
         ITrackCollection Tracks { get; }
         List<ITrack> SameTracks(ITrack track);
+        List<ITrack> SameTracks(IItemTrack track);
         List<ITrack> SameTracks(int trackDatabaseID, string name);
         List<ITrack> SameTracks(int trackDatabaseID);
@@ -77 +78 @@
     {
         List<IPlaylist> this[string Name, int? maxCounts] { get; }
+
+        IIndexedCollection<long, IPlaylist> ItemByPersistentID { get; }
     }
 
@@ -88 +91 @@
         IIndexedCollection<string, IPlaylist> ItemByName { get; }
     }
+
 }

lang/csharp/iTunesCOMWrap/trunk/iTunesCOMWrap/Interfaces/ISources.cs

@@ -1 +1 @@
 // $Id$
+using Clovery.iTunesHelper.COMWrap.Interfaces.Internal;
+
 namespace Clovery.iTunesHelper.COMWrap.Interfaces
 {
@@ -73 +75 @@
     }
 
-    public interface ISourceCollection : INamedCollection<ISource> { }
+    public interface ISourceCollection : INamedCollection<ISource>
+    {
+        IIndexedCollection<long, ISource> ItemByPersistentID { get; }
+    }
 }

lang/csharp/iTunesCOMWrap/trunk/iTunesCOMWrap/Interfaces/ITracks.cs

@@ -1 +1 @@
 // $Id$
 using System;
+using Clovery.iTunesHelper.COMWrap.Interfaces.Internal;
 using iTunes = iTunesLib;
 
@@ -242 +243 @@
 
         /// <summary>
+        /// Get a collection of playlists that contain the song that this track represents.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// This is the same collection of playlists that are shown in the "Show in Playlist" contextual menu for a track, 
+        /// plus the specific playlist that contains this track.
+        /// </para>
+        /// <para>
+        /// A track represents a song in a single playlist,
+        /// use <seealso cref="ITrack.Playlist" /> to get the specific playlist that contains this track.
+        /// </para>
+        /// </remarks>
+        IPlaylistCollection Playlists { get; }
+
+        /// <summary>
         /// Update the podcast feed for this track.
         /// </summary>
@@ -446 +462 @@
         /// </summary>
         IIndexedCollection<int, ITrack> ItemByPlayOrder { get; }
+
+        /// <summary>
+        /// Returns an ITrack object with the specified persistent ID.
+        /// </summary>
+        IIndexedCollection<long, ITrack> ItemByPersistentID { get; }
     }
 }

lang/csharp/iTunesCOMWrap/trunk/iTunesCOMWrap/Interfaces/IVisuals.cs

@@ -1 +1 @@
 // $Id$
+using Clovery.iTunesHelper.COMWrap.Interfaces.Internal;
 using iTunes = iTunesLib;
 

lang/csharp/iTunesCOMWrap/trunk/iTunesCOMWrap/Interfaces/IWindows.cs

@@ -1 +1 @@
 // $Id$
 using Clovery.iTunesHelper.COMWrap;
+using Clovery.iTunesHelper.COMWrap.Interfaces.Internal;
 
 namespace Clovery.iTunesHelper.COMWrap.Interfaces

lang/csharp/iTunesCOMWrap/trunk/iTunesCOMWrap/Playlists.cs

@@ -5 +5 @@
 using System.Linq;
 using Clovery.iTunesHelper.COMWrap.Interfaces;
+using Clovery.iTunesHelper.COMWrap.Interfaces.Internal;
+using Clovery.iTunesHelper.COMWrap.Internal;
 using iTunes = iTunesLib;
 
@@ -48 +50 @@
         }
 
+        public List<ITrack> SameTracks(IItemTrack track)
+        {
+            // fall quickly
+            var playlistCollection = track.Playlists;
+            if (playlistCollection == null || !playlistCollection.Contains(this))
+                return new List<ITrack>();
+            return this.SameTracks((ITrack) track);
+        }
+
         public List<ITrack> SameTracks(int trackDatabaseId, string name)
         {
@@ -322 +333 @@
     {
         private readonly IIndexedCollection<string, IPlaylist> _itemByName;
+        private readonly IIndexedCollection<long, IPlaylist> _itemByPersistentID;
 
         protected internal PlaylistCollection(iTunes.IITPlaylistCollection _internal, ITunesApp _app)
@@ -327 +339 @@
         {
             this._itemByName = new ParentStringIndexerReferrer<PlaylistCollection, IPlaylist>(this);
+            this._itemByPersistentID = new PlaylistPersistentIDIndex(this);
         }
 
@@ -370 +383 @@
         }
 
+        public IIndexedCollection<long, IPlaylist> ItemByPersistentID
+        {
+            get { return this._itemByPersistentID; }
+        }
+
         public IPlaylist CreateItem(iTunes.IITPlaylist item)
         {
@@ -383 +401 @@
     }
 
-    internal class ChildPlaylistCollection : IChildPlaylistCollection
+    namespace Internal
     {
-        private readonly IIndexedCollection<string, IPlaylist> _itemByName;
-        private readonly List<IPlaylist> list;
-
-        public ChildPlaylistCollection(IPlaylist parent, ISource source)
-        {
-            this.list = new List<IPlaylist>();
-            IUserPlaylist userPlaylist;
-            foreach (IPlaylist playlist in source.Playlists)
-            {
-                userPlaylist = playlist as IUserPlaylist;
-                if (userPlaylist == null)
-                    continue;
-                if (!userPlaylist.Parent.Equals(parent))
-                    continue;
-                this.list.Add(userPlaylist);
-            }
-            this._itemByName = new ParentStringIndexerReferrer<ChildPlaylistCollection, IPlaylist>(this);
-        }
-
-        public int Count
-        {
-            get { return this.list.Count; }
-        }
-
-        public IPlaylist this[int Index]
-        {
-            get { return this.list[Index]; }
-        }
-
-        public IPlaylist this[string Name]
-        {
-            get
-            {
-                List<IPlaylist> playlists = this[Name, 1];
-                return playlists.Count == 0 ? null : playlists[0];
-            }
-        }
-
-        public List<IPlaylist> this[string Name, int? maxCounts]
-        {
-            get
-            {
-                List<IPlaylist> playlists = new List<IPlaylist>();
-                foreach (IPlaylist playlist in this)
-                    if (playlist.Name == Name)
-                    {
-                        playlists.Add(playlist);
-                        if (maxCounts != null && --maxCounts == 0)
-                            return playlists;
-                    }
-                return playlists;
-            }
-        }
-
-        public IIndexedCollection<string, IPlaylist> ItemByName
-        {
-            get { return this._itemByName; }
-        }
-
-        ///<summary>
-        ///Returns an enumerator that iterates through the collection.
-        ///</summary>
-        ///
-        ///<returns>
-        ///A <see cref="T:System.Collections.Generic.IEnumerator`1"/> that can be used to iterate through the collection.
-        ///</returns>
-        ///<filterpriority>1</filterpriority>
-        IEnumerator<IPlaylist> IEnumerable<IPlaylist>.GetEnumerator()
-        {
-            return list.GetEnumerator();
-        }
-
-        ///<summary>
-        ///Returns an enumerator that iterates through a collection.
-        ///</summary>
-        ///
-        ///<returns>
-        ///An <see cref="T:System.Collections.IEnumerator"/> object that can be used to iterate through the collection.
-        ///</returns>
-        ///<filterpriority>2</filterpriority>
-        public IEnumerator GetEnumerator()
-        {
-            return ((IEnumerable<IPlaylist>)this).GetEnumerator();
+        internal class PlaylistPersistentIDIndex : IIndexedCollection<long, IPlaylist>
+        {
+            protected internal readonly PlaylistCollection _parent;
+
+            internal PlaylistPersistentIDIndex(PlaylistCollection _parent)
+            {
+                this._parent = _parent;
+            }
+
+            public IPlaylist this[long PersistentID]
+            {
+                get
+                {
+                    PlaylistCollection collection = this._parent;
+                    int highID, lowID;
+                    Utils.SplitInt64ToInt32(PersistentID, out highID, out lowID);
+                    return collection.CreateItem(collection._asIITPlaylistCollection.get_ItemByPersistentID(highID, lowID));
+                }
+            }
+        }
+
+        internal class ChildPlaylistCollection : IChildPlaylistCollection
+        {
+            private readonly IIndexedCollection<string, IPlaylist> _itemByName;
+            private readonly List<IPlaylist> list;
+
+            public ChildPlaylistCollection(IPlaylist parent, ISource source)
+            {
+                this.list = new List<IPlaylist>();
+                IUserPlaylist userPlaylist;
+                foreach (IPlaylist playlist in source.Playlists)
+                {
+                    userPlaylist = playlist as IUserPlaylist;
+                    if (userPlaylist == null)
+                        continue;
+                    if (!userPlaylist.Parent.Equals(parent))
+                        continue;
+                    this.list.Add(userPlaylist);
+                }
+                this._itemByName = new ParentStringIndexerReferrer<ChildPlaylistCollection, IPlaylist>(this);
+            }
+
+            public int Count
+            {
+                get { return this.list.Count; }
+            }
+
+            public IPlaylist this[int Index]
+            {
+                get { return this.list[Index]; }
+            }
+
+            public IPlaylist this[string Name]
+            {
+                get
+                {
+                    List<IPlaylist> playlists = this[Name, 1];
+                    return playlists.Count == 0 ? null : playlists[0];
+                }
+            }
+
+            public List<IPlaylist> this[string Name, int? maxCounts]
+            {
+                get
+                {
+                    List<IPlaylist> playlists = new List<IPlaylist>();
+                    foreach (IPlaylist playlist in this)
+                        if (playlist.Name == Name)
+                        {
+                            playlists.Add(playlist);
+                            if (maxCounts != null && --maxCounts == 0)
+                                return playlists;
+                        }
+                    return playlists;
+                }
+            }
+
+            public IIndexedCollection<string, IPlaylist> ItemByName
+            {
+                get { return this._itemByName; }
+            }
+
+            ///<summary>
+            ///Returns an enumerator that iterates through the collection.
+            ///</summary>
+            ///
+            ///<returns>
+            ///A <see cref="T:System.Collections.Generic.IEnumerator`1"/> that can be used to iterate through the collection.
+            ///</returns>
+            ///<filterpriority>1</filterpriority>
+            IEnumerator<IPlaylist> IEnumerable<IPlaylist>.GetEnumerator()
+            {
+                return this.list.GetEnumerator();
+            }
+
+            ///<summary>
+            ///Returns an enumerator that iterates through a collection.
+            ///</summary>
+            ///
+            ///<returns>
+            ///An <see cref="T:System.Collections.IEnumerator"/> object that can be used to iterate through the collection.
+            ///</returns>
+            ///<filterpriority>2</filterpriority>
+            public IEnumerator GetEnumerator()
+            {
+                return ((IEnumerable<IPlaylist>)this).GetEnumerator();
+            }
         }
     }
+
 }

lang/csharp/iTunesCOMWrap/trunk/iTunesCOMWrap/Properties/AssemblyInfo.cs

@@ -11 +11 @@
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyCompany("CodeRepos")]
 [assembly: AssemblyProduct("iTunesCOMWrap")]
 [assembly: AssemblyCopyright("Copyright © Topia 2008")]
@@ -38 +38 @@
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyFileVersion("1.0.*")]
 [assembly: InternalsVisibleTo("iTunesCOMWrapTests")]

lang/csharp/iTunesCOMWrap/trunk/iTunesCOMWrap/Sources.cs

@@ -5 +5 @@
 using System.Linq;
 using Clovery.iTunesHelper.COMWrap.Interfaces;
+using Clovery.iTunesHelper.COMWrap.Interfaces.Internal;
+using Clovery.iTunesHelper.COMWrap.Internal;
 using iTunes = iTunesLib;
 
@@ -114 +116 @@
     {
         private readonly IIndexedCollection<string, ISource> _itemByName;
+        private readonly IIndexedCollection<long, ISource> _itemByPersistentID;
 
         protected internal SourceCollection(iTunes.IITSourceCollection _internal, ITunesApp _app)
@@ -119 +122 @@
         {
             this._itemByName = new ParentStringIndexerReferrer<SourceCollection, ISource>(this);
+            this._itemByPersistentID = new SourcePersistentIDIndex(this);
         }
 
         protected internal iTunesLib.IITSourceCollection _asIITSourceCollection
         {
-            get { return (iTunesLib.IITSourceCollection) this._internal; }
+            get { return (iTunesLib.IITSourceCollection)this._internal; }
         }
 
@@ -146 +150 @@
         }
 
+        public IIndexedCollection<long, ISource> ItemByPersistentID
+        {
+            get { return this._itemByPersistentID; }
+        }
+
         public ISource CreateItem(iTunesLib.IITSource item)
         {
@@ -158 +167 @@
         }
     }
+
+    namespace Internal
+    {
+
+        internal class SourcePersistentIDIndex : IIndexedCollection<long, ISource>
+        {
+            protected internal readonly SourceCollection _parent;
+
+            internal SourcePersistentIDIndex(SourceCollection _parent)
+            {
+                this._parent = _parent;
+            }
+
+            public ISource this[long PersistentID]
+            {
+                get
+                {
+                    SourceCollection collection = this._parent;
+                    int highID, lowID;
+                    Utils.SplitInt64ToInt32(PersistentID, out highID, out lowID);
+                    return collection.CreateItem(collection._asIITSourceCollection.get_ItemByPersistentID(highID, lowID));
+                }
+            }
+        }
+    }
+
 }

lang/csharp/iTunesCOMWrap/trunk/iTunesCOMWrap/Tracks.cs

@@ -5 +5 @@
 using System.Linq;
 using Clovery.iTunesHelper.COMWrap.Interfaces;
+using Clovery.iTunesHelper.COMWrap.Interfaces.Internal;
+using Clovery.iTunesHelper.COMWrap.Internal;
 using iTunes = iTunesLib;
 
@@ -236 +238 @@
         private readonly IIndexedCollection<string, ITrack> _itemByName;
         private readonly IIndexedCollection<int, ITrack> _itemByPlayOrder;
+        private readonly IIndexedCollection<long, ITrack> _itemByPersistentID;
 
         public TrackCollection(iTunes.IITTrackCollection _internal, ITunesApp _app)
@@ -242 +245 @@
             this._itemByName = new ParentStringIndexerReferrer<TrackCollection, ITrack>(this);
             this._itemByPlayOrder = new TrackPlayOrderIndex(this);
+            this._itemByPersistentID = new TrackPersistentIDIndex(this);
         }
 
@@ -277 +281 @@
         {
             get { return this._itemByPlayOrder; }
+        }
+
+        public IIndexedCollection<long, ITrack> ItemByPersistentID
+        {
+            get { return this._itemByPersistentID; }
         }
 
@@ -287 +296 @@
     }
 
-    internal class TrackPlayOrderIndex : IIndexedCollection<int, ITrack>
-    {
-        protected internal readonly TrackCollection _parent;
-
-        internal TrackPlayOrderIndex(TrackCollection _parent)
-        {
-            this._parent = _parent;
-        }
-
-        public ITrack this[int Index]
-        {
-            get
-            {
-                TrackCollection collection = this._parent;
-                return collection.CreateItem(collection._asIITTrackCollection.get_ItemByPlayOrder(Index));
-            }
-        }
-    }
-
     internal class FileOrCDTrack : Track, IFileOrCDTrack
     {
@@ -394 +384 @@
             get
             {
-                Int64 high = this._asIITFileOrCDTrack.Size64High;
-                UInt32 low = (UInt32) this._asIITFileOrCDTrack.Size64Low;
-                return high << 32 | low;
+                return Utils.JoinInt32ToInt64(this._asIITFileOrCDTrack.Size64High,
+                                                       this._asIITFileOrCDTrack.Size64Low);
             }
         }
@@ -504 +493 @@
         {
             get { return this._asIITFileOrCDTrack.Location; }
+        }
+
+        public IPlaylistCollection Playlists
+        {
+            get { return this.factory.CreatePlaylistCollection(this._asIITFileOrCDTrack.Playlists); }
         }
     }
@@ -577 +571 @@
             get { return (RatingKind) this._asIITURLTrack.ratingKind; }
         }
+
+        public IPlaylistCollection Playlists
+        {
+            get { return this.factory.CreatePlaylistCollection(this._asIITURLTrack.Playlists); }
+        }
+    }
+
+    namespace Internal
+    {
+        internal class TrackPlayOrderIndex : IIndexedCollection<int, ITrack>
+        {
+            protected internal readonly TrackCollection _parent;
+
+            internal TrackPlayOrderIndex(TrackCollection _parent)
+            {
+                this._parent = _parent;
+            }
+
+            public ITrack this[int Index]
+            {
+                get
+                {
+                    TrackCollection collection = this._parent;
+                    return collection.CreateItem(collection._asIITTrackCollection.get_ItemByPlayOrder(Index));
+                }
+            }
+        }
+
+        internal class TrackPersistentIDIndex : IIndexedCollection<long, ITrack>
+        {
+            protected internal readonly TrackCollection _parent;
+
+            internal TrackPersistentIDIndex(TrackCollection _parent)
+            {
+                this._parent = _parent;
+            }
+
+            public ITrack this[long PersistentID]
+            {
+                get
+                {
+                    TrackCollection collection = this._parent;
+                    int highID, lowID;
+                    Utils.SplitInt64ToInt32(PersistentID, out highID, out lowID);
+                    return collection.CreateItem(collection._asIITTrackCollection.get_ItemByPersistentID(highID, lowID));
+                }
+            }
+        }
+
     }
 }

lang/csharp/iTunesCOMWrap/trunk/iTunesCOMWrap/Visuals.cs

@@ -4 +4 @@
 using System.Linq;
 using Clovery.iTunesHelper.COMWrap.Interfaces;
+using Clovery.iTunesHelper.COMWrap.Interfaces.Internal;
+using Clovery.iTunesHelper.COMWrap.Internal;
 using iTunes = iTunesLib;
 

lang/csharp/iTunesCOMWrap/trunk/iTunesCOMWrap/Windows.cs

@@ -5 +5 @@
 using System.Linq;
 using Clovery.iTunesHelper.COMWrap.Interfaces;
+using Clovery.iTunesHelper.COMWrap.Interfaces.Internal;
+using Clovery.iTunesHelper.COMWrap.Internal;
 using iTunes = iTunesLib;
 

lang/csharp/iTunesCOMWrap/trunk/iTunesCOMWrap/iTunesCOMWrap.csproj

@@ -4 +4 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C2C2BB60-561C-4A96-8CAE-1777755BC369}</ProjectGuid>
@@ -71 +71 @@
     <Compile Include="Sources.cs" />
     <Compile Include="Tracks.cs" />
+    <Compile Include="Utils.cs" />
     <Compile Include="Visuals.cs" />
     <Compile Include="Windows.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="TODO.txt" />
   </ItemGroup>
   <ItemGroup>
@@ -78 +82 @@
       <Guid>{9E93C96F-CF0D-43F6-8BA8-B807A3370712}</Guid>
       <VersionMajor>1</VersionMajor>
-      <VersionMinor>10</VersionMinor>
+      <VersionMinor>11</VersionMinor>
       <Lcid>0</Lcid>
       <WrapperTool>tlbimp</WrapperTool>
       <Isolated>False</Isolated>
     </COMReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="TODO.txt" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />