banshee r3377 - in trunk/banshee: . build src/Backends/Banshee.GStreamer src/Backends/Banshee.Gnome src/Backends/Banshee.Unix src/Core/Banshee.Services src/Core/Banshee.Services/Banshee.ServiceStack src/Extensions src/Extensions/Banshee.Lastfm src/Extensions/Banshee.MultimediaKeys src/Extensions/Banshee.NotificationArea src/Extensions/Banshee.PlayQueue src/Extensions/Banshee.Skins src/Libraries/Hyena/Hyena

[abock svn gnome org]

Author: abock
Date: Tue Mar  4 22:28:19 2008
New Revision: 3377
URL: http://svn.gnome.org/viewvc/banshee?rev=3377&view=rev

Log:
2008-03-04  Aaron Bockover  <abock gnome org>

    * src/Libraries/Hyena/Hyena/Log.cs: Added InformationTimer methods
    akin to DebugTimer methods that will work without --debug mode

    * src/Core/Banshee.Services/Banshee.ServiceStack/ServiceManager.cs:
    Use InformationTimer instead of DebugTimer to show the overall startup
    time; set the addin cache path to just be the application data path,
    since Mono.Addins creates its own subdirectory underneath

    * src/Core/Banshee.Services/Banshee.Services.addins: Scan Extensions
    and Backends directories for addins

    * build/build.environment.mk: Define EXTENSIONS_INSTALL_DIR,
    BACKENDS_INSTALL_DIR

    * src/Backends/Banshee.GStreamer/Makefile.am:
    * src/Backends/Banshee.Gnome/Makefile.am:
    * src/Backends/Banshee.Unix/Makefile.am:
    * src/Extensions/Banshee.Lastfm/Makefile.am:
    * src/Extensions/Banshee.MultimediaKeys/Makefile.am:
    * src/Extensions/Banshee.NotificationArea/Makefile.am:
    * src/Extensions/Banshee.PlayQueue/Makefile.am:
    * src/Extensions/Banshee.Skins/Makefile.am: Set the INSTALL_DIR to
    either EXTENSIONS_INSTALL_DIR or BACKENDS_INSTALL_DIR so addins are
    a bit more organized in the install/packages

    * src/Extensions/Makefile.am: Disable the skins extension



Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/build/build.environment.mk
   trunk/banshee/src/Backends/Banshee.GStreamer/Makefile.am
   trunk/banshee/src/Backends/Banshee.Gnome/Makefile.am
   trunk/banshee/src/Backends/Banshee.Unix/Makefile.am
   trunk/banshee/src/Core/Banshee.Services/Banshee.ServiceStack/ServiceManager.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Services.addins
   trunk/banshee/src/Extensions/Banshee.Lastfm/Makefile.am
   trunk/banshee/src/Extensions/Banshee.MultimediaKeys/Makefile.am
   trunk/banshee/src/Extensions/Banshee.NotificationArea/Makefile.am
   trunk/banshee/src/Extensions/Banshee.PlayQueue/Makefile.am
   trunk/banshee/src/Extensions/Banshee.Skins/Makefile.am
   trunk/banshee/src/Extensions/Makefile.am
   trunk/banshee/src/Libraries/Hyena/Hyena/Log.cs

Modified: trunk/banshee/build/build.environment.mk
==============================================================================
--- trunk/banshee/build/build.environment.mk	(original)
+++ trunk/banshee/build/build.environment.mk	Tue Mar  4 22:28:19 2008
@@ -4,7 +4,8 @@
 
 # Install Paths
 DEFAULT_INSTALL_DIR = $(pkglibdir)
-ADDINS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/addins
+BACKENDS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Backends
+EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
 
 # External libraries to link against, generated from configure
 LINK_SYSTEM = -r:System

Modified: trunk/banshee/src/Backends/Banshee.GStreamer/Makefile.am
==============================================================================
--- trunk/banshee/src/Backends/Banshee.GStreamer/Makefile.am	(original)
+++ trunk/banshee/src/Backends/Banshee.GStreamer/Makefile.am	Tue Mar  4 22:28:19 2008
@@ -6,7 +6,7 @@
 	Banshee.GStreamer/PlayerEngine.cs \
 	Banshee.GStreamer/Service.cs
 RESOURCES = Banshee.GStreamer.addin.xml
-INSTALL_DIR = $(ADDINS_INSTALL_DIR)
+INSTALL_DIR = $(BACKENDS_INSTALL_DIR)
 
 include $(top_srcdir)/build/build.mk
 

Modified: trunk/banshee/src/Backends/Banshee.Gnome/Makefile.am
==============================================================================
--- trunk/banshee/src/Backends/Banshee.Gnome/Makefile.am	(original)
+++ trunk/banshee/src/Backends/Banshee.Gnome/Makefile.am	Tue Mar  4 22:28:19 2008
@@ -1,6 +1,7 @@
 ASSEMBLY = Banshee.Gnome
 TARGET = library
 LINK = $(REF_BACKEND_GNOME)
