GNOME.org
 

banshee r4946 - in trunk/banshee: . build src/Core/Banshee.Services src/Core/Banshee.Services/Banshee.Library src/Core/Banshee.Services/Banshee.PlayerMigration src/Extensions src/Extensions/Banshee.PlayerMigration src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration

Author: gburt
Date: Sat Jan 24 00:43:37 2009
New Revision: 4946
URL: http://svn.gnome.org/viewvc/banshee?rev=4946&view=rev

Log:
2009-01-23  Gabriel Burt  <gabriel burt gmail com>

	* src/Extensions/Makefile.am:
	* src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration.addin.xml:
	* src/Extensions/Banshee.PlayerMigration/Makefile.am:
	* src/Core/Banshee.Services/Banshee.Services.addin.xml:
	* src/Core/Banshee.Services/Banshee.Library/ImportSourceManager.cs:
	* src/Core/Banshee.Services/Makefile.am:
	* src/Core/Banshee.Services/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:
	* src/Core/Banshee.Services/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:
	* build/build.environment.mk:
	* configure.ac: Move the Rhythmbox and Amarok migrators into a non-Core
	extension, enabled by default of course.



Added:
   trunk/banshee/src/Extensions/Banshee.PlayerMigration/   (props changed)
   trunk/banshee/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/   (props changed)
      - copied from r4942, /trunk/banshee/src/Core/Banshee.Services/Banshee.PlayerMigration/
   trunk/banshee/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration.addin.xml
   trunk/banshee/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs
      - copied unchanged from r4945, /trunk/banshee/src/Core/Banshee.Services/Banshee.PlayerMigration/AmarokPlayerImportSource.cs
   trunk/banshee/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs
      - copied unchanged from r4945, /trunk/banshee/src/Core/Banshee.Services/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs
   trunk/banshee/src/Extensions/Banshee.PlayerMigration/Makefile.am
Removed:
   trunk/banshee/src/Core/Banshee.Services/Banshee.PlayerMigration/
Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/build/build.environment.mk
   trunk/banshee/configure.ac
   trunk/banshee/src/Core/Banshee.Services/Banshee.Library/ImportSourceManager.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Services.addin.xml
   trunk/banshee/src/Core/Banshee.Services/Makefile.am
   trunk/banshee/src/Extensions/Makefile.am

Modified: trunk/banshee/build/build.environment.mk
==============================================================================
--- trunk/banshee/build/build.environment.mk	(original)
+++ trunk/banshee/build/build.environment.mk	Sat Jan 24 00:43:37 2009
@@ -123,6 +123,7 @@
 REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
 REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
 REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_SERVICES_DEPS)
 REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
 LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
 LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \

Modified: trunk/banshee/configure.ac
==============================================================================
--- trunk/banshee/configure.ac	(original)
+++ trunk/banshee/configure.ac	Sat Jan 24 00:43:37 2009
@@ -242,6 +242,7 @@
 src/Extensions/Banshee.NotificationArea/Makefile
 src/Extensions/Banshee.NowPlaying/Makefile
 src/Extensions/Banshee.PlayQueue/Makefile
+src/Extensions/Banshee.PlayerMigration/Makefile
 src/Extensions/Banshee.Podcasting/Makefile
 src/Extensions/Banshee.SqlDebugConsole/Makefile
 src/Extensions/Banshee.Sample/Makefile

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Library/ImportSourceManager.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Library/ImportSourceManager.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Library/ImportSourceManager.cs	Sat Jan 24 00:43:37 2009
@@ -31,29 +31,26 @@
 using System.Collections.Generic;
 using Mono.Addins;
 
