Author: jwilcox
Date: 2006-06-16 12:58:27 -0400 (Fri, 16 Jun 2006)
New Revision: 61806
Modified:
trunk/ipod-sharp/ChangeLog
trunk/ipod-sharp/src/Playlist.cs
trunk/ipod-sharp/src/TrackDatabase.cs
trunk/ipod-sharp/tests/IPodTests.cs
trunk/ipod-sharp/tools/PodTool.cs
Log:
2006-06-16 James Willcox <[EMAIL PROTECTED]>
* Use IList<T> instead of ReadOnlyCollection<T> in the public API
Modified: trunk/ipod-sharp/ChangeLog
===================================================================
--- trunk/ipod-sharp/ChangeLog 2006-06-16 16:43:25 UTC (rev 61805)
+++ trunk/ipod-sharp/ChangeLog 2006-06-16 16:58:27 UTC (rev 61806)
@@ -1,5 +1,9 @@
2006-06-16 James Willcox <[EMAIL PROTECTED]>
+ * Use IList<T> instead of ReadOnlyCollection<T> in the public API
+
+2006-06-16 James Willcox <[EMAIL PROTECTED]>
+
* src/PhotoDatabase.cs: read/write the full size image records
2006-06-16 James Willcox <[EMAIL PROTECTED]>
Modified: trunk/ipod-sharp/src/Playlist.cs
===================================================================
--- trunk/ipod-sharp/src/Playlist.cs 2006-06-16 16:43:25 UTC (rev 61805)
+++ trunk/ipod-sharp/src/Playlist.cs 2006-06-16 16:58:27 UTC (rev 61806)
@@ -32,7 +32,7 @@
this.record = record;
}
- public ReadOnlyCollection<Track> Tracks {
+ public IList<Track> Tracks {
get {
if (IsOnTheGo)
return new ReadOnlyCollection<Track> (otgtracks);
Modified: trunk/ipod-sharp/src/TrackDatabase.cs
===================================================================
--- trunk/ipod-sharp/src/TrackDatabase.cs 2006-06-16 16:43:25 UTC (rev
61805)
+++ trunk/ipod-sharp/src/TrackDatabase.cs 2006-06-16 16:58:27 UTC (rev
61806)
@@ -284,7 +284,7 @@
}
}
- public ReadOnlyCollection<PlaylistItemRecord> Items {
+ public IList<PlaylistItemRecord> Items {
get {
return new ReadOnlyCollection<PlaylistItemRecord>
(playlistItems);
}
@@ -548,7 +548,7 @@
}
}
- public ReadOnlyCollection<PlaylistRecord> Playlists {
+ public IList<PlaylistRecord> Playlists {
get {
return new ReadOnlyCollection<PlaylistRecord> (playlists);
}
@@ -877,7 +877,7 @@
public int SeasonNumber;
public int EpisodeNumber;
- public ReadOnlyCollection<DetailRecord> Details {
+ public IList<DetailRecord> Details {
get { return new ReadOnlyCollection<DetailRecord> (details); }
}
@@ -1163,7 +1163,7 @@
private List<TrackRecord> tracks = new List<TrackRecord> ();
- public ReadOnlyCollection<TrackRecord> Tracks {
+ public IList<TrackRecord> Tracks {
get { return new ReadOnlyCollection<TrackRecord> (tracks); }
}
@@ -1562,19 +1562,19 @@
get { return ControlPath + "iTunes/Play Counts"; }
}
- public ReadOnlyCollection<Track> Tracks {
+ public IList<Track> Tracks {
get {
return new ReadOnlyCollection<Track> (tracks);
}
}
- public ReadOnlyCollection<Playlist> Playlists {
+ public IList<Playlist> Playlists {
get {
return new ReadOnlyCollection<Playlist> (playlists);
}
}
- public ReadOnlyCollection<Playlist> OnTheGoPlaylists {
+ public IList<Playlist> OnTheGoPlaylists {
get {
return new ReadOnlyCollection<Playlist> (otgPlaylists);
}
Modified: trunk/ipod-sharp/tests/IPodTests.cs
===================================================================
--- trunk/ipod-sharp/tests/IPodTests.cs 2006-06-16 16:43:25 UTC (rev 61805)
+++ trunk/ipod-sharp/tests/IPodTests.cs 2006-06-16 16:58:27 UTC (rev 61806)
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
-using System.Collections.ObjectModel;
using System.Diagnostics;
using System.IO;
using NUnit.Framework;
@@ -64,7 +63,7 @@
if (proc.ExitCode != 0)
throw new ApplicationException ("Unable to untar test: " +
errors);
- Directory.Move ("ipod-test-db", testdir + "/" + "ipod-test-db");
+ Directory.Move ("ipod-test-db", testdir + "/ipod-test-db");
return GetDevice ();
}
@@ -442,7 +441,7 @@
public void ModifyOTGNameTest () {
TrackDatabase db = OpenDevice ().TrackDatabase;
- ReadOnlyCollection<Playlist> lists = db.OnTheGoPlaylists;
+ IList<Playlist> lists = db.OnTheGoPlaylists;
if (lists.Count == 0)
throw new InvalidOperationException ("no lists");
@@ -457,7 +456,7 @@
Track track = AddTrack (db);
- ReadOnlyCollection<Playlist> lists = db.OnTheGoPlaylists;
+ IList<Playlist> lists = db.OnTheGoPlaylists;
if (lists.Count == 0)
throw new InvalidOperationException ("no lists");
@@ -470,7 +469,7 @@
public void RemoveOTGTrackTest () {
TrackDatabase db = OpenDevice ().TrackDatabase;
- ReadOnlyCollection<Playlist> lists = db.OnTheGoPlaylists;
+ IList<Playlist> lists = db.OnTheGoPlaylists;
// make nunit happy if there were no tracks or playlists
if (lists.Count == 0 || lists[0].Tracks.Count == 0)
@@ -488,7 +487,7 @@
public void RemoveOTGPlaylistTest () {
TrackDatabase db = OpenDevice ().TrackDatabase;
- ReadOnlyCollection<Playlist> lists = db.OnTheGoPlaylists;
+ IList<Playlist> lists = db.OnTheGoPlaylists;
// make nunit stfu
if (lists.Count == 0)
Modified: trunk/ipod-sharp/tools/PodTool.cs
===================================================================
--- trunk/ipod-sharp/tools/PodTool.cs 2006-06-16 16:43:25 UTC (rev 61805)
+++ trunk/ipod-sharp/tools/PodTool.cs 2006-06-16 16:58:27 UTC (rev 61806)
@@ -64,7 +64,7 @@
string dest = args[2];
int count = 1;
- int total = db.Tracks.Length;
+ int total = db.Tracks.Count;
foreach (Track track in db.Tracks) {
string path = GetTrackPath (dest, track);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
