banshee r3207 - in trunk/banshee: . src/Core/Banshee.Services/Banshee.AudioProfiles src/Core/Banshee.Services/Banshee.Collection.Database src/Core/Banshee.Services/Banshee.Database src/Core/Banshee.Services/Banshee.Library src/Core/Banshee.Services/Banshee.PlaybackController

[abock svn gnome org]

Author: abock
Date: Sun Feb 10 21:30:08 2008
New Revision: 3207
URL: http://svn.gnome.org/viewvc/banshee?rev=3207&view=rev

Log:
2008-02-10  Aaron Bockover  <abock gnome org>

    * src/Core/Banshee.Services/Banshee.AudioProfiles/ProfileConfiguration.cs:
    * src/Core/Banshee.Services/Banshee.AudioProfiles/ProfileManager.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/LibraryTrackInfo.cs:
    * src/Core/Banshee.Services/Banshee.Database/BansheeDbConnection.cs:
    * src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:
    * src/Core/Banshee.Services/Banshee.PlaybackController/ICanonicalPlaybackController.cs:
    Cleaned up a lot of compiler warnings


Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Core/Banshee.Services/Banshee.AudioProfiles/ProfileConfiguration.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.AudioProfiles/ProfileManager.cs
   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/LibraryTrackInfo.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Database/BansheeDbConnection.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.PlaybackController/ICanonicalPlaybackController.cs

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.AudioProfiles/ProfileConfiguration.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.AudioProfiles/ProfileConfiguration.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.AudioProfiles/ProfileConfiguration.cs	Sun Feb 10 21:30:08 2008
@@ -1,30 +1,30 @@
-/***************************************************************************
- *  ProfileConfiguration.cs
- *
- *  Copyright (C) 2006 Novell, Inc.
- *  Written by Aaron Bockover <aaron abock org>
- ****************************************************************************/
-
-/*  THIS FILE IS LICENSED UNDER THE MIT LICENSE AS OUTLINED IMMEDIATELY BELOW: 
- *
- *  Permission is hereby granted, free of charge, to any person obtaining a
- *  copy of this software and associated documentation files (the "Software"),  
- *  to deal in the Software without restriction, including without limitation  
- *  the rights to use, copy, modify, merge, publish, distribute, sublicense,  
- *  and/or sell copies of the Software, and to permit persons to whom the  
- *  Software is furnished to do so, subject to the following conditions:
- *
- *  The above copyright notice and this permission notice shall be included in 
- *  all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
- *  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
- *  DEALINGS IN THE SOFTWARE.
- */
+//
+// ProfileConfiguration.cs
+//
+// Author:
+//   Aaron Bockover <abockover novell com>
+//
+// Copyright (C) 2006-2008 Novell, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
  
 using System;
 using System.Text;
@@ -131,6 +131,10 @@
         public int Count {
             get { return variable_values.Count; }
         }
