banshee r3732 - in trunk/banshee: . src/Clients/Nereid/Nereid src/Core/Banshee.Services src/Core/Banshee.Services/Banshee.Collection src/Core/Banshee.Services/Banshee.Collection.Database src/Core/Banshee.Services/Banshee.Playlist src/Core/Banshee.Services/Banshee.Sources src/Core/Banshee.ThickClient/Banshee.Gui src/Extensions/Banshee.Daap/Banshee.Daap src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue
- From: gburt svn gnome org
- To: svn-commits-list gnome org
- Subject: banshee r3732 - in trunk/banshee: . src/Clients/Nereid/Nereid src/Core/Banshee.Services src/Core/Banshee.Services/Banshee.Collection src/Core/Banshee.Services/Banshee.Collection.Database src/Core/Banshee.Services/Banshee.Playlist src/Core/Banshee.Services/Banshee.Sources src/Core/Banshee.ThickClient/Banshee.Gui src/Extensions/Banshee.Daap/Banshee.Daap src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue
- Date: Wed, 9 Apr 2008 21:04:50 +0100 (BST)
Author: gburt
Date: Wed Apr 9 21:04:49 2008
New Revision: 3732
URL: http://svn.gnome.org/viewvc/banshee?rev=3732&view=rev
Log:
2008-04-09 Gabriel Burt <gabriel burt gmail com>
* src/Clients/Nereid/Nereid/PlayerInterface.cs:
* src/Core/Banshee.Services/Banshee.Collection.Database/AlbumListDatabaseModel.cs:
* src/Core/Banshee.Services/Banshee.Collection.Database/ArtistListDatabaseModel.cs:
* src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:
* src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistListModel.cs:
* src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackListModel.cs:
* src/Core/Banshee.Services/Banshee.Collection.Database/TrackListDatabaseModel.cs:
* src/Core/Banshee.Services/Banshee.Collection/IHasTrackSelection.cs:
* src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:
* src/Core/Banshee.Services/Banshee.Services.mdp:
* src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs:
* src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:
* src/Core/Banshee.Services/Makefile.am:
* src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:
* src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs:
* src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:
Rename *ListDatabaseModel to Database*ListModel.
Added:
trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs (contents, props changed)
- copied, changed from r3727, /trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/AlbumListDatabaseModel.cs
trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistListModel.cs (contents, props changed)
- copied, changed from r3727, /trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/ArtistListDatabaseModel.cs
trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackListModel.cs (contents, props changed)
- copied, changed from r3727, /trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/TrackListDatabaseModel.cs
Removed:
trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/AlbumListDatabaseModel.cs
trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/ArtistListDatabaseModel.cs
trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/TrackListDatabaseModel.cs
Modified:
trunk/banshee/ChangeLog
trunk/banshee/src/Clients/Nereid/Nereid/PlayerInterface.cs
trunk/banshee/src/Core/Banshee.Services/Banshee.Collection/IHasTrackSelection.cs
trunk/banshee/src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs
trunk/banshee/src/Core/Banshee.Services/Banshee.Services.mdp
trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs
trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs
trunk/banshee/src/Core/Banshee.Services/Makefile.am
trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs
trunk/banshee/src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs
trunk/banshee/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs
Modified: trunk/banshee/src/Clients/Nereid/Nereid/PlayerInterface.cs
==============================================================================
--- trunk/banshee/src/Clients/Nereid/Nereid/PlayerInterface.cs (original)
+++ trunk/banshee/src/Clients/Nereid/Nereid/PlayerInterface.cs Wed Apr 9 21:04:49 2008
@@ -410,8 +410,8 @@
get { return composite_view.TrackView.SelectionProxy; }
}
- public TrackListDatabaseModel TrackModel {
- get { return composite_view.TrackModel as TrackListDatabaseModel; }
+ public DatabaseTrackListModel TrackModel {
+ get { return composite_view.TrackModel as DatabaseTrackListModel; }
}
// IHasSourceView
Copied: trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs (from r3727, /trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/AlbumListDatabaseModel.cs)
==============================================================================
--- /trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/AlbumListDatabaseModel.cs (original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs Wed Apr 9 21:04:49 2008
@@ -1,5 +1,5 @@
//
-// AlbumListDatabaseModel.cs
+// DatabaseAlbumListModel.cs
//
// Author:
// Aaron Bockover <abockover novell com>
@@ -39,19 +39,19 @@
namespace Banshee.Collection.Database
{
- public class AlbumListDatabaseModel : AlbumListModel, ICacheableDatabaseModel
+ public class DatabaseAlbumListModel : AlbumListModel, ICacheableDatabaseModel
{
private readonly BansheeModelProvider<DatabaseAlbumInfo> provider;
private readonly BansheeModelCache<DatabaseAlbumInfo> cache;
- private readonly TrackListDatabaseModel track_model;
- private readonly ArtistListDatabaseModel artist_model;
+ private readonly DatabaseTrackListModel track_model;
+ private readonly DatabaseArtistListModel artist_model;
private long count;
private string artist_id_filter_query;
private string reload_fragment;
private readonly AlbumInfo select_all_album = new AlbumInfo (null);
- public AlbumListDatabaseModel (BansheeDbConnection connection, string uuid)
+ public DatabaseAlbumListModel (BansheeDbConnection connection, string uuid)
{
provider = DatabaseAlbumInfo.Provider;
cache = new BansheeModelCache <DatabaseAlbumInfo> (connection, uuid, this, provider);
@@ -60,7 +60,7 @@
Selection.Changed += HandleSelectionChanged;
}
- public AlbumListDatabaseModel (TrackListDatabaseModel trackModel, ArtistListDatabaseModel artistModel,
+ public DatabaseAlbumListModel (DatabaseTrackListModel trackModel, DatabaseArtistListModel artistModel,
BansheeDbConnection connection, string uuid) : this (connection, uuid)
{
this.track_model = trackModel;
Copied: trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistListModel.cs (from r3727, /trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/ArtistListDatabaseModel.cs)
==============================================================================
--- /trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/ArtistListDatabaseModel.cs (original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistListModel.cs Wed Apr 9 21:04:49 2008
@@ -1,5 +1,5 @@
//
-// ArtistListDatabaseModel.cs
+// DatabaseArtistListModel.cs
//
// Author:
// Aaron Bockover <abockover novell com>
@@ -38,17 +38,17 @@
namespace Banshee.Collection.Database
{
- public class ArtistListDatabaseModel : ArtistListModel, ICacheableDatabaseModel
+ public class DatabaseArtistListModel : ArtistListModel, ICacheableDatabaseModel
{
private readonly BansheeModelProvider<DatabaseArtistInfo> provider;
private readonly BansheeModelCache<DatabaseArtistInfo> cache;
- private readonly TrackListDatabaseModel track_model;
+ private readonly DatabaseTrackListModel track_model;
private string reload_fragment;
private long count;
private readonly ArtistInfo select_all_artist = new ArtistInfo(null);
- public ArtistListDatabaseModel(BansheeDbConnection connection, string uuid)
+ public DatabaseArtistListModel (BansheeDbConnection connection, string uuid)
{
provider = DatabaseArtistInfo.Provider;
cache = new BansheeModelCache <DatabaseArtistInfo> (connection, uuid, this, provider);
@@ -57,7 +57,7 @@
Selection.Changed += HandleSelectionChanged;
}
- public ArtistListDatabaseModel(TrackListDatabaseModel trackModel, BansheeDbConnection connection, string uuid) : this (connection, uuid)
+ public DatabaseArtistListModel(DatabaseTrackListModel trackModel, BansheeDbConnection connection, string uuid) : this (connection, uuid)
{
this.track_model = trackModel;
}
Copied: trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackListModel.cs (from r3727, /trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/TrackListDatabaseModel.cs)
==============================================================================
--- /trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/TrackListDatabaseModel.cs (original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackListModel.cs Wed Apr 9 21:04:49 2008
@@ -1,5 +1,5 @@
//
-// TrackListDatabaseModel.cs
+// DatabaseTrackListModel.cs
//
// Author:
// Aaron Bockover <abockover novell com>
@@ -51,7 +51,7 @@
AlbumFilter
};
- public class TrackListDatabaseModel : TrackListModel, IExportableModel,
+ public class DatabaseTrackListModel : TrackListModel, IExportableModel,
ICacheableDatabaseModel, IFilterable, ISortable, ICareAboutView
{
private readonly BansheeDbConnection connection;
@@ -75,14 +75,14 @@
private string artist_id_filter_query;
private string album_id_filter_query;
- private ArtistListDatabaseModel artist_model;
- private AlbumListDatabaseModel album_model;
+ private DatabaseArtistListModel artist_model;
+ private DatabaseAlbumListModel album_model;
private string uuid;
private int rows_in_view;
- public TrackListDatabaseModel (BansheeDbConnection connection, string uuid)
+ public DatabaseTrackListModel (BansheeDbConnection connection, string uuid)
{
this.connection = connection;
this.uuid = uuid;
@@ -90,7 +90,7 @@
}
private bool initialized = false;
- public void Initialize (ArtistListDatabaseModel artist_model, AlbumListDatabaseModel album_model)
+ public void Initialize (DatabaseArtistListModel artist_model, DatabaseAlbumListModel album_model)
{
if (initialized)
return;
Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Collection/IHasTrackSelection.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Collection/IHasTrackSelection.cs (original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Collection/IHasTrackSelection.cs Wed Apr 9 21:04:49 2008
@@ -37,7 +37,7 @@
public interface IHasTrackSelection
{
SelectionProxy TrackSelectionProxy { get; }
- TrackListDatabaseModel TrackModel { get; }
+ DatabaseTrackListModel TrackModel { get; }
IEnumerable<TrackInfo> GetSelectedTracks ();
}
}
Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs (original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs Wed Apr 9 21:04:49 2008
@@ -122,11 +122,11 @@
public override void MergeSourceInput (Source from, SourceMergeType mergeType)
{
DatabaseSource source = from as DatabaseSource;
- if (source == null || !(source.TrackModel is TrackListDatabaseModel)) {
+ if (source == null || !(source.TrackModel is DatabaseTrackListModel)) {
return;
}
- TrackListDatabaseModel model = (TrackListDatabaseModel)source.TrackModel;
+ DatabaseTrackListModel model = (DatabaseTrackListModel)source.TrackModel;
switch (mergeType) {
case SourceMergeType.ModelSelection:
@@ -191,7 +191,7 @@
}
// Have our parent handle deleting tracks
- public override void DeleteSelectedTracks (TrackListDatabaseModel model)
+ public override void DeleteSelectedTracks (DatabaseTrackListModel model)
{
(Parent as DatabaseSource).DeleteSelectedTracks (model);
}
@@ -245,9 +245,9 @@
}
}
- TrackListDatabaseModel last_add_range_from_model;
+ DatabaseTrackListModel last_add_range_from_model;
HyenaSqliteCommand last_add_range_command = null;
- protected override void AddTrackRange (TrackListDatabaseModel from, RangeCollection.Range range)
+ protected override void AddTrackRange (DatabaseTrackListModel from, RangeCollection.Range range)
{
last_add_range_command = (!from.CachesJoinTableEntries)
? add_track_range_command
@@ -261,7 +261,7 @@
last_add_range_from_model = from;
}
- protected override void RemoveTrackRange (TrackListDatabaseModel from, RangeCollection.Range range)
+ protected override void RemoveTrackRange (DatabaseTrackListModel from, RangeCollection.Range range)
{
remove_track_range_command.ApplyValues (DbId, from.CacheId, range.Start, range.End - range.Start + 1);
ServiceManager.DbConnection.Execute (remove_track_range_command);
Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Services.mdp
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Services.mdp (original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Services.mdp Wed Apr 9 21:04:49 2008
@@ -10,10 +10,10 @@
<Contents>
<File name="Banshee.Database/BansheeDbConnection.cs" subtype="Code" buildaction="Compile" />
<File name="Banshee.Database/BansheeDbFormatMigrator.cs" subtype="Code" buildaction="Compile" />
- <File name="Banshee.Collection.Database/AlbumListDatabaseModel.cs" subtype="Code" buildaction="Compile" />
- <File name="Banshee.Collection.Database/ArtistListDatabaseModel.cs" subtype="Code" buildaction="Compile" />
+ <File name="Banshee.Collection.Database/DatabaseAlbumListModel.cs" subtype="Code" buildaction="Compile" />
+ <File name="Banshee.Collection.Database/DatabaseArtistListModel.cs" subtype="Code" buildaction="Compile" />
<File name="Banshee.Collection.Database/DatabaseTrackInfo.cs" subtype="Code" buildaction="Compile" />
- <File name="Banshee.Collection.Database/TrackListDatabaseModel.cs" subtype="Code" buildaction="Compile" />
+ <File name="Banshee.Collection.Database/DatabaseTrackListModel.cs" subtype="Code" buildaction="Compile" />
<File name="Banshee.Sources/Source.cs" subtype="Code" buildaction="Compile" />
<File name="Banshee.Sources/SourceManager.cs" subtype="Code" buildaction="Compile" />
<File name="Banshee.Sources/DatabaseSource.cs" subtype="Code" buildaction="Compile" />
@@ -168,4 +168,4 @@
<AsmRefVar />
<ProjectRefVar />
</MonoDevelop.Autotools.MakefileInfo>
-</Project>
\ No newline at end of file
+</Project>
Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs (original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs Wed Apr 9 21:04:49 2008
@@ -49,11 +49,11 @@
{
public abstract class DatabaseSource : Source, ITrackModelSource, IDurationAggregator, IFileSizeAggregator
{
- protected delegate void TrackRangeHandler (TrackListDatabaseModel model, RangeCollection.Range range);
+ protected delegate void TrackRangeHandler (DatabaseTrackListModel model, RangeCollection.Range range);
- protected TrackListDatabaseModel track_model;
- protected AlbumListDatabaseModel album_model;
- protected ArtistListDatabaseModel artist_model;
+ protected DatabaseTrackListModel track_model;
+ protected DatabaseAlbumListModel album_model;
+ protected DatabaseArtistListModel artist_model;
protected RateLimiter reload_limiter;
@@ -80,9 +80,9 @@
private void DatabaseSourceInitialize ()
{
- track_model = new TrackListDatabaseModel (ServiceManager.DbConnection, UniqueId);
- artist_model = new ArtistListDatabaseModel (track_model, ServiceManager.DbConnection, UniqueId);
- album_model = new AlbumListDatabaseModel (track_model, artist_model, ServiceManager.DbConnection, UniqueId);
+ track_model = new DatabaseTrackListModel (ServiceManager.DbConnection, UniqueId);
+ artist_model = new DatabaseArtistListModel (track_model, ServiceManager.DbConnection, UniqueId);
+ album_model = new DatabaseAlbumListModel (track_model, artist_model, ServiceManager.DbConnection, UniqueId);
reload_limiter = new RateLimiter (RateLimitedReload);
}
@@ -194,7 +194,7 @@
RemoveSelectedTracks (track_model);
}
- public virtual void RemoveSelectedTracks (TrackListDatabaseModel model)
+ public virtual void RemoveSelectedTracks (DatabaseTrackListModel model)
{
WithTrackSelection (model, RemoveTrackRange);
OnTracksRemoved ();
@@ -205,7 +205,7 @@
DeleteSelectedTracks (track_model);
}
- public virtual void DeleteSelectedTracks (TrackListDatabaseModel model)
+ public virtual void DeleteSelectedTracks (DatabaseTrackListModel model)
{
WithTrackSelection (model, DeleteTrackRange);
OnTracksDeleted ();
@@ -216,7 +216,7 @@
if (!AcceptsInputFromSource (source))
return;
- TrackListDatabaseModel model = (source as ITrackModelSource).TrackModel as TrackListDatabaseModel;
+ DatabaseTrackListModel model = (source as ITrackModelSource).TrackModel as DatabaseTrackListModel;
WithTrackSelection (model, AddTrackRange);
OnTracksAdded ();
}
@@ -226,7 +226,7 @@
RateSelectedTracks (track_model, rating);
}
- public virtual void RateSelectedTracks (TrackListDatabaseModel model, int rating)
+ public virtual void RateSelectedTracks (DatabaseTrackListModel model, int rating)
{
Selection selection = model.Selection;
if (selection.Count == 0)
@@ -335,29 +335,29 @@
});
}
- protected virtual void RemoveTrackRange (TrackListDatabaseModel model, RangeCollection.Range range)
+ protected virtual void RemoveTrackRange (DatabaseTrackListModel model, RangeCollection.Range range)
{
throw new NotImplementedException();
}
- protected virtual void DeleteTrackRange (TrackListDatabaseModel model, RangeCollection.Range range)
+ protected virtual void DeleteTrackRange (DatabaseTrackListModel model, RangeCollection.Range range)
{
throw new NotImplementedException();
}
- protected virtual void AddTrackRange (TrackListDatabaseModel model, RangeCollection.Range range)
+ protected virtual void AddTrackRange (DatabaseTrackListModel model, RangeCollection.Range range)
{
throw new NotImplementedException();
}
- protected virtual void RateTrackRange (TrackListDatabaseModel model, RangeCollection.Range range, int rating)
+ protected virtual void RateTrackRange (DatabaseTrackListModel model, RangeCollection.Range range, int rating)
{
RateTrackRangeCommand.ApplyValues (rating, DateTime.Now, range.Start, range.End - range.Start + 1);
ServiceManager.DbConnection.Execute (RateTrackRangeCommand);
}
- protected void WithTrackSelection (TrackListDatabaseModel model, TrackRangeHandler handler)
+ protected void WithTrackSelection (DatabaseTrackListModel model, TrackRangeHandler handler)
{
Selection selection = model.Selection;
if (selection.Count == 0)
Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs (original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs Wed Apr 9 21:04:49 2008
@@ -269,7 +269,7 @@
OnTracksDeleted ();
}
- protected override void RemoveTrackRange (TrackListDatabaseModel model, RangeCollection.Range range)
+ protected override void RemoveTrackRange (DatabaseTrackListModel model, RangeCollection.Range range)
{
ServiceManager.DbConnection.Execute (
String.Format (remove_range_sql, model.TrackIdsSql),
@@ -279,7 +279,7 @@
);
}
- protected override void DeleteTrackRange (TrackListDatabaseModel model, RangeCollection.Range range)
+ protected override void DeleteTrackRange (DatabaseTrackListModel model, RangeCollection.Range range)
{
// Remove from file system
for (int i = range.Start; i <= range.End; i++) {
@@ -320,7 +320,7 @@
*/
}
- protected override void AddTrackRange (TrackListDatabaseModel model, RangeCollection.Range range)
+ protected override void AddTrackRange (DatabaseTrackListModel model, RangeCollection.Range range)
{
for (int i = range.Start; i <= range.End; i++) {
DatabaseTrackInfo track = model [i] as DatabaseTrackInfo;
Modified: trunk/banshee/src/Core/Banshee.Services/Makefile.am
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Makefile.am (original)
+++ trunk/banshee/src/Core/Banshee.Services/Makefile.am Wed Apr 9 21:04:49 2008
@@ -5,13 +5,13 @@
SOURCES = \
Banshee.Base/RateLimiter.cs \
Banshee.Base/ThreadAssist.cs \
- Banshee.Collection.Database/AlbumListDatabaseModel.cs \
- Banshee.Collection.Database/ArtistListDatabaseModel.cs \
+ Banshee.Collection.Database/DatabaseAlbumListModel.cs \
+ Banshee.Collection.Database/DatabaseArtistListModel.cs \
Banshee.Collection.Database/DatabaseAlbumInfo.cs \
Banshee.Collection.Database/DatabaseArtistInfo.cs \
Banshee.Collection.Database/DatabaseImportManager.cs \
Banshee.Collection.Database/DatabaseTrackInfo.cs \
- Banshee.Collection.Database/TrackListDatabaseModel.cs \
+ Banshee.Collection.Database/DatabaseTrackListModel.cs \
Banshee.Collection/AlbumListModel.cs \
Banshee.Collection/ArtistListModel.cs \
Banshee.Collection/BansheeListModel.cs \
Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs (original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs Wed Apr 9 21:04:49 2008
@@ -368,7 +368,7 @@
}
ThreadAssist.SpawnFromMain (delegate {
- library.RemoveSelectedTracks (source.TrackModel as TrackListDatabaseModel);
+ library.RemoveSelectedTracks (source.TrackModel as DatabaseTrackListModel);
});
}
}
Modified: trunk/banshee/src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs (original)
+++ trunk/banshee/src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs Wed Apr 9 21:04:49 2008
@@ -140,7 +140,7 @@
// Remove tracks associated with this source, since we don't want
// them after we unmap - we'll refetch.
if (Count > 0) {
- RemoveTrackRange ((TrackListDatabaseModel)TrackModel, new Hyena.Collections.RangeCollection.Range (0, Count));
+ RemoveTrackRange ((DatabaseTrackListModel)TrackModel, new Hyena.Collections.RangeCollection.Range (0, Count));
}
daap_track_map.Clear ();
Modified: trunk/banshee/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs (original)
+++ trunk/banshee/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs Wed Apr 9 21:04:49 2008
@@ -62,7 +62,7 @@
Properties.SetString ("Icon.Name", "source-playlist");
Properties.SetString ("RemoveTracksActionLabel", Catalog.GetString ("Remove From Play Queue"));
- ((TrackListDatabaseModel)TrackModel).ForcedSortQuery = "CorePlaylistEntries.EntryID ASC";
+ ((DatabaseTrackListModel)TrackModel).ForcedSortQuery = "CorePlaylistEntries.EntryID ASC";
ServiceManager.PlayerEngine.EventChanged += OnPlayerEngineEventChanged;
ServiceManager.PlaybackController.Transition += OnCanonicalPlaybackControllerTransition;
@@ -179,7 +179,7 @@
private void OnClearPlayQueue (object o, EventArgs args)
{
- RemoveTrackRange ((TrackListDatabaseModel)TrackModel, new Hyena.Collections.RangeCollection.Range (0, Count));
+ RemoveTrackRange ((DatabaseTrackListModel)TrackModel, new Hyena.Collections.RangeCollection.Range (0, Count));
Reload ();
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