+INSTALL_DIR = $(BACKENDS_INSTALL_DIR)
 
 SOURCES = Banshee.Gnome/GConfConfigurationClient.cs
 

Modified: trunk/banshee/src/Backends/Banshee.Unix/Makefile.am
==============================================================================
--- trunk/banshee/src/Backends/Banshee.Unix/Makefile.am	(original)
+++ trunk/banshee/src/Backends/Banshee.Unix/Makefile.am	Tue Mar  4 22:28:19 2008
@@ -1,6 +1,7 @@
 ASSEMBLY = Banshee.Unix
 TARGET = library
 LINK = $(REF_BACKEND_UNIX)
+INSTALL_DIR = $(BACKENDS_INSTALL_DIR)
 
 SOURCES =  \
 	Banshee.IO.Unix/DemuxVfs.cs \

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.ServiceStack/ServiceManager.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.ServiceStack/ServiceManager.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.ServiceStack/ServiceManager.cs	Tue Mar  4 22:28:19 2008
@@ -88,7 +88,7 @@
             lock (self_mutex) {          
                 OnStartupBegin ();
                 
-                uint cumulative_timer_id = Log.DebugTimerStart ();
+                uint cumulative_timer_id = Log.InformationTimerStart ();
                 
                 foreach (Type type in service_types) {
                     uint timer_id = Log.DebugTimerStart (); 
@@ -135,7 +135,7 @@
                 
                 is_initialized = true;
                 
-                Log.DebugTimerPrint (cumulative_timer_id, "All services are started {0}");
+                Log.InformationTimerPrint (cumulative_timer_id, "All services are started {0}");
                 
                 OnStartupFinished ();
             }
@@ -244,7 +244,7 @@
         }
         
         public static string UserAddinCachePath {
-            get { return Path.Combine (Paths.ApplicationData, "addins"); }
+            get { return Paths.ApplicationData; }
         }
         
         public static DBusServiceManager DBusServiceManager {

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Services.addins
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Services.addins	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Services.addins	Tue Mar  4 22:28:19 2008
@@ -1,4 +1,5 @@
 <Addins>
-  <Directory include-subdirs="true">./addins</Directory>
+  <Directory include-subdirs="true">./Backends</Directory>
+  <Directory include-subdirs="true">./Extensions</Directory>
 </Addins>
 

Modified: trunk/banshee/src/Extensions/Banshee.Lastfm/Makefile.am
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.Lastfm/Makefile.am	(original)
+++ trunk/banshee/src/Extensions/Banshee.Lastfm/Makefile.am	Tue Mar  4 22:28:19 2008
@@ -1,6 +1,7 @@
 ASSEMBLY = Banshee.Lastfm
 TARGET = library
 LINK = $(REF_EXTENSION_LASTFM) -r:System.Web -r:Mono.Security
+INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
 
 SOURCES =  \
 	Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs \

Modified: trunk/banshee/src/Extensions/Banshee.MultimediaKeys/Makefile.am
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.MultimediaKeys/Makefile.am	(original)
+++ trunk/banshee/src/Extensions/Banshee.MultimediaKeys/Makefile.am	Tue Mar  4 22:28:19 2008
@@ -1,6 +1,7 @@
 ASSEMBLY = Banshee.MultimediaKeys
 TARGET = library
 LINK = $(REF_EXTENSION_MULTIMEDIAKEYS)
+INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
 
 SOURCES = Banshee.MultimediaKeys/MultimediaKeysService.cs 
 

Modified: trunk/banshee/src/Extensions/Banshee.NotificationArea/Makefile.am
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.NotificationArea/Makefile.am	(original)
+++ trunk/banshee/src/Extensions/Banshee.NotificationArea/Makefile.am	Tue Mar  4 22:28:19 2008
@@ -1,6 +1,7 @@
 ASSEMBLY = Banshee.NotificationArea
 TARGET = library
 LINK = $(REF_EXTENSION_NOTIFICATIONAREA)
+INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
 
 SOURCES =  \
 	Banshee.NotificationArea/GtkNotificationAreaBox.cs \

Modified: trunk/banshee/src/Extensions/Banshee.PlayQueue/Makefile.am
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.PlayQueue/Makefile.am	(original)
+++ trunk/banshee/src/Extensions/Banshee.PlayQueue/Makefile.am	Tue Mar  4 22:28:19 2008
@@ -1,6 +1,7 @@
 ASSEMBLY = Banshee.PlayQueue
 TARGET = library
 LINK = $(REF_EXTENSION_PLAYQUEUE)
+INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
 
 SOURCES = Banshee.PlayQueue/PlayQueueSource.cs 
 

Modified: trunk/banshee/src/Extensions/Banshee.Skins/Makefile.am
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.Skins/Makefile.am	(original)
+++ trunk/banshee/src/Extensions/Banshee.Skins/Makefile.am	Tue Mar  4 22:28:19 2008
@@ -1,6 +1,7 @@
 ASSEMBLY = Banshee.Skins
 TARGET = library
 LINK = $(REF_EXTENSION_SKINS)
+INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
 
 SOURCES = Banshee.Skins/SkinManager.cs 
 

Modified: trunk/banshee/src/Extensions/Makefile.am
==============================================================================
--- trunk/banshee/src/Extensions/Makefile.am	(original)
+++ trunk/banshee/src/Extensions/Makefile.am	Tue Mar  4 22:28:19 2008
@@ -2,7 +2,6 @@
 	Banshee.Lastfm \
 	Banshee.MultimediaKeys \
 	Banshee.NotificationArea \
-	Banshee.PlayQueue \
-	Banshee.Skins
+	Banshee.PlayQueue
 
 MAINTAINERCLEANFILES = Makefile.in

Modified: trunk/banshee/src/Libraries/Hyena/Hyena/Log.cs
==============================================================================
--- trunk/banshee/src/Libraries/Hyena/Hyena/Log.cs	(original)
+++ trunk/banshee/src/Libraries/Hyena/Hyena/Log.cs	Tue Mar  4 22:28:19 2008
@@ -150,42 +150,46 @@
             }
         }
         