-using Banshee.PlayerMigration;
 using Banshee.ServiceStack;
 
 namespace Banshee.Library
 {
     public class ImportSourceManager : IService, IEnumerable<IImportSource>
     {
-        private List<IImportSource> import_sources;
-        
+        private HomeDirectoryImportSource home_source = new HomeDirectoryImportSource ();
+
         public ImportSourceManager ()
         {
         }
         
         public IEnumerator<IImportSource> GetEnumerator ()
         {
-            if (import_sources == null) {
-                import_sources = new List<IImportSource> ();
-                import_sources.Add (new HomeDirectoryImportSource ());
+            List<IImportSource> import_sources = new List<IImportSource> ();
+            import_sources.Add (home_source);
 
-                foreach (IImportSource source in AddinManager.GetExtensionObjects ("/Banshee/Library/ImportSource")) {
-                    if (source.CanImport) {
-                        import_sources.Add (source);
-                    }
+            foreach (IImportSource source in AddinManager.GetExtensionObjects ("/Banshee/Library/ImportSource")) {
+                if (source.CanImport) {
+                    import_sources.Add (source);
                 }
             }
             

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Services.addin.xml
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Services.addin.xml	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Services.addin.xml	Sat Jan 24 00:43:37 2009
@@ -21,11 +21,6 @@
     <ExtensionNode name="ImportSource"/>
   </ExtensionPoint>
 
-  <Extension path="/Banshee/Library/ImportSource">
-    <ImportSource class="Banshee.PlayerMigration.RhythmboxPlayerImportSource"/>
-    <ImportSource class="Banshee.PlayerMigration.AmarokPlayerImportSource"/>
-  </Extension>
-
   <ExtensionPoint path="/Banshee/MediaEngine/PlayerEngine">
     <ExtensionNode name="PlayerEngine"/>
   </ExtensionPoint>

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	Sat Jan 24 00:43:37 2009
@@ -115,8 +115,6 @@
 	Banshee.PlaybackController/PlaybackControllerService.cs \
 	Banshee.PlaybackController/PlaybackRepeatMode.cs \
 	Banshee.PlaybackController/PlaybackShuffleMode.cs \
-	Banshee.PlayerMigration/AmarokPlayerImportSource.cs \
-	Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs \
 	Banshee.Playlist/AbstractPlaylistSource.cs \
 	Banshee.Playlist/PlaylistFileUtil.cs \
 	Banshee.Playlist/PlaylistSource.cs \

Added: trunk/banshee/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration.addin.xml
==============================================================================
--- (empty file)
+++ trunk/banshee/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration.addin.xml	Sat Jan 24 00:43:37 2009
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Addin 
+    id="Banshee.PlayerMigration"
+    version="1.0"
+    compatVersion="1.0"
+    copyright="Licensed under the MIT X11 license."
+    name="Importers for Amarok and Rhythmbox"
+    category="Core"
+    description="Import your Amarok or Rhythmbox music library"
+    author="Paul Lange, Sebastian DrÃge"
+    url="http://banshee-project.org/";
+    defaultEnabled="true">
+
+  <Dependencies>
+    <Addin id="Banshee.Services" version="1.0"/>
+  </Dependencies>
+
+  <Extension path="/Banshee/Library/ImportSource">
+    <ImportSource class="Banshee.PlayerMigration.RhythmboxPlayerImportSource"/>
+    <ImportSource class="Banshee.PlayerMigration.AmarokPlayerImportSource"/>
+  </Extension>
+
+</Addin>

Added: trunk/banshee/src/Extensions/Banshee.PlayerMigration/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/banshee/src/Extensions/Banshee.PlayerMigration/Makefile.am	Sat Jan 24 00:43:37 2009
@@ -0,0 +1,14 @@
+ASSEMBLY = Banshee.PlayerMigration
+TARGET = library
+LINK = $(REF_EXTENSION_PLAYER_MIGRATION)
+INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
+
+SOURCES =  \
+	Banshee.PlayerMigration/AmarokPlayerImportSource.cs \
+	Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs
+
+RESOURCES =  \
+	Banshee.PlayerMigration.addin.xml
+
+include $(top_srcdir)/build/build.mk
+

Modified: trunk/banshee/src/Extensions/Makefile.am
==============================================================================
--- trunk/banshee/src/Extensions/Makefile.am	(original)
+++ trunk/banshee/src/Extensions/Makefile.am	Sat Jan 24 00:43:37 2009
@@ -12,6 +12,7 @@
 	Banshee.MultimediaKeys \
 	Banshee.NotificationArea \
 	Banshee.NowPlaying \
+	Banshee.PlayerMigration \
 	Banshee.PlayQueue \
 	Banshee.Podcasting \
 	Banshee.Sample \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]