Hello community, here is the log from the commit of package banshee checked in at Sun May 7 15:43:32 CEST 2006. -------- --- GNOME/banshee/banshee.changes 2006-04-26 07:02:48.000000000 +0200 +++ STABLE/banshee/banshee.changes 2006-05-04 22:18:06.000000000 +0200 @@ -1,0 +2,7 @@ +Thu May 4 22:14:48 CEST 2006 - jpr@suse.de + +- Handle new ogg subclass (#169616) +- Prevent crash while doing long import (BGO #340306) +- Display ipod correctly if banshee is already running(BGO #340313) + +------------------------------------------------------------------- Old: ---- banshee-helix-streaming.patch banshee-sled-cuml-08.diff New: ---- banshee-desktop-ogg-support.patch banshee-sled-cuml-09.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ banshee.spec ++++++ --- /var/tmp/diff_new_pack.CFhajb/_old 2006-05-07 15:43:25.000000000 +0200 +++ /var/tmp/diff_new_pack.CFhajb/_new 2006-05-07 15:43:25.000000000 +0200 @@ -22,7 +22,7 @@ PreReq: filesystem gconf2 Requires: mono-core Version: 0.10.9 -Release: 17 +Release: 22 Source0: banshee-%{version}.tar.gz Source1: gstreamer-xing-0.10.0.tar.gz Patch0: %{name}-libaoss-preload.patch @@ -30,9 +30,9 @@ Patch2: %{name}-configure.patch Patch3: %{name}-transparent-trayicon.patch Patch5: %{name}-fix-icons.patch -Patch6: %{name}-sled-cuml-08.diff +Patch6: %{name}-sled-cuml-09.diff Patch7: %{name}-networkmanager-reconnect.diff -Patch8: %{name}-helix-streaming.patch +Patch8: %{name}-desktop-ogg-support.patch URL: http://banshee-project.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: A Music Player Based on Mono and GStreamer @@ -274,6 +274,10 @@ %{prefix}/%{_lib}/banshee/Banshee.Plugins/Daap.dll* %changelog -n banshee +* Thu May 04 2006 - jpr@suse.de +- Handle new ogg subclass (#169616) +- Prevent crash while doing long import (BGO #340306) +- Display ipod correctly if banshee is already running(BGO #340313) * Wed Apr 26 2006 - aj@suse.de - Fix build on lib64 systems. * Mon Apr 24 2006 - jpr@suse.de ++++++ banshee-desktop-ogg-support.patch ++++++ --- data/banshee.desktop.in.in +++ data/banshee.desktop.in.in @@ -15,4 +15,4 @@ X-GNOME-Bugzilla-Component=General X-GNOME-Bugzilla-Version=@VERSION@ X-SuSE-translate=true -MimeType=audio/x-musepack;application/x-musepack;audio/musepack;application/musepack;application/x-ape;audio/ape;audio/x-ape;audio/x-musepack;application/x-musepack;audio/musepack;application/musepack;application/x-ape;audio/ape;audio/x-ape;audio/x-mp3;application/x-id3;audio/mpeg;audio/x-mpeg;audio/x-mpeg-3;audio/mpeg3;audip/mp3;audio/x-mp3;application/x-id3;audio/mpeg;audio/x-mpeg;audio/x-mpeg-3;audio/mpeg3;audip/mp3;audio/x-m4a;audio/x-m4a;audio/mpc;audio/x-mpc;audio/mp;audio/x-mp;audio/mpc;audio/x-mpc;audio/mp;audio/x-mp;application/ogg;application/x-ogg;audio/vorbis;audio/x-vorbis;audio/ogg;audio/x-ogg;application/ogg;application/x-ogg;audio/vorbis;audio/x-vorbis;audio/ogg;audio/x-ogg;audio/x-flac;application/x-flac;audio/flac;audio/x-flac;application/x-flac;audio/flac;audio/x-s3m;audio/x-mod;audio/x-xm;audio/x-it;audio/x-s3m;audio/x-mod;audio/x-xm;audio/x-it +MimeType=audio/x-musepack;application/x-musepack;audio/musepack;application/musepack;application/x-ape;audio/ape;audio/x-ape;audio/x-musepack;application/x-musepack;audio/musepack;application/musepack;application/x-ape;audio/ape;audio/x-ape;audio/x-mp3;application/x-id3;audio/mpeg;audio/x-mpeg;audio/x-mpeg-3;audio/mpeg3;audip/mp3;audio/x-mp3;application/x-id3;audio/mpeg;audio/x-mpeg;audio/x-mpeg-3;audio/mpeg3;audip/mp3;audio/x-m4a;audio/x-m4a;audio/mpc;audio/x-mpc;audio/mp;audio/x-mp;audio/mpc;audio/x-mpc;audio/mp;audio/x-mp;application/ogg;application/x-ogg;application/x-vorbis+ogg;audio/x-vorbis+ogg;audio/vorbis;audio/x-vorbis;audio/ogg;audio/x-ogg;application/ogg;application/x-ogg;audio/vorbis;audio/x-vorbis;audio/ogg;audio/x-ogg;audio/x-flac;application/x-flac;audio/flac;audio/x-flac;application/x-flac;audio/flac;audio/x-s3m;audio/x-mod;audio/x-xm;audio/x-it;audio/x-s3m;audio/x-mod;audio/x-xm;audio/x-it ++++++ banshee-sled-cuml-08.diff -> banshee-sled-cuml-09.diff ++++++ --- GNOME/banshee/banshee-sled-cuml-08.diff 2006-04-24 18:21:07.000000000 +0200 +++ STABLE/banshee/banshee-sled-cuml-09.diff 2006-05-02 23:01:25.000000000 +0200 @@ -175,6 +175,42 @@ +</widget> + </glade-interface> +Index: entagged-sharp/Ogg/OggFileReader.cs +=================================================================== +RCS file: /cvs/gnome/banshee/entagged-sharp/Ogg/OggFileReader.cs,v +retrieving revision 1.9 +retrieving revision 1.9.4.2 +diff -u -r1.9 -r1.9.4.2 +--- entagged-sharp/Ogg/OggFileReader.cs 5 Dec 2005 16:55:08 -0000 1.9 ++++ entagged-sharp/Ogg/OggFileReader.cs 2 May 2006 21:01:04 -0000 1.9.4.2 +@@ -23,18 +23,6 @@ + * DEALINGS IN THE SOFTWARE. + */ + +-/* +- * $Log: OggFileReader.cs,v $ +- * Revision 1.9 2005/12/05 16:55:08 abock +- * 2005-12-05 Aaron Bockover <aaron@aaronbock.net> +- * +- * * entagged-sharp/*: Updated entagged-sharp checkout +- * +- * Revision 1.4 2005/02/08 12:54:42 kikidonk +- * Added cvs log and header +- * +- */ +- + using System.IO; + using Entagged.Audioformats.Util; + using Entagged.Audioformats.Ogg.Util; +@@ -43,6 +31,8 @@ + { + [SupportedMimeType ("application/ogg")] + [SupportedMimeType ("application/x-ogg")] ++ [SupportedMimeType ("application/x-vorbis+ogg")] ++ [SupportedMimeType ("audio/x-vorbis+ogg")] + [SupportedMimeType ("audio/vorbis")] + [SupportedMimeType ("audio/x-vorbis")] + [SupportedMimeType ("audio/ogg")] Index: src/BurnCore.cs =================================================================== RCS file: /cvs/gnome/banshee/src/BurnCore.cs,v @@ -657,10 +693,10 @@ =================================================================== RCS file: /cvs/gnome/banshee/src/PlayerInterface.cs,v retrieving revision 1.167 -retrieving revision 1.167.2.3 -diff -u -r1.167 -r1.167.2.3 +retrieving revision 1.167.2.4 +diff -u -r1.167 -r1.167.2.4 --- src/PlayerInterface.cs 20 Mar 2006 09:30:47 -0000 1.167 -+++ src/PlayerInterface.cs 17 Apr 2006 16:59:58 -0000 1.167.2.3 ++++ src/PlayerInterface.cs 1 May 2006 16:33:17 -0000 1.167.2.4 @@ -385,6 +385,8 @@ sourceViewDestEntries, DragAction.Copy | DragAction.Move); @@ -710,7 +746,29 @@ PlayerEngineCore.CurrentTrack.IncrementPlayCount(); incrementedCurrentSongPlayCount = true; playlistView.QueueDraw(); -@@ -1814,7 +1817,7 @@ +@@ -1320,13 +1323,15 @@ + return; + } + +- foreach(TrackInfo track in SourceManager.ActiveSource.Tracks) { +- try { +- if(DoesTrackMatchSearch(track)) { +- playlistModel.AddTrack(track); ++ lock(SourceManager.ActiveSource.TracksMutex) { ++ foreach(TrackInfo track in SourceManager.ActiveSource.Tracks) { ++ try { ++ if(DoesTrackMatchSearch(track)) { ++ playlistModel.AddTrack(track); ++ } ++ } catch(Exception) { ++ continue; + } +- } catch(Exception) { +- continue; + } + } + +@@ -1814,7 +1819,7 @@ for(i = 0; i < iters.Length; i++) { TrackInfo track = playlistModel.IterTrackInfo(iters[i]); SourceManager.ActiveSource.RemoveTrack(track); @@ -719,7 +777,7 @@ if(deleteFromFileSystem) { DeleteSong(track); -@@ -1906,8 +1909,22 @@ +@@ -1906,8 +1911,22 @@ if(playlistView.Selection.CountSelectedRows() <= 0) { return; } @@ -748,11 +806,24 @@ =================================================================== RCS file: /cvs/gnome/banshee/src/PlaylistModel.cs,v retrieving revision 1.37 -retrieving revision 1.37.2.1 -diff -u -r1.37 -r1.37.2.1 +retrieving revision 1.37.2.2 +diff -u -r1.37 -r1.37.2.2 --- src/PlaylistModel.cs 10 Mar 2006 01:28:51 -0000 1.37 -+++ src/PlaylistModel.cs 17 Apr 2006 16:59:59 -0000 1.37.2.1 -@@ -374,11 +374,20 @@ ++++ src/PlaylistModel.cs 1 May 2006 16:33:18 -0000 1.37.2.2 +@@ -132,8 +132,10 @@ + { + ClearModel(); + +- foreach(TrackInfo track in SourceManager.ActiveSource.Tracks) { +- AddTrack(track); ++ lock(SourceManager.ActiveSource.TracksMutex) { ++ foreach(TrackInfo track in SourceManager.ActiveSource.Tracks) { ++ AddTrack(track); ++ } + } + } + +@@ -374,11 +376,20 @@ } } @@ -1203,6 +1274,32 @@ default_engine = value; Globals.Configuration.Set(GConfKeys.PlayerEngine, value.Id); } +Index: src/Banshee.Base/Source.cs +=================================================================== +RCS file: /cvs/gnome/banshee/src/Banshee.Base/Source.cs,v +retrieving revision 1.7 +retrieving revision 1.7.2.1 +diff -u -r1.7 -r1.7.2.1 +--- src/Banshee.Base/Source.cs 13 Feb 2006 22:18:08 -0000 1.7 ++++ src/Banshee.Base/Source.cs 1 May 2006 16:33:19 -0000 1.7.2.1 +@@ -197,6 +197,17 @@ + } + } + ++ private object tracks_mutex = null; ++ public virtual object TracksMutex { ++ get { ++ if(tracks_mutex == null) { ++ tracks_mutex = new object(); ++ } ++ ++ return tracks_mutex; ++ } ++ } ++ + public virtual Gdk.Pixbuf Icon { + get { + return null; Index: src/Banshee.Base/Utilities.cs =================================================================== RCS file: /cvs/gnome/banshee/src/Banshee.Base/Utilities.cs,v @@ -1321,6 +1418,41 @@ } else { FinishSave(); } +Index: src/Banshee.Base/Dap/DapCore.cs +=================================================================== +RCS file: /cvs/gnome/banshee/src/Banshee.Base/Dap/DapCore.cs,v +retrieving revision 1.11 +retrieving revision 1.11.2.1 +diff -u -r1.11 -r1.11.2.1 +--- src/Banshee.Base/Dap/DapCore.cs 3 Mar 2006 07:46:54 -0000 1.11 ++++ src/Banshee.Base/Dap/DapCore.cs 1 May 2006 17:45:28 -0000 1.11.2.1 +@@ -159,7 +159,7 @@ + !device.GetPropertyBool("block.is_volume")) { + foreach(Device storage_device in Hal.Device.FindByStringMatch(device.Context, + "info.parent", device.Udi)) { +- if(AddDevice(storage_device)) { ++ if(AddDevice(storage_device) && device_waiting_table[storage_device.Udi] == null) { + break; + } + } +@@ -175,7 +175,7 @@ + if(AddDevice(device, type)) { + return true; + } +- } ++ } + + return false; + } +@@ -192,7 +192,7 @@ + case InitializeResult.WaitForPropertyChange: + device.WatchProperties = true; + device_waiting_table[device.Udi] = type; +- return false; ++ return true; + } + } catch(Exception e) { + Console.WriteLine(e); Index: src/Banshee.Base/MediaEngine/PlayerEngine.cs =================================================================== RCS file: /cvs/gnome/banshee/src/Banshee.Base/MediaEngine/PlayerEngine.cs,v @@ -1400,6 +1532,115 @@ } public override int Count { +Index: src/Banshee.Base/Sources/LibrarySource.cs +=================================================================== +RCS file: /cvs/gnome/banshee/src/Banshee.Base/Sources/LibrarySource.cs,v +retrieving revision 1.6 +retrieving revision 1.6.2.1 +diff -u -r1.6 -r1.6.2.1 +--- src/Banshee.Base/Sources/LibrarySource.cs 20 Mar 2006 08:38:39 -0000 1.6 ++++ src/Banshee.Base/Sources/LibrarySource.cs 1 May 2006 16:33:19 -0000 1.6.2.1 +@@ -74,6 +74,10 @@ + get { return Globals.Library.Tracks.Values; } + } + ++ public override object TracksMutex { ++ get { return Globals.Library.Tracks.SyncRoot; } ++ } ++ + public override int Count { + get { return Globals.Library.Tracks.Count; } + } +Index: src/Banshee.Base/Sources/PlaylistSource.cs +=================================================================== +RCS file: /cvs/gnome/banshee/src/Banshee.Base/Sources/PlaylistSource.cs,v +retrieving revision 1.5 +retrieving revision 1.5.2.1 +diff -u -r1.5 -r1.5.2.1 +--- src/Banshee.Base/Sources/PlaylistSource.cs 13 Feb 2006 22:18:10 -0000 1.5 ++++ src/Banshee.Base/Sources/PlaylistSource.cs 1 May 2006 16:33:19 -0000 1.5.2.1 +@@ -99,8 +99,10 @@ + id + )); + +- while(reader.Read()) { +- tracks.Add(Globals.Library.Tracks[Convert.ToInt32(reader[0])]); ++ lock(TracksMutex) { ++ while(reader.Read()) { ++ tracks.Add(Globals.Library.Tracks[Convert.ToInt32(reader[0])]); ++ } + } + + reader.Dispose(); +@@ -139,14 +141,18 @@ + public override void AddTrack(TrackInfo track) + { + if(track is LibraryTrackInfo) { +- tracks.Add(track); ++ lock(TracksMutex) { ++ tracks.Add(track); ++ } + OnUpdated(); + } + } + + public override void RemoveTrack(TrackInfo track) + { +- tracks.Remove(track); ++ lock(TracksMutex) { ++ tracks.Remove(track); ++ } + } + + public void Delete() +@@ -175,22 +181,26 @@ + id + )); + +- foreach(TrackInfo track in Tracks) { +- if(track.TrackId <= 0) +- continue; +- +- Globals.Library.Db.Execute(String.Format( +- @"INSERT INTO PlaylistEntries +- VALUES (NULL, '{0}', '{1}')", +- id, track.TrackId +- )); ++ lock(TracksMutex) { ++ foreach(TrackInfo track in Tracks) { ++ if(track.TrackId <= 0) ++ continue; ++ ++ Globals.Library.Db.Execute(String.Format( ++ @"INSERT INTO PlaylistEntries ++ VALUES (NULL, '{0}', '{1}')", ++ id, track.TrackId ++ )); ++ } + } + } + + public override void Reorder(TrackInfo track, int position) + { + RemoveTrack(track); +- tracks.Insert(position, track); ++ lock(TracksMutex) { ++ tracks.Insert(position, track); ++ } + } + + private void OnLibraryTrackRemoved(object o, LibraryTrackRemovedArgs args) +@@ -233,6 +243,10 @@ + get { + return tracks; + } ++ } ++ ++ public override object TracksMutex { ++ get { return tracks.SyncRoot; } + } + + public override int Count { Index: src/Banshee.Dap/Njb/Makefile.am =================================================================== RCS file: /cvs/gnome/banshee/src/Banshee.Dap/Njb/Makefile.am,v @@ -1839,10 +2080,10 @@ =================================================================== RCS file: /cvs/gnome/banshee/src/Banshee.MediaEngine/Helix/HelixRemotePlayer.cs,v retrieving revision 1.2 -retrieving revision 1.2.2.1 -diff -u -r1.2 -r1.2.2.1 +retrieving revision 1.2.2.2 +diff -u -r1.2 -r1.2.2.2 --- src/Banshee.MediaEngine/Helix/HelixRemotePlayer.cs 13 Mar 2006 05:50:14 -0000 1.2 -+++ src/Banshee.MediaEngine/Helix/HelixRemotePlayer.cs 3 Apr 2006 21:33:36 -0000 1.2.2.1 ++++ src/Banshee.MediaEngine/Helix/HelixRemotePlayer.cs 20 Apr 2006 17:58:43 -0000 1.2.2.2 @@ -3,6 +3,7 @@ * * Copyright (C) 2006 Novell, Inc @@ -1931,11 +2172,12 @@ public void Dispose() { Dispose(true); -@@ -150,16 +165,17 @@ +@@ -150,16 +165,18 @@ [Method] public abstract void SetVolume(uint volume); [Method] public abstract string GetGroupTitle(uint groupIndex); [Method] public abstract void Shutdown(); + [Method] public abstract void Ping(); ++ [Method] public abstract bool GetIsLive(); } public enum ContentState { @@ -1960,10 +2202,10 @@ =================================================================== RCS file: /cvs/gnome/banshee/src/Banshee.MediaEngine/Helix/HelixRemotePlayerEngine.cs,v retrieving revision 1.2 -retrieving revision 1.2.2.1 -diff -u -r1.2 -r1.2.2.1 +retrieving revision 1.2.2.2 +diff -u -r1.2 -r1.2.2.2 --- src/Banshee.MediaEngine/Helix/HelixRemotePlayerEngine.cs 20 Mar 2006 08:38:39 -0000 1.2 -+++ src/Banshee.MediaEngine/Helix/HelixRemotePlayerEngine.cs 3 Apr 2006 21:33:36 -0000 1.2.2.1 ++++ src/Banshee.MediaEngine/Helix/HelixRemotePlayerEngine.cs 20 Apr 2006 17:58:43 -0000 1.2.2.2 @@ -27,6 +27,7 @@ */ @@ -2013,18 +2255,59 @@ timeout_id = GLib.Timeout.Add(500, delegate { if(CurrentState == PlayerEngineState.Playing) { OnEventChanged(PlayerEngineEvent.Iterate); -@@ -147,9 +162,14 @@ - get { return "Helix Remote"; } +@@ -104,13 +119,30 @@ + break; + case ContentState.Loading: + case ContentState.Contacting: +- OnEventChanged(PlayerEngineEvent.Buffering); + break; + default: + OnStateChanged(PlayerEngineState.Idle); + break; + } + break; ++ case MessageType.Buffering: ++ uint progress = (uint)message["Percent"]; ++ OnEventChanged(PlayerEngineEvent.Buffering, ++ null, (double)progress / 100.0); ++ break; ++ case MessageType.Title: ++ string title = message["Title"] as string; ++ if(title == null || title.Trim() == String.Empty) { ++ break; ++ } ++ ++ StreamTag tag = new StreamTag(); ++ tag.Name = CommonTags.Title; ++ tag.Value = (string)message["Title"]; ++ ++ OnTagFound(tag); ++ ++ break; + } + } + +@@ -139,6 +171,10 @@ + get { return (uint)player.GetLength() / 1000; } + } + ++ public override bool CanSeek { ++ get { return !player.GetIsLive(); } ++ } ++ + public override string Id { + get { return "helix-remote"; } + } +@@ -148,8 +184,13 @@ } -- private static string [] source_capabilities = { "file", "http" }; + private static string [] source_capabilities = { "file", "http" }; - public override string [] SourceCapabilities { -+ private static string [] source_capabilities = { "file" }; + public override IEnumerable SourceCapabilities { get { return source_capabilities; } + } + -+ private static string [] decoder_capabilities = { "m4a", "mp3" }; ++ private static string [] decoder_capabilities = { "m4a", "mp3", "ram", "ra", "rm", "aac", "mp4" }; + public override IEnumerable ExplicitDecoderCapabilities { + get { return decoder_capabilities; } } @@ -2405,7 +2688,7 @@ retrieving revision 1.139 diff -u -r1.139 configure.ac --- configure.ac 20 Mar 2006 09:30:47 -0000 1.139 -+++ configure.ac 19 Apr 2006 19:46:57 -0000 ++++ configure.ac 2 May 2006 21:01:21 -0000 @@ -148,7 +148,7 @@ fi AM_CONDITIONAL(ENABLE_IPOD, test "x$enable_ipodsharp" = "xyes") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...
participants (1)
-
root＠suse.de