+        
+        public Profile Profile {
+            get { return profile; }
+        }
 
         protected string ConfNamespace {
             get { return MakeConfNamespace(id); }

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.AudioProfiles/ProfileManager.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.AudioProfiles/ProfileManager.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.AudioProfiles/ProfileManager.cs	Sun Feb 10 21:30:08 2008
@@ -1,30 +1,30 @@
-/***************************************************************************
- *  ProfileManager.cs
- *
- *  Copyright (C) 2006 Novell, Inc.
- *  Written by Aaron Bockover <aaron abock org>
- ****************************************************************************/
-
-/*  THIS FILE IS LICENSED UNDER THE MIT LICENSE AS OUTLINED IMMEDIATELY BELOW: 
- *
- *  Permission is hereby granted, free of charge, to any person obtaining a
- *  copy of this software and associated documentation files (the "Software"),  
- *  to deal in the Software without restriction, including without limitation  
- *  the rights to use, copy, modify, merge, publish, distribute, sublicense,  
- *  and/or sell copies of the Software, and to permit persons to whom the  
- *  Software is furnished to do so, subject to the following conditions:
- *
- *  The above copyright notice and this permission notice shall be included in 
- *  all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
- *  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
- *  DEALINGS IN THE SOFTWARE.
- */
+//
+// PlaybackControllerService.cs
+//
+// Author:
+//   Aaron Bockover <abockover novell com>
+//
+// Copyright (C) 2007-2008 Novell, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
  
 using System;
 using System.IO;
@@ -246,9 +246,11 @@
         public int AvailableProfileCount {
             get {
                 int count = 0;
+                #pragma warning disable 0168
                 foreach(Profile profile in GetAvailableProfiles()) {
                     count++;
                 }
+                #pragma warning restore 0168
                 return count;
             }
         }

Modified: 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/AlbumListDatabaseModel.cs	Sun Feb 10 21:30:08 2008
@@ -40,7 +40,6 @@
 {
     public class AlbumListDatabaseModel : AlbumListModel, ICacheableDatabaseModel
     {
-        private readonly BansheeDbConnection connection;
         private readonly BansheeModelProvider<LibraryAlbumInfo> provider;
         private readonly BansheeModelCache<LibraryAlbumInfo> cache;
         private readonly TrackListDatabaseModel track_model;
@@ -54,7 +53,6 @@
         {
             provider = LibraryAlbumInfo.Provider;
             cache = new BansheeModelCache <LibraryAlbumInfo> (connection, uuid, this, provider);
-            this.connection = connection;
         }
 
         public AlbumListDatabaseModel(TrackListDatabaseModel trackModel, 

Modified: 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/ArtistListDatabaseModel.cs	Sun Feb 10 21:30:08 2008
@@ -39,7 +39,6 @@
 {
     public class ArtistListDatabaseModel : ArtistListModel, ICacheableDatabaseModel
     {
-        private readonly BansheeDbConnection connection;
         private readonly BansheeModelProvider<LibraryArtistInfo> provider;
         private readonly BansheeModelCache<LibraryArtistInfo> cache;
         private readonly TrackListDatabaseModel track_model;
@@ -50,7 +49,6 @@
         
         public ArtistListDatabaseModel(BansheeDbConnection connection, string uuid)
         {
-            this.connection = connection;
             provider = LibraryArtistInfo.Provider;
             cache = new BansheeModelCache <LibraryArtistInfo> (connection, uuid, this, provider);
         }

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/LibraryTrackInfo.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/LibraryTrackInfo.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/LibraryTrackInfo.cs	Sun Feb 10 21:30:08 2008
@@ -39,6 +39,13 @@
 using Banshee.IO;
 using Banshee.ServiceStack;
 
+// Disabling "is never used" warnings here because there are a lot
+// of properties/fields that are set via reflection at the database
+// layer - that is, they really are used, but the compiler doesn't
+// think so.
+
+#pragma warning disable 0169
+
 namespace Banshee.Collection.Database
 {
     public class LibraryTrackInfo : TrackInfo
@@ -67,46 +74,54 @@
             Provider.Save (this);
         }
         
-        [DatabaseColumn("TrackID", Constraints = DatabaseColumnConstraints.PrimaryKey)]
+        [DatabaseColumn ("TrackID", Constraints = DatabaseColumnConstraints.PrimaryKey)]
         private int dbid;
         public int DbId {
             get { return dbid; }
         }
 
-        [DatabaseColumn("ArtistID", Index = "CoreTracksArtistIndex")]
+        [DatabaseColumn ("ArtistID", Index = "CoreTracksArtistIndex")]
         private int artist_id;
         public int ArtistId {
             get { return artist_id; }
             set { artist_id = value; }
         }
 
-        [DatabaseColumn("AlbumID", Index = "CoreTracksAlbumIndex")]
+        [DatabaseColumn ("AlbumID", Index = "CoreTracksAlbumIndex")]
         private int album_id;
         public int AlbumId {
             get { return album_id; }
             set { album_id = value; }
         }
 
-        [VirtualDatabaseColumn("Name", "CoreArtists", "ArtistID", "ArtistID")]
+        [VirtualDatabaseColumn ("Name", "CoreArtists", "ArtistID", "ArtistID")]
         public override string ArtistName {
             get { return base.ArtistName; }
             set { base.ArtistName = value; }
         }
         
-        [VirtualDatabaseColumn("Title", "CoreAlbums", "AlbumID", "AlbumID")]
+        [VirtualDatabaseColumn ("Title", "CoreAlbums", "AlbumID", "AlbumID")]
         public override string AlbumTitle {
             get { return base.AlbumTitle; }
             set { base.AlbumTitle = value; }
         }
         
+        private int tag_set_id;
         [DatabaseColumn]
-        private int TagSetID;
+        public int TagSetID {
+            get { return tag_set_id; }
+            set { tag_set_id = value; }
+        }
         
+        private string music_brainz_id;
         [DatabaseColumn]
-        private string MusicBrainzID;
+        public string MusicBrainzID {
+            get { return music_brainz_id; }
+            set { music_brainz_id = value; }
+        }
         
         private string uri_field;
-        [DatabaseColumn("Uri")]
+        [DatabaseColumn ("Uri")]
         private string uri {
             get {
                 return
@@ -125,7 +140,7 @@
         }
         
         private int? uri_type_field;
-        [DatabaseColumn("UriType")]
+        [DatabaseColumn ("UriType")]
         private int uri_type {
             get {
                 return uri_type_field.HasValue
@@ -170,7 +185,7 @@
             set { base.FileSize = value; }
         }
         
-        [DatabaseColumn("Title")]
+        [DatabaseColumn ("Title")]
         public override string TrackTitle {
             get { return base.TrackTitle; }
             set { base.TrackTitle = value; }
@@ -194,7 +209,7 @@
             set { base.Disc = value; }
         }
         
-        [DatabaseColumn("Duration")]
+        [DatabaseColumn ("Duration")]
         private long duration {
             get { return (long)Duration.TotalMilliseconds; }
             set { Duration = new TimeSpan (value * TimeSpan.TicksPerMillisecond); }
@@ -285,3 +300,6 @@
         }
     }
 }
+
+#pragma warning restore 0169
+

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Database/BansheeDbConnection.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Database/BansheeDbConnection.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Database/BansheeDbConnection.cs	Sun Feb 10 21:30:08 2008
@@ -60,12 +60,12 @@
         //private Gtk.Window slow_window;
         //private Gtk.ProgressBar slow_progress;
         
-        private void IterateSlow ()
+        /*private void IterateSlow ()
         {
-            /*while (Gtk.Application.EventsPending ()) {
+            while (Gtk.Application.EventsPending ()) {
                 Gtk.Application.RunIteration ();
-            }*/
-        }
+            }
+        }*/
         
         private void OnMigrationSlowStarted (string title, string message)
         {

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs	Sun Feb 10 21:30:08 2008
@@ -156,8 +156,9 @@
                     // Remove from file system
                     try {
                         Banshee.IO.Utilities.DeleteFileTrimmingParentDirectories (track.Uri);
-                    } catch (System.IO.FileNotFoundException e) {
-                    } catch (System.IO.DirectoryNotFoundException e) {}
+                    } catch (System.IO.FileNotFoundException) {
+                    } catch (System.IO.DirectoryNotFoundException) {
+                    }
 
                     // Remove from database
                     remove_track_command.ApplyValues (track.DbId, track.DbId, track.DbId);

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.PlaybackController/ICanonicalPlaybackController.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.PlaybackController/ICanonicalPlaybackController.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.PlaybackController/ICanonicalPlaybackController.cs	Sun Feb 10 21:30:08 2008
@@ -30,8 +30,8 @@
 {
     public interface ICanonicalPlaybackController : IPlaybackController
     {
-        void First ();
-        void Next ();
-        void Previous ();
+        new void First ();
+        new void Next ();
+        new void Previous ();
     }
 }