-        #region Public Debug Methods
-                                    
-        public static void Debug (string message, string details)
-        {
-            if (Debugging) {
-                Commit (LogEntryType.Debug, message, details, false);
-            }
-        }
+        #region Timer Methods
         
-        public static void Debug (string message)
+        public static uint DebugTimerStart (string message)
         {
-            if (Debugging) {
-                Debug (message, null);
-            }
+            return TimerStart (message, false);
         }
         
-        public static void DebugFormat (string format, params object [] args)
+        public static uint InformationTimerStart (string message)
         {
-            if (Debugging) {
-                Debug (String.Format (format, args));
-            }
+            return TimerStart (message, true);
         }
         
-        public static uint DebugTimerStart (string message)
+        private static uint TimerStart (string message, bool isInfo)
         {
-            if (!Debugging) {
+            if (!Debugging && !isInfo) {
                 return 0;
             }
             
-            Debug (message);
-            return DebugTimerStart ();
+            if (isInfo) {
+                Information (message);
+            } else {
+                Debug (message);
+            }
+            
+            return TimerStart (isInfo);
         }
         
         public static uint DebugTimerStart ()
         {
-            if (!Debugging) {
+            return TimerStart (false);
+        }
+        
+        public static uint InformationTimerStart ()
+        {
+            return TimerStart (true);
+        }
+            
+        private static uint TimerStart (bool isInfo)
+        {
+            if (!Debugging && !isInfo) {
                 return 0;
             }
             
@@ -200,7 +204,7 @@
                 return;
             }
             
-            DebugTimerPrint (id, "Operation duration: {0}");
+            TimerPrint (id, "Operation duration: {0}", false);
         }
         
         public static void DebugTimerPrint (uint id, string message)
@@ -209,6 +213,25 @@
                 return;
             }
             
+            TimerPrint (id, message, false);
+        }
+        
+        public static void InformationTimerPrint (uint id)
+        {
+            TimerPrint (id, "Operation duration: {0}", true);
+        }
+        
+        public static void InformationTimerPrint (uint id, string message)
+        {
+            TimerPrint (id, message, true);
+        }
+        
+        private static void TimerPrint (uint id, string message, bool isInfo)
+        {
+            if (!Debugging && !isInfo) {
+                return;
+            }
+            
             DateTime finish = DateTime.Now;
             
             if (!timers.ContainsKey (id)) {
@@ -223,11 +246,40 @@
                 d_message = duration.ToString ();
             }
             
-            DebugFormat (message, d_message);
+            if (isInfo) {
+                InformationFormat (message, d_message);
+            } else {
+                DebugFormat (message, d_message);
+            }
         }
         
         #endregion
         
+        #region Public Debug Methods
+                                    
+        public static void Debug (string message, string details)
+        {
+            if (Debugging) {
+                Commit (LogEntryType.Debug, message, details, false);
+            }
+        }
+        
+        public static void Debug (string message)
+        {
+            if (Debugging) {
+                Debug (message, null);
+            }
+        }
+        
+        public static void DebugFormat (string format, params object [] args)
+        {
+            if (Debugging) {
+                Debug (String.Format (format, args));
+            }
+        }
+                
+        #endregion
+        
         #region Public Information Methods
             
         public static void Information (string message)
@@ -250,6 +302,11 @@
             Information (message, null, showUser);
         }
         
+        public static void InformationFormat (string format, params object [] args)
+        {
+            Information (String.Format (format, args));
+        }
+        
         #endregion
         
         #region Public Warning Methods