[Pkg-mono-svn-commits] rev 2679 - in non-group/banshee/tags: .
0.10.11-1/debian 0.10.11-1/debian/patches
Sebastian Dröge
slomo-guest at costa.debian.org
Wed Aug 23 23:22:37 UTC 2006
Author: slomo-guest
Date: 2006-08-23 23:22:37 +0000 (Wed, 23 Aug 2006)
New Revision: 2679
Added:
non-group/banshee/tags/0.10.11-1/
non-group/banshee/tags/0.10.11-1/debian/banshee.install
non-group/banshee/tags/0.10.11-1/debian/changelog
non-group/banshee/tags/0.10.11-1/debian/patches/03_cvs-backports.diff
Removed:
non-group/banshee/tags/0.10.11-1/debian/banshee.install
non-group/banshee/tags/0.10.11-1/debian/changelog
non-group/banshee/tags/0.10.11-1/debian/patches/03_cvs-backports.diff
Log:
* tagged banshee 0.10.11
Copied: non-group/banshee/tags/0.10.11-1 (from rev 2677, non-group/banshee/trunk)
Deleted: non-group/banshee/tags/0.10.11-1/debian/banshee.install
===================================================================
--- non-group/banshee/trunk/debian/banshee.install 2006-08-23 23:11:07 UTC (rev 2677)
+++ non-group/banshee/tags/0.10.11-1/debian/banshee.install 2006-08-23 23:22:37 UTC (rev 2679)
@@ -1,22 +0,0 @@
-debian/tmp/etc/gconf/schemas/banshee.schemas
-debian/tmp/usr/bin
-debian/tmp/usr/share
-debian/tmp/usr/lib/pkgconfig
-debian/tmp/usr/lib/banshee/*.dll
-debian/tmp/usr/lib/banshee/*.config
-debian/tmp/usr/lib/banshee/*.exe
-debian/tmp/usr/lib/banshee/*.mdb
-debian/tmp/usr/lib/banshee/*.so
-debian/tmp/usr/lib/banshee/Banshee.MediaEngine/
-debian/tmp/usr/lib/banshee/Banshee.Dap/
-debian/tmp/usr/lib/banshee/Banshee.Plugins/Audioscrobbler.dll*
-debian/tmp/etc/gconf/schemas/audioscrobbler.schemas
-debian/tmp/usr/lib/banshee/Banshee.Plugins/FileSystemMonitor.dll*
-debian/tmp/etc/gconf/schemas/filesystemmonitor.schemas
-debian/tmp/usr/lib/banshee/Banshee.Plugins/MetadataSearch.dll*
-debian/tmp/etc/gconf/schemas/metadatasearch.schemas
-debian/tmp/usr/lib/banshee/Banshee.Plugins/MMKeys.dll*
-debian/tmp/etc/gconf/schemas/mmkeys.schemas
-debian/tmp/usr/lib/banshee/Banshee.Plugins/NotificationAreaIcon.dll*
-debian/tmp/etc/gconf/schemas/banshee-notificationareaicon.schemas
-debian/banshee.xpm /usr/share/pixmaps
Copied: non-group/banshee/tags/0.10.11-1/debian/banshee.install (from rev 2678, non-group/banshee/trunk/debian/banshee.install)
Deleted: non-group/banshee/tags/0.10.11-1/debian/changelog
===================================================================
--- non-group/banshee/trunk/debian/changelog 2006-08-23 23:11:07 UTC (rev 2677)
+++ non-group/banshee/tags/0.10.11-1/debian/changelog 2006-08-23 23:22:37 UTC (rev 2679)
@@ -1,198 +0,0 @@
-banshee (0.10.10-3) unstable; urgency=low
-
- * Remove libmono-cairo1.0-cil from Build-Depends again. The FTBFS was only
- caused by an too old gtk-sharp2 on powerpc and ia64
- * Move gstreamer0.10-plugins-ugly from Depends to Recommends as it is not a
- hard dependency but only useful to have
- * debian/patches/04_total-play-time.diff:
- + Incorporate patch from John Wright to fix the display of the total play
- time if in search mode (Closes: #370202)
- * debian/banshee.menu,
- debian/banshee.xpm:
- + Install a menu file and a xpm icon, generated from upstream's png
- (Closes: #360062)
- * debian/patches/03_cvs-backports.diff:
- Some additional CVS backports from the stable branch:
- - deadlock when burning CDs on SMP machines
- - slightly optimized playlist handling and column sorting
- - fix small usuability bug. When changing to a source that has less
- elements than the current position in the former source was don't show
- an empty source that would be shown correctly after scrolling.
- - Add id3v2mux to the list of MP3 tag muxers if none was specified
- - before burning calculate the total duration of the selection and
- ensure the media is large enough to hold it.
- * debian/patches/05_cover-popup-scaling.diff:
- + Scale the cover popup if width or height are greater then 75% of the
- available screen size. Otherwise it might fill your complete screen and
- you have to kill banshee.
-
- -- Sebastian Dröge <slomo at ubuntu.com> Wed, 7 Jun 2006 18:46:40 +0200
-
-banshee (0.10.10-2) unstable; urgency=low
-
- * Add libmono-cairo1.0-cil to Build-Depends to fix FTBFS on powerpc
-
- -- Sebastian Dröge <slomo at ubuntu.com> Fri, 12 May 2006 13:36:56 +0200
-
-banshee (0.10.10-1) unstable; urgency=low
-
- * New upstream release (Closes: #358780)
- * debian/patches/01_typefinding.diff:
- + Updated
- * debian/patches/02_notification-area-transparency.diff:
- + Make the background of the notification area icon transparent
- * debian/patches/03_cvs-backports.diff:
- A bunch of backports from CVS:
- - Make 'return' the default action key for dialogs
- - Add Path.DirectorySeparatorChar to 'StartsWith' check
- to determine if files should be copied, otherwise
- 'Music to import' will be treated as 'Music'
- - properly load files in shallow directories from command line
- - ctrl+w hides banshee to the tray
- - Show empty strings instead of 0 for TrackNumber == 0
- - Don't show 0 KB/Sec for tracks
- - Use String.Replace() instead of Regex.Replace() as this is much faster
- * Update Standards-Version to 3.7.2
- * Build-Depend on cli-common-dev (>= 0.4.0)
- * Build-Depend on libipod-cil (>= 0.5.16)
- * Build-Depend on mono-gmcs
- * Disable building of the NJB plugin as it doesn't work at all for us
- * Call dh_clideps with -d to prevent duplicated Depends
-
- -- Sebastian Dröge <slomo at ubuntu.com> Fri, 12 May 2006 12:15:55 +0200
-
-banshee (0.10.9-1) unstable; urgency=low
-
- * New upstream release
- + Xing MP3 encoder removed upstream, thus we use an unmodified tarball now
- * Add avahi-daemon to the Depends of banshee-daap
- * Add gstreamer0.10-gnomevfs to the Depends of banshee
- * Removed libsqlite3-0 and libmono0 from banshee's Depends as those are
- finally added where they belong to (libmono-sqlite1.0-cil and mono-jit)
- * Change Build-Depends:
- + libavahi-cil -> libavahi1.0-cil: library transition to conform with the
- latest version of the CLI policy
- + libdbus* (>= 0.61-3) -> libdbus* (>= 0.60): the broken 0.61-{1,2}
- disappeared from the pool and only >= 0.60 is required.
- + Added libmono-sqlite1.0-cil: was in mono-classlib-1.0 before
- + Added gstreamer0.10-plugins-base-apps, gstreamer0.10-plugins-base,
- gstreamer0.10-gnomevfs, gstreamer0.10-plugins-good
- + *gstreamer* (>= 0.9.7) -> *gstreamer* (>= 0.10.3): Tighten Build-Depends
- as required by configure
- * Updated debian/copyright
- * 01_notification-area-icon-plugin-schema.diff:
- + Dropped, applied upstream
- * 01_typefinding.diff:
- + Re-enable typefinding with gst0.10 and fix the bug that was the cause
- for it beeing disabled.
-
- -- Sebastian Dröge <slomo at ubuntu.com> Mon, 20 Mar 2006 17:42:17 +0100
-
-banshee (0.10.8+dfsg-1) unstable; urgency=low
-
- * New upstream release
- * Append dfsg to the version to reflect the changed tarball (removed Xing
- MP3 encoder)
- * Package the new Notification Area Icon plugin that was splitted from
- the core into a independent plugin
- * 01_notification-area-icon-plugin-schema.diff:
- + Fix the GConf keys that were forgotten at the last-minute rename from
- TrayIcon to NotificationAreaIcon
-
- -- Sebastian Dröge <slomo at ubuntu.com> Mon, 13 Mar 2006 14:23:44 +0100
-
-banshee (0.10.7-1) unstable; urgency=low
-
- * New upstream release (Closes: #354914)
- * Use gstreamer0.10
-
- -- Sebastian Dröge <slomo at ubuntu.com> Mon, 6 Mar 2006 12:00:40 +0100
-
-banshee (0.10.6-3) unstable; urgency=low
-
- * Another rebuild for libdbus-1-cil
-
- -- Sebastian Dröge <slomo at ubuntu.com> Wed, 1 Mar 2006 19:53:39 +0100
-
-banshee (0.10.6-2) unstable; urgency=low
-
- * Rebuild against dbus 0.61 (Closes: #354858)
- * Fix spelling in banshee and banshee-daap description (Closes: #354703)
-
- -- Sebastian Dröge <slomo at ubuntu.com> Wed, 1 Mar 2006 17:28:30 +0100
-
-banshee (0.10.6-1) unstable; urgency=low
-
- * New upstream release
- * 06_fix-Encoding-ASCII-null-termination.diff,
- 07_fix-daap-segfault.diff,
- 08_notification-area-icon-64bit.diff:
- - Dropped, included upstream
- * Tighten Build-Depend:
- + libipod-cil (>= 0.5.15)
- + mono-mcs and libmono-dev (>= 1.1.10)
- + libsqlite3-dev (>= 3.2)
- + libgtk2-dev (>= 2.8)
- * Suggest banshee-daap
-
- -- Sebastian Dröge <slomo at ubuntu.com> Mon, 13 Feb 2006 11:03:30 +0100
-
-banshee (0.10.5-1) unstable; urgency=low
-
- * New upstream release (Closes: #349117)
- * Move DAAP plugin to a separate package (banshee-daap) as this plugin
- causes many crashes when enabled and pulls in additional dependencies
- * debian/compat:
- + Updated to 5
- * debian/control:
- + Tighten Build-Depends on Gtk# to 2.8
- + Remove unneeded Build-Depends on libbonobo2-dev
- + Build-Depend on debhelper (>= 5)
- * 01_fix-dllmaps.diff:
- - Dropped, fixed upstream
- * 02_dbus0.6.diff:
- - Dropped, fixed upstream
- * 05_ipod-sharp.dll.config.diff:
- + Updated
- * 06_fix-Encoding-ASCII-null-termination.diff:
- + NUL terminate the process name as ASIIEncoding does not do this
- * 07_fix-daap-segfault.diff:
- + Fix a segfault at startup with the DAAP plugin
- * 08_notification-area-icon-64bit.diff:
- + Fix the Notification Area Icon on 64 bit architectures (which seems to
- fix playback on this architectures too)
-
- -- Sebastian Dröge <slomo at ubuntu.com> Tue, 7 Feb 2006 11:00:55 +0100
-
-banshee (0.10.4-1) unstable; urgency=low
-
- * New upstream release
- * Upload to unstable
- * Enable DAAP support
- * Update Build-Depends
-
- -- Sebastian Dröge <slomo at ubuntu.com> Tue, 17 Jan 2006 21:46:47 +0100
-
-banshee (0.10.2-1) experimental; urgency=low
-
- * New upstream release
- * NJB support is enabled now
- * 02_dbus0.6.diff:
- + Use correct, new soname for dbus 0.60
- * 03_njb-sharp.dll.config.diff, 04_MusicBrainz.dll.config.diff,
- 05_ipod-sharp.dll.config.diff:
- + Use correct sonames
- * 02_fix-AudioCdCore.diff:
- - Dropped, included upstream
-
- -- Sebastian Dröge <slomo at ubuntu.com> Fri, 30 Dec 2005 16:49:38 +0100
-
-banshee (0.10-1) experimental; urgency=low
-
- * Initial Version (Closes: #296467)
- * Repackaged upstream tarball to get rid fo XING MP3 encoder sources
- * 02_fix-AudioCdCore.diff:
- + Fix banshee to correctly notice newly inserted audio CDs
-
- -- Sebastian Dröge <slomo at ubuntu.com> Wed, 7 Dec 2005 21:05:50 +0100
-
Copied: non-group/banshee/tags/0.10.11-1/debian/changelog (from rev 2678, non-group/banshee/trunk/debian/changelog)
Deleted: non-group/banshee/tags/0.10.11-1/debian/patches/03_cvs-backports.diff
===================================================================
--- non-group/banshee/trunk/debian/patches/03_cvs-backports.diff 2006-08-23 23:11:07 UTC (rev 2677)
+++ non-group/banshee/tags/0.10.11-1/debian/patches/03_cvs-backports.diff 2006-08-23 23:22:37 UTC (rev 2679)
@@ -1,667 +0,0 @@
-===================================================================
-RCS file: /cvs/gnome/banshee/src/Banshee.Plugins/NotificationAreaIcon/NotificationAreaIconPlugin.cs,v
-retrieving revision 1.4
-retrieving revision 1.5
-diff -u -r1.4 -r1.5
---- src/Banshee.Plugins/NotificationAreaIcon/NotificationAreaIconPlugin.cs 2006/03/20 08:38:40 1.4
-+++ src/Banshee.Plugins/NotificationAreaIcon/NotificationAreaIconPlugin.cs 2006/04/14 15:47:34 1.5
-@@ -101,6 +101,10 @@
- Globals.ActionManager.UI.RemoveUi(ui_manager_id);
- }
-
-+ protected override void InterfaceInitialize() {
-+ InterfaceElements.MainWindow.KeyPressEvent += OnKeyPressEvent;
-+ }
-+
- private void Init() {
- notif_area = new NotificationArea(Catalog.GetString("Banshee"));
- notif_area.DestroyEvent += OnDestroyEvent;
-@@ -121,6 +125,20 @@
- Init();
- }
-
-+ [GLib.ConnectBefore]
-+ private void OnKeyPressEvent(object o, KeyPressEventArgs args)
-+ {
-+ bool handled = false;
-+
-+ if (args.Event.Key == Gdk.Key.w && (args.Event.State & Gdk.ModifierType.ControlMask) != 0) {
-+ handled = true;
-+ InterfaceElements.MainWindow.Visible = !InterfaceElements.MainWindow.Visible;
-+ ResizeMoveWindow();
-+ }
-+
-+ args.RetVal = handled;
-+ }
-+
- private void OnNotificationAreaIconClick(object o, ButtonPressEventArgs args) {
- switch(args.Event.Button) {
- case 1:
-
-===================================================================
-RCS file: /cvs/gnome/banshee/src/PlaylistView.cs,v
-retrieving revision 1.46
-retrieving revision 1.47
-diff -u -r1.46 -r1.47
---- src/PlaylistView.cs 2006/04/06 14:35:18 1.46
-+++ src/PlaylistView.cs 2006/04/14 15:33:43 1.47
-@@ -408,9 +408,9 @@
- TrackInfo ti = model.IterTrackInfo(iter);
- if(ti == null) {
- return;
-- }
--
-- SetRendererAttributes((CellRendererText)cell, Convert.ToString(ti.TrackNumber), iter);
-+ }
-+ SetRendererAttributes((CellRendererText)cell,
-+ ti.TrackNumber > 0 ? Convert.ToString(ti.TrackNumber) : String.Empty, iter);
- }
-
- protected void TrackCellArtist(TreeViewColumn tree_column,
-@@ -479,7 +479,7 @@
- }
-
- uint plays = ti.PlayCount;
-- SetRendererAttributes((CellRendererText)cell, plays > 0 ? Convert.ToString(plays) : "", iter);
-+ SetRendererAttributes((CellRendererText)cell, plays > 0 ? Convert.ToString(plays) : String.Empty, iter);
- }
-
- protected void TrackCellRating(TreeViewColumn tree_column,
-
-===================================================================
-RCS file: /cvs/gnome/banshee/src/TrackProperties.cs,v
-retrieving revision 1.25
-retrieving revision 1.26
-diff -u -r1.25 -r1.26
---- src/TrackProperties.cs 2006/03/17 04:44:41 1.25
-+++ src/TrackProperties.cs 2006/04/09 15:53:39 1.26
-@@ -250,7 +250,7 @@
- try {
- Entagged.AudioFile af = new Entagged.AudioFile(track.Uri.LocalPath,
- Banshee.Gstreamer.Utilities.DetectMimeType(track.Uri));
-- BitRate.Text = (af.Bitrate / 1024).ToString() + " " + Catalog.GetString("KB/Second");
-+ BitRate.Text = af.Bitrate.ToString() + " " + Catalog.GetString("KB/Second");
- SampleRate.Text = String.Format(Catalog.GetString("{0} KHz"), (double)af.SampleRate / 1000.0);
- Vbr.Text = af.IsVbr ? Catalog.GetString("Yes") : Catalog.GetString("No");
- Channels.Text = af.Channels.ToString();
-
-===================================================================
-RCS file: /cvs/gnome/banshee/entagged-sharp/Mpc/Util/MpcInfoReader.cs,v
-retrieving revision 1.8
-retrieving revision 1.9
-diff -u -r1.8 -r1.9
---- entagged-sharp/Mpc/Util/MpcInfoReader.cs 2005/11/30 16:12:52 1.8
-+++ entagged-sharp/Mpc/Util/MpcInfoReader.cs 2006/04/09 15:53:40 1.9
-@@ -76,7 +76,7 @@
- info.SamplingRate = mpcH.SamplingRate;
- info.EncodingType = mpcH.EncodingType;
- info.ExtraEncodingInfos = mpcH.EncoderInfo;
-- info.Bitrate = ComputeBitrate( info.Duration.Seconds, raf.Length );
-+ info.Bitrate = ComputeBitrate( (int)info.Duration.TotalSeconds, raf.Length );
-
- return info;
- }
-
-===================================================================
-RCS file: /cvs/gnome/banshee/src/Banshee.Base/SqlGenerator.cs,v
-retrieving revision 1.3
-diff -u -r1.3 SqlGenerator.cs
---- src/Banshee.Base/SqlGenerator.cs 13 Feb 2006 22:18:08 -0000 1.3
-+++ src/Banshee.Base/SqlGenerator.cs 14 Apr 2006 14:59:52 -0000
-@@ -103,7 +103,7 @@
-
- public static string EscapeQuotes(string str)
- {
-- return str == null ? String.Empty : Regex.Replace(str, "'", @"''");
-+ return str == null ? String.Empty : str.Replace("'", "''");
- }
-
- public static Statement Empty
-
-===================================================================
-RCS file: /cvs/gnome/banshee/src/Banshee.Base/FileTrackInfo.cs,v
-retrieving revision 1.4
-retrieving revision 1.5
-diff -u -r1.4 -r1.5
---- src/Banshee.Base/FileTrackInfo.cs 2006/04/09 21:30:23 1.4
-+++ src/Banshee.Base/FileTrackInfo.cs 2006/05/07 17:00:45 1.5
-@@ -105,8 +105,8 @@
- }
-
- while(path != null && path != String.Empty) {
-- path = Path.GetDirectoryName(path);
- fileName = Path.GetFileName (path);
-+ path = Path.GetDirectoryName(path);
- if(album == String.Empty) {
- album = fileName;
- continue;
-
-===================================================================
-RCS file: /cvs/gnome/banshee/src/Banshee.Widgets/HigMessageDialog.cs,v
-retrieving revision 1.2
-retrieving revision 1.3
-diff -u -r1.2 -r1.3
---- src/Banshee.Widgets/HigMessageDialog.cs 2006/02/13 22:18:14 1.2
-+++ src/Banshee.Widgets/HigMessageDialog.cs 2006/05/07 17:00:45 1.3
-@@ -159,7 +159,7 @@
- DefaultResponse = response;
- button.AddAccelerator ("activate",
- accel_group,
-- (uint) Gdk.Key.Escape,
-+ (uint) Gdk.Key.Return,
- 0,
- Gtk.AccelFlags.Visible);
- }
-
-===================================================================
-RCS file: /cvs/gnome/banshee/src/Banshee.Base/LibraryTrackInfo.cs,v
-retrieving revision 1.10
-retrieving revision 1.11
-diff -u -r1.10 -r1.11
---- src/Banshee.Base/LibraryTrackInfo.cs 2006/05/01 23:44:50 1.10
-+++ src/Banshee.Base/LibraryTrackInfo.cs 2006/05/07 17:00:45 1.11
-@@ -86,7 +86,7 @@
-
- private string MoveToPlace(string old_filename, bool initial_import)
- {
-- bool in_library = old_filename.StartsWith (Globals.Library.Location);
-+ bool in_library = old_filename.StartsWith (Globals.Library.Location + Path.DirectorySeparatorChar);
- // Console.WriteLine ("\"{0}\" in \"{1}\": {2}", old_filename, Core.Library.Location, in_library);
-
- if (initial_import && !in_library) {
-
-===================================================================
-RCS file: /cvs/gnome/banshee/src/PlayerInterface.cs,v
-retrieving revision 1.167.2.4
-retrieving revision 1.167.2.5
-diff -u -r1.167.2.4 -r1.167.2.5
---- src/PlayerInterface.cs 2006/05/01 16:33:17 1.167.2.4
-+++ src/PlayerInterface.cs 2006/05/16 17:08:41 1.167.2.5
-@@ -404,6 +404,7 @@
- playlistView.DragDataGet += OnPlaylistViewDragDataGet;
- playlistView.DragDrop += OnPlaylistViewDragDrop;
- playlistView.Selection.Changed += OnPlaylistViewSelectionChanged;
-+ playlistView.Vadjustment.Changed += OnPlaylistViewVadjustmentChanged;
-
- playlistView.EnableModelDragSource(
- Gdk.ModifierType.Button1Mask | Gdk.ModifierType.Button3Mask,
-@@ -922,6 +923,15 @@
- !(source is AudioCdSource || source is DapSource);
- }
-
-+ private void OnPlaylistViewVadjustmentChanged(object o, EventArgs args)
-+ {
-+ double max_offset = playlistView.Vadjustment.Upper - playlistView.Vadjustment.PageSize;
-+
-+ if(playlistView.Vadjustment.Value > max_offset) {
-+ playlistView.Vadjustment.Value = max_offset;
-+ }
-+ }
-+
- private void OnSourceManagerActiveSourceChanged(SourceEventArgs args)
- {
- ThreadAssist.ProxyToMain(HandleSourceChanged);
-
-===================================================================
-RCS file: /cvs/gnome/banshee/src/Main.cs,v
-retrieving revision 1.29
-retrieving revision 1.29.2.1
-diff -u -r1.29 -r1.29.2.1
---- src/Main.cs 2006/02/13 22:18:07 1.29
-+++ src/Main.cs 2006/05/19 20:34:43 1.29.2.1
-@@ -56,6 +56,9 @@
- #endif
- }
-
-+ [System.Runtime.InteropServices.DllImport("libdbus-glib-1")]
-+ private static extern void dbus_g_thread_init();
-+
- private static void Startup(string [] args)
- {
- try {
-@@ -63,6 +66,7 @@
- } catch {}
-
- Gtk.Application.Init();
-+ dbus_g_thread_init();
-
- Globals.ArgumentQueue = new ArgumentQueue(new ArgumentLayout [] {
- new ArgumentLayout("enqueue <files>","Files to enqueue, must be last argument specified"),
-
-===================================================================
-RCS file: /cvs/gnome/banshee/src/PlaylistView.cs,v
-retrieving revision 1.45.2.1
-retrieving revision 1.45.2.2
-diff -u -r1.45.2.1 -r1.45.2.2
---- src/PlaylistView.cs 2006/04/05 20:26:22 1.45.2.1
-+++ src/PlaylistView.cs 2006/05/19 18:24:23 1.45.2.2
-@@ -77,6 +77,14 @@
- public PlaylistColumn PlaysColumn;
- public PlaylistColumn LastPlayedColumn;
-
-+ private class ColumnSorter : IComparer
-+ {
-+ public int Compare(object a, object b)
-+ {
-+ return (a as PlaylistColumn).Order.CompareTo((b as PlaylistColumn).Order);
-+ }
-+ }
-+
- public PlaylistView(PlaylistModel model)
- {
- // set up columns
-@@ -121,8 +129,10 @@
- 8, (int)ColumnId.LastPlayed);
- columns.Add(LastPlayedColumn);
-
-+ columns.Sort(new ColumnSorter());
-+
- foreach(PlaylistColumn plcol in columns) {
-- InsertColumn(plcol.Column, plcol.Order);
-+ AppendColumn(plcol.Column);
- }
-
- // FIXME: would be nice to have these as PlaylistColumns too...
-
-===================================================================
-RCS file: /cvs/gnome/banshee/src/Banshee.Base/Database.cs,v
-retrieving revision 1.6
-retrieving revision 1.6.2.1
-diff -u -r1.6 -r1.6.2.1
---- src/Banshee.Base/Database.cs 2006/02/13 22:18:07 1.6
-+++ src/Banshee.Base/Database.cs 2006/05/19 18:24:23 1.6.2.1
-@@ -1,4 +1,3 @@
--
- /***************************************************************************
- * Database.cs
- *
-@@ -94,7 +93,8 @@
- CREATE TABLE PlaylistEntries (
- EntryID INTEGER PRIMARY KEY,
- PlaylistID INTEGER NOT NULL,
-- TrackID INTEGER NOT NULL
-+ TrackID INTEGER NOT NULL,
-+ ViewOrder INTEGER NOT NULL DEFAULT 0
- )");
- }
- }
-@@ -120,6 +120,13 @@
- } catch(ApplicationException) {
- LogCore.Instance.PushDebug("Adding new database column", "RemoteLookupStatus INTEGER");
- Execute("ALTER TABLE Tracks ADD RemoteLookupStatus INTEGER");
-+ }
-+
-+ try {
-+ QuerySingle("SELECT ViewOrder FROM PlaylistEntries LIMIT 1");
-+ } catch(ApplicationException) {
-+ LogCore.Instance.PushDebug("Adding new database column", "ViewOrder INTEGER");
-+ Execute("ALTER TABLE PlaylistEntries ADD ViewOrder INTEGER NOT NULL DEFAULT 0");
- }
- }
- }
-
-===================================================================
-RCS file: /cvs/gnome/banshee/src/Banshee.Base/Sources/PlaylistSource.cs,v
-retrieving revision 1.5.2.1
-retrieving revision 1.5.2.2
-diff -u -r1.5.2.1 -r1.5.2.2
---- src/Banshee.Base/Sources/PlaylistSource.cs 2006/05/01 16:33:19 1.5.2.1
-+++ src/Banshee.Base/Sources/PlaylistSource.cs 2006/05/19 18:24:24 1.5.2.2
-@@ -1,9 +1,8 @@
--
- /***************************************************************************
- * PlaylistSource.cs
- *
-- * Copyright (C) 2005 Novell
-- * Written by Aaron Bockover (aaron at aaronbock.net)
-+ * Copyright (C) 2005-2006 Novell, Inc.
-+ * Written by Aaron Bockover <aaron at abock.org>
- ****************************************************************************/
-
- /* THIS FILE IS LICENSED UNDER THE MIT LICENSE AS OUTLINED IMMEDIATELY BELOW:
-@@ -52,6 +51,8 @@
- }
-
- private ArrayList tracks = new ArrayList();
-+ private Queue remove_queue = new Queue();
-+ private Queue append_queue = new Queue();
- private int id;
-
- public PlaylistSource() : this(0)
-@@ -84,18 +85,39 @@
- }
-
- private void LoadFromDatabase()
-- {
-+ {
- Name = (string)Globals.Library.Db.QuerySingle(String.Format(
- @"SELECT Name
- FROM Playlists
- WHERE PlaylistID = '{0}'",
- id
- ));
--
-+
-+ // check to see if ViewOrder has ever been set, if not, perform
-+ // a default ordering as a compatibility update
-+ if(Convert.ToInt32(Globals.Library.Db.QuerySingle(String.Format(
-+ @"SELECT COUNT(*)
-+ FROM PlaylistEntries
-+ WHERE PlaylistID = '{0}'
-+ AND ViewOrder > 0",
-+ id))) <= 0) {
-+ Console.WriteLine("Performing compatibility update on playlist '{0}'", Name);
-+ Globals.Library.Db.Execute(String.Format(
-+ @"UPDATE PlaylistEntries
-+ SET ViewOrder = (ROWID -
-+ (SELECT COUNT(*)
-+ FROM PlaylistEntries
-+ WHERE PlaylistID < '{0}'))
-+ WHERE PlaylistID = '{0}'",
-+ id
-+ ));
-+ }
-+
- IDataReader reader = Globals.Library.Db.Query(String.Format(
- @"SELECT TrackID
- FROM PlaylistEntries
-- WHERE PlaylistID = '{0}'",
-+ WHERE PlaylistID = '{0}'
-+ ORDER BY ViewOrder",
- id
- ));
-
-@@ -143,6 +165,7 @@
- if(track is LibraryTrackInfo) {
- lock(TracksMutex) {
- tracks.Add(track);
-+ append_queue.Enqueue(track);
- }
- OnUpdated();
- }
-@@ -152,6 +175,7 @@
- {
- lock(TracksMutex) {
- tracks.Remove(track);
-+ remove_queue.Enqueue(track);
- }
- }
-
-@@ -169,36 +193,88 @@
- id
- ));
-
-+ tracks.Clear();
-+ append_queue.Clear();
-+ remove_queue.Clear();
-+
- SourceManager.RemoveSource(this);
- playlists.Remove(this);
- }
-
- public override void Commit()
- {
-- Globals.Library.Db.Execute(String.Format(
-- @"DELETE FROM PlaylistEntries
-- WHERE PlaylistID = '{0}'",
-- id
-- ));
-+ if(remove_queue.Count > 0) {
-+ lock(TracksMutex) {
-+ while(remove_queue.Count > 0) {
-+ TrackInfo track = remove_queue.Dequeue() as TrackInfo;
-+ Globals.Library.Db.Execute(String.Format(
-+ @"DELETE FROM PlaylistEntries
-+ WHERE PlaylistID = '{0}'
-+ AND TrackID = '{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
-- ));
-+ if(append_queue.Count > 0) {
-+ lock(TracksMutex) {
-+ while(append_queue.Count > 0) {
-+ TrackInfo track = append_queue.Dequeue() as TrackInfo;
-+ Globals.Library.Db.Execute(String.Format(
-+ @"INSERT INTO PlaylistEntries
-+ VALUES (NULL, '{0}', '{1}', (
-+ SELECT CASE WHEN MAX(ViewOrder)
-+ THEN MAX(ViewOrder) + 1
-+ ELSE 1 END
-+ FROM PlaylistEntries
-+ WHERE PlaylistID = '{0}')
-+ )", id, track.TrackId
-+ ));
-+ }
- }
- }
- }
-
- public override void Reorder(TrackInfo track, int position)
- {
-- RemoveTrack(track);
- lock(TracksMutex) {
-+ int sql_position = 1;
-+
-+ if(position > 0) {
-+ TrackInfo sibling = tracks[position] as TrackInfo;
-+ if(sibling == track || sibling == null) {
-+ return;
-+ }
-+
-+ sql_position = Convert.ToInt32(Globals.Library.Db.QuerySingle(String.Format(
-+ @"SELECT ViewOrder
-+ FROM PlaylistEntries
-+ WHERE PlaylistID = '{0}'
-+ AND TrackID = '{1}'
-+ LIMIT 1", id, sibling.TrackId)
-+ ));
-+ } else if(tracks[position] == track) {
-+ return;
-+ }
-+
-+ Globals.Library.Db.Execute(String.Format(
-+ @"UPDATE PlaylistEntries
-+ SET ViewOrder = ViewOrder + 1
-+ WHERE PlaylistID = '{0}'
-+ AND ViewOrder >= '{1}'",
-+ id, sql_position
-+ ));
-+
-+ Globals.Library.Db.Execute(String.Format(
-+ @"UPDATE PlaylistEntries
-+ SET ViewOrder = '{1}'
-+ WHERE PlaylistID = '{0}'
-+ AND TrackID = '{2}'",
-+ id, sql_position, track.TrackId
-+ ));
-+
-+ tracks.Remove(track);
- tracks.Insert(position, track);
- }
- }
-@@ -223,10 +299,13 @@
-
- int removed_count = 0;
-
-- foreach(TrackInfo track in args.Tracks) {
-- if(tracks.Contains(track)) {
-- tracks.Remove(track);
-- removed_count++;
-+ lock(TracksMutex) {
-+ foreach(TrackInfo track in args.Tracks) {
-+ if(tracks.Contains(track)) {
-+ tracks.Remove(track);
-+ remove_queue.Enqueue(track);
-+ removed_count++;
-+ }
- }
- }
-
-
---- src/banshee.exe.config.in.old 2006-05-22 21:13:16.504959272 +0200
-+++ src/banshee.exe.config.in 2006-05-22 21:13:59.524419320 +0200
-@@ -6,4 +6,5 @@
- <dllmap dll="gdk-x11-2.0" target="libgdk-x11-2.0.so.0" />
- <dllmap dll="libbanshee" target="@expanded_libdir@/@PACKAGE@/libbanshee.so" />
- <dllmap dll="libX11" target="libX11.so.6" />
-+ <dllmap dll="libdbus-glib-1" target="libdbus-glib-1.so.2" />
- </configuration>
-
-===================================================================
-RCS file: /cvs/gnome/banshee/libbanshee/gst-cd-rip-0.10.c,v
-retrieving revision 1.4.2.1
-retrieving revision 1.4.2.2
-diff -u -r1.4.2.1 -r1.4.2.2
---- libbanshee/gst-cd-rip-0.10.c 2006/04/03 21:33:27 1.4.2.1
-+++ libbanshee/gst-cd-rip-0.10.c 2006/05/29 19:05:12 1.4.2.2
-@@ -197,8 +197,8 @@
- g_warning("vorbisenc added without oggmux, attempting to insert oggmux element in pipeline");
- pipeline = g_strdup_printf("audioconvert ! %s ! oggmux", encoder_pipeline);
- } else if((strstr(encoder_pipeline, "lame") != NULL || strstr(encoder_pipeline, "xingenc") != NULL) &&
-- strstr(encoder_pipeline, "id3mux") == NULL) {
-- const gchar *muxer_names [] = { "taglibid3mux", "id3mux", NULL};
-+ strstr(encoder_pipeline, "mux") == NULL) {
-+ const gchar *muxer_names [] = { "id3v2mux", "taglibid3mux", "id3mux", NULL};
- gint i;
-
- for(i = 0; muxer_names[i] != NULL; i++) {
-
-===================================================================
-RCS file: /cvs/gnome/banshee/src/BurnCore.cs,v
-retrieving revision 1.28.2.3
-retrieving revision 1.28.2.4
-diff -u -r1.28.2.3 -r1.28.2.4
---- src/BurnCore.cs 2006/04/07 21:33:55 1.28.2.3
-+++ src/BurnCore.cs 2006/05/29 20:03:03 1.28.2.4
-@@ -1,8 +1,8 @@
- /***************************************************************************
- * BurnCore.cs
- *
-- * Copyright (C) 2005 Novell
-- * Written by Aaron Bockover (aaron at aaronbock.net)
-+ * Copyright (C) 2005-2006 Novell, Inc.
-+ * Written by Aaron Bockover <aaron at abock.org>
- ****************************************************************************/
-
- /* THIS FILE IS LICENSED UNDER THE MIT LICENSE AS OUTLINED IMMEDIATELY BELOW:
-@@ -72,10 +72,18 @@
-
- canceled = false;
-
-+ double total_seconds = 0;
-+
- foreach(TrackInfo track in encodeQueue) {
-- // 44.1 kHz sample rate * 16 bit channel resolution * 2 channels (stereo)
-- estimated_encoded_bytes += track.Duration.TotalSeconds * 176400.0;
-+ total_seconds += track.Duration.TotalSeconds;
-+ }
-+
-+ if(!HaveRequiredSpace(total_seconds)) {
-+ return;
- }
-+
-+ // 44.1 kHz sample rate * 16 bit channel resolution * 2 channels (stereo)
-+ estimated_encoded_bytes = total_seconds * 176400.0;
-
- long free_space = PathUtil.GetDirectoryAvailableSpace(Paths.TempDir);
- if(free_space >= 0 && estimated_encoded_bytes >= free_space) {
-@@ -159,6 +167,49 @@
- Catalog.GetString("None of the songs selected for this CD could be found."));
- }
- }
-+
-+ private bool HaveRequiredSpace(double totalduration)
-+ {
-+ string selected_burner_id = null;
-+ try {
-+ selected_burner_id = (string)Globals.Configuration.Get(GConfKeys.CDBurnerId);
-+ } catch {
-+ }
-+
-+ BurnDrive drive = BurnUtil.GetDriveByIdOrDefault(selected_burner_id);
-+
-+ if(drive == null) {
-+ LogCore.Instance.PushWarning(
-+ Catalog.GetString("Problem creating CD"),
-+ Catalog.GetString("No CD writers were found on your system."));
-+ return false;
-+ }
-+
-+ if(drive.MediaSize <= 0) {
-+ LogCore.Instance.PushWarning(
-+ Catalog.GetString("Insert Blank CD"),
-+ Catalog.GetString("Please insert a blank CD disk for the write process."));
-+ return false;
-+ }
-+
-+ long available = (long)(((drive.MediaSize / 1024 / 1024) - 1) * 48 / 7);
-+ long remaining = (long)(available - totalduration);
-+
-+ if(remaining < 0) {
-+ int minutes = (int)(-remaining / 60);
-+ string msg = String.Format(
-+ Catalog.GetString("The inserted media is not large enough to hold your selected music.") + " " +
-+ Catalog.GetPluralString(
-+ "{0} more minute is needed on the media.",
-+ "{0} more minutes are needed on the media.",
-+ minutes), minutes);
-+
-+ LogCore.Instance.PushWarning(Catalog.GetString("Not Enough Space on Disc"), msg);
-+ return false;
-+ }
-+
-+ return true;
-+ }
-
- private void OnFileEncodeComplete(object o, FileCompleteArgs args)
- {
-@@ -301,7 +352,6 @@
- private BurnDrive drive;
- private BurnRecorder recorder;
- private BurnRecorderActions currentAction;
-- private long TotalDuration;
- private ActiveUserEvent user_event;
-
- public Burner(BurnCore.DiskType diskType, Queue burnQueue)
-@@ -333,27 +383,6 @@
- }
- }
-
-- private bool HaveRequiredSpace()
-- {
-- long available = (long)(((drive.MediaSize / 1024 / 1024) - 1) * 48 / 7);
-- long remaining = (long)(available - TotalDuration);
--
-- if(remaining < 0) {
-- int minutes = (int)(-remaining / 60);
-- string msg =
-- Catalog.GetString("The inserted media is not large enough to hold your selected music.") + " " +
-- Catalog.GetPluralString(
-- "{0} more minute is needed on the media.",
-- "{0} more minutes are needed on the media.",
-- minutes);
--
-- LogCore.Instance.PushWarning(Catalog.GetString("Not Enough Space on Disc"), msg);
-- return false;
-- }
--
-- return true;
-- }
--
- private void BurnThread()
- {
- ArrayList tracks = new ArrayList();
-
Copied: non-group/banshee/tags/0.10.11-1/debian/patches/03_cvs-backports.diff (from rev 2678, non-group/banshee/trunk/debian/patches/03_cvs-backports.diff)
More information about the Pkg-mono-svn-commits
mailing list