banshee r4094 - in trunk/banshee: . src/Backends/Banshee.Hal/Banshee.HalBackend src/Core/Banshee.Services/Banshee.Collection.Database src/Dap/Banshee.Dap/Banshee.Dap src/Dap/Banshee.Dap/Banshee.Dap.Gui src/Extensions/Banshee.BooScript src/Extensions/Banshee.BooScript/Resources

[abock svn gnome org]

Author: abock
Date: Tue Jun  3 21:27:16 2008
New Revision: 4094
URL: http://svn.gnome.org/viewvc/banshee?rev=4094&view=rev

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

    * src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs: Remove the footer widget
    property after destroying the widget to avoid a property notification cycle

    * src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs: Wrap UpdateUsage
    in an exception catch/log

    * src/Backends/Banshee.Hal/Banshee.HalBackend/HardwareManager.cs: Catch
    any exceptions that HAL might through (particularly if the device no
    longer exists) when adding devices (BGO #528957)

    * src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseImportManager.cs:
    Added oga and ogv file extensions to the white list (BGO #532561)
    
    * src/Extensions/Banshee.BooScript/Resources/vorbis-oga-extension.boo:
    Added a sample script that will change the Vorbis profile to write files
    with a .oga extension instead of a .ogg (BGO #532561)



Added:
   trunk/banshee/src/Extensions/Banshee.BooScript/Resources/vorbis-oga-extension.boo
Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Backends/Banshee.Hal/Banshee.HalBackend/HardwareManager.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseImportManager.cs
   trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs
   trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs
   trunk/banshee/src/Extensions/Banshee.BooScript/Banshee.BooScript.mdp
   trunk/banshee/src/Extensions/Banshee.BooScript/Makefile.am

Modified: trunk/banshee/src/Backends/Banshee.Hal/Banshee.HalBackend/HardwareManager.cs
==============================================================================
--- trunk/banshee/src/Backends/Banshee.Hal/Banshee.HalBackend/HardwareManager.cs	(original)
+++ trunk/banshee/src/Backends/Banshee.Hal/Banshee.HalBackend/HardwareManager.cs	Tue Jun  3 21:27:16 2008
@@ -92,7 +92,11 @@
 
         private void OnHalDeviceAdded (object o, Hal.DeviceAddedArgs args)
         {
-            OnHalDeviceAdded (Resolve (args.Device));
+            try {
+                OnHalDeviceAdded (Resolve (args.Device));
+            } catch (Exception e) {
+                Log.Exception (e);
+            }
         }
 
         private IDevice Resolve (Hal.Device hal_device)

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseImportManager.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseImportManager.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseImportManager.cs	Tue Jun  3 21:27:16 2008
@@ -53,18 +53,18 @@
         // point is to rule out, at the path level, files that we won't support.
         
         private static readonly string [] white_list_file_extensions = new string [] {
-            "3g2",   "3gp",  "3gp2", "3gpp", "aac",  "ac3",  "aif",  "aifc", 
-            "aiff",  "al",   "alaw", "ape",  "asf",  "asx",  "au",   "avi", 
-            "cda",   "cdr",  "divx", "dv",   "flac", "flv",  "gvi",  "gvp", 
-            "m1v",   "m21",  "m2p",  "m2v",  "m4a",  "m4b",  "m4e",  "m4p",  
-            "m4u",   "m4v",  "mp+",  "mid",  "midi", "mjp",  "mkv",  "moov",
-            "mov",   "movie","mp1",  "mp2",  "mp21", "mp3",  "mp4",  "mpa",
-            "mpc",   "mpe",  "mpeg", "mpg",  "mpp",  "mpu",  "mpv",  "mpv2",
-            "ogg",   "ogm",  "omf",  "qt",   "ra",   "ram",  "raw",  "rm",
-            "rmvb",  "rts",  "smil", "swf",  "tivo", "u",    "vfw",  "vob",
-            "wav",   "wave", "wax",  "wm",   "wma",  "wmd",  "wmv",  "wmx",
-            "wv",    "wvc",  "wvx",  "yuv",
-            "f4v",   "f4a",  "f4b",
+            "3g2",  "3gp",  "3gp2", "3gpp", "aac",  "ac3",  "aif",  "aifc", 
+            "aiff", "al",   "alaw", "ape",  "asf",  "asx",  "au",   "avi", 
+            "cda",  "cdr",  "divx", "dv",   "flac", "flv",  "gvi",  "gvp", 
+            "m1v",  "m21",  "m2p",  "m2v",  "m4a",  "m4b",  "m4e",  "m4p",  
+            "m4u",  "m4v",  "mp+",  "mid",  "midi", "mjp",  "mkv",  "moov",
+            "mov",  "movie","mp1",  "mp2",  "mp21", "mp3",  "mp4",  "mpa",
+            "mpc",  "mpe",  "mpeg", "mpg",  "mpp",  "mpu",  "mpv",  "mpv2",
+            "oga",  "ogg",  "ogv",  "ogm",  "omf",  "qt",   "ra",   "ram",  
+            "raw",  "rm",   "rmvb", "rts",  "smil", "swf",  "tivo", "u",
+            "vfw",  "vob",  "wav",  "wave", "wax",  "wm",   "wma",  "wmd",  
+            "wmv",  "wmx",  "wv",   "wvc",  "wvx",  "yuv",  "f4v",  "f4a",  
+            "f4b"
         };
 
         static DatabaseImportManager ()

Modified: trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs
==============================================================================
--- trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs	(original)
+++ trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs	Tue Jun  3 21:27:16 2008
@@ -92,7 +92,11 @@
         
         private void OnSourceUpdated (object o, EventArgs args)
         {
-            UpdateUsage ();
+            try {
+                UpdateUsage ();
+            } catch (Exception e) {
+                Hyena.Log.Exception (e);
+            }
         }
         
         protected override void OnStyleSet (Style previous_style)

Modified: trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs
==============================================================================
--- trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs	(original)
+++ trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs	Tue Jun  3 21:27:16 2008
@@ -88,12 +88,13 @@
             PurgeBuiltinSmartPlaylists ();
             PurgeTracks ();
             
-            Properties.Remove ("Nereid.SourceContents.FooterWidget");
             if (dap_info_bar != null) {
                 dap_info_bar.Destroy ();
                 dap_info_bar = null;
             }
             
+            Properties.Remove ("Nereid.SourceContents.FooterWidget");
+            
             /*Properties.Remove ("Nereid.SourceContents");
             dap_properties_display.Destroy ();
             dap_properties_display = null;*/

Modified: trunk/banshee/src/Extensions/Banshee.BooScript/Banshee.BooScript.mdp
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.BooScript/Banshee.BooScript.mdp	(original)
+++ trunk/banshee/src/Extensions/Banshee.BooScript/Banshee.BooScript.mdp	Tue Jun  3 21:27:16 2008
@@ -12,6 +12,7 @@
     <File name="Banshee.BooScript/BooScriptService.cs" subtype="Code" buildaction="Compile" />
     <File name="Resources/duration-status-formats.boo" subtype="Code" buildaction="EmbedAsResource" />
     <File name="Resources/filename-transform.boo" subtype="Code" buildaction="EmbedAsResource" />
+    <File name="Resources/vorbis-oga-extension.boo" subtype="Code" buildaction="EmbedAsResource" />
   </Contents>
   <References>
     <ProjectReference type="Project" localcopy="True" refto="Banshee.Core" />

Modified: trunk/banshee/src/Extensions/Banshee.BooScript/Makefile.am
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.BooScript/Makefile.am	(original)
+++ trunk/banshee/src/Extensions/Banshee.BooScript/Makefile.am	Tue Jun  3 21:27:16 2008
@@ -8,7 +8,8 @@
 RESOURCES =  \
 	Banshee.BooScript.addin.xml \
 	Resources/duration-status-formats.boo \
-	Resources/filename-transform.boo
+	Resources/filename-transform.boo \
+	Resources/vorbis-oga-extension.boo
 
 if HAVE_BOO
 include $(top_srcdir)/build/build.mk

Added: trunk/banshee/src/Extensions/Banshee.BooScript/Resources/vorbis-oga-extension.boo
==============================================================================
--- (empty file)
+++ trunk/banshee/src/Extensions/Banshee.BooScript/Resources/vorbis-oga-extension.boo	Tue Jun  3 21:27:16 2008
@@ -0,0 +1,6 @@
+import Banshee.MediaProfiles
+import Banshee.ServiceStack
+
+profile_manager = ServiceManager.Get[of MediaProfileManager] ()
+vorbis_profile = profile_manager.GetProfileForMimeType ("audio/vorbis")
+vorbis_profile.OutputFileExtension = "oga"