Hello community,
here is the log from the commit of package banshee
checked in at Fri Jun 2 01:33:30 CEST 2006.
--------
--- GNOME/banshee/banshee.changes 2006-05-31 18:16:38.000000000 +0200
+++ banshee/banshee.changes 2006-06-01 00:25:19.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Jun 1 00:25:06 CEST 2006 - jpr(a)suse.de
+
+- Restore volume properly (#176255)
+- Actually display the dialog when CD burn is too big (#151332)
+- Don't have the mp3 plugins system wide (#179102)
+
+-------------------------------------------------------------------
Old:
----
banshee-sled-cuml-11.diff
New:
----
banshee-sled-cuml-12.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ banshee.spec ++++++
--- /var/tmp/diff_new_pack.B5LI2Z/_old 2006-06-02 01:32:23.000000000 +0200
+++ /var/tmp/diff_new_pack.B5LI2Z/_new 2006-06-02 01:32:23.000000000 +0200
@@ -26,7 +26,7 @@
PreReq: filesystem gconf2
Requires: mono-core
Version: 0.10.9
-Release: 33
+Release: 34
Source0: banshee-%{version}.tar.gz
Source1: gstreamer-xing-0.10.0.tar.gz
Source2: banshee-po.tar.bz2
@@ -36,7 +36,7 @@
Patch2: %{name}-configure.patch
Patch3: %{name}-transparent-trayicon.patch
Patch5: %{name}-fix-icons.patch
-Patch6: %{name}-sled-cuml-11.diff
+Patch6: %{name}-sled-cuml-12.diff
Patch7: %{name}-networkmanager-reconnect.diff
Patch8: %{name}-desktop-ogg-support.patch
Patch9: %{name}-i18n.patch
@@ -206,6 +206,8 @@
rm -f $RPM_BUILD_ROOT/%{gstreamerprefix}/%{_lib}/gstreamer-%{gst_branch}/*.*a
rm -f $RPM_BUILD_ROOT/usr/%{_lib}/banshee/Banshee.Plugins/FileSystemMonitor.dll*
rm -f $RPM_BUILD_ROOT/etc/opt/gnome/gconf/schemas/filesystemmonitor.schemas
+mkdir -p $RPM_BUILD_ROOT/usr/%{_lib}/banshee/gstreamer-%{gst_branch}/
+mv $RPM_BUILD_ROOT/%{gstreamerprefix}/%{_lib}/gstreamer-%{gst_branch}/*.so $RPM_BUILD_ROOT/usr/%{_lib}/banshee/gstreamer-%{gst_branch}/
%post
export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source`
@@ -275,7 +277,8 @@
%defattr(-,root,root)
%dir %{prefix}/%{_lib}/banshee/Banshee.MediaEngine/Helix
%{prefix}/%{_lib}/banshee/Banshee.MediaEngine/Helix/*.dll*
-%{gstreamerprefix}/%{_lib}/gstreamer-%{gst_branch}/*.so
+%dir %{prefix}/%{_lib}/banshee/gstreamer-%{gst_branch}
+%{prefix}/%{_lib}/banshee/gstreamer-%{gst_branch}/*.so
%ifarch %ix86
%{prefix}/%{_lib}/RealPlayer10/plugins/proxyfsys.so
%endif
@@ -299,6 +302,10 @@
%{prefix}/%{_lib}/banshee/Banshee.Plugins/Daap.dll*
%changelog -n banshee
+* Thu Jun 01 2006 - jpr(a)suse.de
+- Restore volume properly (#176255)
+- Actually display the dialog when CD burn is too big (#151332)
+- Don't have the mp3 plugins system wide (#179102)
* Wed May 31 2006 - gekker(a)suse.de
- Update translations for zh_CN (#169091)
* Tue May 30 2006 - gekker(a)suse.de
++++++ banshee-sled-cuml-11.diff -> banshee-sled-cuml-12.diff ++++++
--- GNOME/banshee/banshee-sled-cuml-11.diff 2006-05-19 22:36:03.000000000 +0200
+++ banshee/banshee-sled-cuml-12.diff 2006-06-01 00:15:36.000000000 +0200
@@ -215,10 +215,21 @@
===================================================================
RCS file: /cvs/gnome/banshee/src/BurnCore.cs,v
retrieving revision 1.28
-retrieving revision 1.28.2.3
-diff -u -r1.28 -r1.28.2.3
+retrieving revision 1.28.2.4
+diff -u -r1.28 -r1.28.2.4
--- src/BurnCore.cs 22 Feb 2006 20:19:29 -0000 1.28
-+++ src/BurnCore.cs 7 Apr 2006 21:33:55 -0000 1.28.2.3
++++ src/BurnCore.cs 29 May 2006 20:03:03 -0000 1.28.2.4
+@@ -1,8 +1,8 @@
+ /***************************************************************************
+ * BurnCore.cs
+ *
+- * Copyright (C) 2005 Novell
+- * Written by Aaron Bockover (aaron(a)aaronbock.net)
++ * Copyright (C) 2005-2006 Novell, Inc.
++ * Written by Aaron Bockover <aaron(a)abock.org>
+ ****************************************************************************/
+
+ /* THIS FILE IS LICENSED UNDER THE MIT LICENSE AS OUTLINED IMMEDIATELY BELOW:
@@ -29,6 +29,7 @@
using System;
using System.Collections;
@@ -248,14 +259,22 @@
public BurnCore(DiskType diskType)
{
-@@ -68,6 +72,19 @@
+@@ -68,6 +72,27 @@
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) {
@@ -268,7 +287,7 @@
switch(diskType) {
case DiskType.Audio:
foreach(PipelineProfile cp in PipelineProfile.Profiles) {
-@@ -78,38 +95,69 @@
+@@ -78,38 +103,112 @@
}
break;
case DiskType.Mp3:
@@ -345,13 +364,55 @@
+ LogCore.Instance.PushError(
+ Catalog.GetString("Problem creating CD"),
+ 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 {
}
--
+
- transcoder.Start();
++ 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)
-@@ -120,7 +168,11 @@
+@@ -120,7 +219,11 @@
private void OnFileEncodeTransactionFinished(object o, EventArgs args)
{
if(!canceled) {
@@ -364,7 +425,7 @@
}
}
-@@ -129,12 +181,117 @@
+@@ -129,12 +232,117 @@
canceled = true;
}
@@ -482,7 +543,43 @@
}
public class Burner
-@@ -261,7 +418,7 @@
+@@ -144,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)
+@@ -176,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();
+@@ -261,7 +447,7 @@
string message = null;
if(header == null || header == String.Empty) {
@@ -491,7 +588,7 @@
}
if(message == null || message ==String.Empty) {
-@@ -308,6 +465,7 @@
+@@ -308,6 +494,7 @@
break;
case BurnRecorderActions.Fixating:
user_event.Message = Catalog.GetString("Fixating disk...");
@@ -499,7 +596,7 @@
user_event.CanCancel = false;
break;
}
-@@ -358,6 +516,151 @@
+@@ -358,6 +545,151 @@
if(args.ResponseId != ResponseType.Ok) {
user_event.Cancel();
}
@@ -1000,6 +1097,22 @@
Globals.Configuration.Set(burnKeyParent + "Eject",
(glade["EjectCheck"] as CheckButton).Active);
+Index: src/banshee.in
+===================================================================
+RCS file: /cvs/gnome/banshee/src/banshee.in,v
+retrieving revision 1.12
+retrieving revision 1.12.2.1
+diff -u -r1.12 -r1.12.2.1
+--- src/banshee.in 13 Mar 2006 05:50:13 -0000 1.12
++++ src/banshee.in 29 May 2006 19:05:12 -0000 1.12.2.1
+@@ -7,6 +7,7 @@
+
+ export DYLD_LIBRARY_PATH=@expanded_libdir@${DYLD_LIBRARY_PATH+:$DYLD_LIBRARY_PATH}
+ export LD_LIBRARY_PATH=@expanded_libdir@${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
++export GST_PLUGIN_PATH=@expanded_libdir@/@PACKAGE@/gstreamer-0.10
+
+ if [ "x$1" = "x--debug" ]; then
+ MONO_OPTIONS="--debug"
Index: src/Banshee.Base/BatchTranscoder.cs
===================================================================
RCS file: /cvs/gnome/banshee/src/Banshee.Base/BatchTranscoder.cs,v
@@ -1273,10 +1386,10 @@
===================================================================
RCS file: /cvs/gnome/banshee/src/Banshee.Base/PlayerEngineCore.cs,v
retrieving revision 1.10
-retrieving revision 1.10.2.1
-diff -u -r1.10 -r1.10.2.1
+retrieving revision 1.10.2.2
+diff -u -r1.10 -r1.10.2.2
--- src/Banshee.Base/PlayerEngineCore.cs 20 Mar 2006 08:38:38 -0000 1.10
-+++ src/Banshee.Base/PlayerEngineCore.cs 3 Apr 2006 21:33:29 -0000 1.10.2.1
++++ src/Banshee.Base/PlayerEngineCore.cs 22 May 2006 16:35:47 -0000 1.10.2.2
@@ -81,10 +81,10 @@
engine.EventChanged += OnEngineEventChanged;
@@ -1392,7 +1505,20 @@
}
active_engine = pending_engine;
-@@ -227,7 +288,16 @@
+@@ -214,7 +275,11 @@
+
+ public static ushort Volume {
+ get { return active_engine.Volume; }
+- set { active_engine.Volume = value; }
++ set {
++ foreach(PlayerEngine engine in engines) {
++ engine.Volume = value;
++ }
++ }
+ }
+
+ public static uint Position {
+@@ -227,7 +292,16 @@
}
public static uint Length {
@@ -1410,7 +1536,7 @@
}
public static PlayerEngine ActiveEngine {
-@@ -238,6 +308,12 @@
+@@ -238,6 +312,12 @@
public static PlayerEngine DefaultEngine {
get { return default_engine; }
set {
@@ -2676,6 +2802,22 @@
MCS_FLAGS = -debug
ASSEMBLY_NAME = HelixRemotePlayerEngine
+Index: src/Banshee.Plugins/Makefile.am
+===================================================================
+RCS file: /cvs/gnome/banshee/src/Banshee.Plugins/Makefile.am,v
+retrieving revision 1.8
+retrieving revision 1.8.2.1
+diff -u -r1.8 -r1.8.2.1
+--- src/Banshee.Plugins/Makefile.am 15 Mar 2006 17:43:40 -0000 1.8
++++ src/Banshee.Plugins/Makefile.am 25 May 2006 19:51:41 -0000 1.8.2.1
+@@ -1,7 +1,6 @@
+ SUBDIRS = \
+ Audioscrobbler \
+ Daap \
+- FileSystemMonitor \
+ MetadataSearch \
+ MMKeys \
+ NotificationAreaIcon
Index: src/Banshee.Plugins/Daap/Daap.dll.config.in
===================================================================
RCS file: /cvs/gnome/banshee/src/Banshee.Plugins/Daap/Daap.dll.config.in,v
@@ -2779,10 +2921,10 @@
===================================================================
RCS file: /cvs/gnome/banshee/libbanshee/gst-cd-rip-0.10.c,v
retrieving revision 1.4
-retrieving revision 1.4.2.1
-diff -u -r1.4 -r1.4.2.1
+retrieving revision 1.4.2.2
+diff -u -r1.4 -r1.4.2.2
--- libbanshee/gst-cd-rip-0.10.c 2 Mar 2006 00:16:32 -0000 1.4
-+++ libbanshee/gst-cd-rip-0.10.c 3 Apr 2006 21:33:27 -0000 1.4.2.1
++++ libbanshee/gst-cd-rip-0.10.c 29 May 2006 19:05:12 -0000 1.4.2.2
@@ -98,8 +98,6 @@
GstState state;
gint64 position;
@@ -2807,8 +2949,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++) {
@@ -3042,7 +3184,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 May 2006 20:35:58 -0000
++++ configure.ac 29 May 2006 20:06:43 -0000
@@ -148,7 +148,7 @@
fi
AM_CONDITIONAL(ENABLE_IPOD, test "x$enable_ipodsharp" = "xyes")
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit-help(a)opensuse.org
