Changeset 19308

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.

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>