Hello community,
here is the log from the commit of package banshee-1
checked in at Sat Nov 8 00:30:17 CET 2008.
--------
--- GNOME/banshee-1/banshee-1.changes 2008-11-07 12:39:43.000000000 +0100
+++ /mounts/work_src_done/STABLE/banshee-1/banshee-1.changes 2008-11-07 16:59:13.000000000 +0100
@@ -1,0 +2,7 @@
+Fri Nov 7 10:43:45 EST 2008 - abockover@suse.de
+
+- Updated to 1.4.0.1 Release
+ * Fixes an issue with the G1 not reading cover art at wrong folder depth
+ * Fix a path typo
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
banshee-1-1.4.0.tar.bz2
New:
----
banshee-1-1.4.0.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ banshee-1.spec ++++++
--- /var/tmp/diff_new_pack.a14246/_old 2008-11-08 00:29:02.000000000 +0100
+++ /var/tmp/diff_new_pack.a14246/_new 2008-11-08 00:29:02.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package banshee-1 (Version 1.4.0)
+# spec file for package banshee-1 (Version 1.4.0.1)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,7 +19,7 @@
Name: banshee-1
-Version: 1.4.0
+Version: 1.4.0.1
Release: 1
License: X11/MIT
Summary: A music playback and management application
@@ -334,6 +334,10 @@
%changelog
* Fri Nov 07 2008 abockover@suse.de
+- Updated to 1.4.0.1 Release
+ * Fixes an issue with the G1 not reading cover art at wrong folder depth
+ * Fix a path typo
+* Fri Nov 07 2008 abockover@suse.de
- Updated to 1.4.0 Release
* Fixes on top of mass storage extension support T-Mobile G1/Android Phone
* Added verification tool at build time to test DLL mapping to
++++++ banshee-1-1.4.0.tar.bz2 -> banshee-1-1.4.0.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/banshee-1-1.4.0/ChangeLog new/banshee-1-1.4.0.1/ChangeLog
--- old/banshee-1-1.4.0/ChangeLog 2008-11-07 12:34:25.000000000 +0100
+++ new/banshee-1-1.4.0.1/ChangeLog 2008-11-07 16:40:26.000000000 +0100
@@ -1,5 +1,32 @@
2008-11-07 Aaron Bockover
+ Banshee 1.4.0.1 Released
+
+2008-11-07 Aaron Bockover
+
+ * src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/AndroidDevice.cs:
+ Ensure a proper folder depth and path layout
+
+ * src/Dap/Banshee.Dap/Banshee.Dap/MediaGroupSource.cs: Removed some
+ overhead do to reworking of the PurchasedMusicActions
+
+ * src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs:
+ See if the device provides its own track path and use it if so,
+ otherwise create one
+
+ * src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs: Do not
+ use number formatting on what will always be integers; copy and paste
+ failbaug
+
+ * src/Dap/Banshee.Dap/Banshee.Dap.Gui/PurchasedMusicActions.cs: Fixed
+ bug where only one device per instance would show up due to the UI
+ actions already being registered
+
+ * src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs:
+ Allow the device to provide a preferred path layout
+
+2008-11-07 Aaron Bockover
+
Banshee 1.4.0 Released
2008-11-07 Aaron Bockover
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/banshee-1-1.4.0/configure new/banshee-1-1.4.0.1/configure
--- old/banshee-1-1.4.0/configure 2008-11-07 13:35:22.000000000 +0100
+++ new/banshee-1-1.4.0.1/configure 2008-11-07 16:37:41.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for banshee-1 1.4.0.
+# Generated by GNU Autoconf 2.61 for banshee-1 1.4.0.1.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -726,8 +726,8 @@
# Identity of this package.
PACKAGE_NAME='banshee-1'
PACKAGE_TARNAME='banshee-1'
-PACKAGE_VERSION='1.4.0'
-PACKAGE_STRING='banshee-1 1.4.0'
+PACKAGE_VERSION='1.4.0.1'
+PACKAGE_STRING='banshee-1 1.4.0.1'
PACKAGE_BUGREPORT=''
# Factoring default headers for most tests.
@@ -1632,7 +1632,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures banshee-1 1.4.0 to adapt to many kinds of systems.
+\`configure' configures banshee-1 1.4.0.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1707,7 +1707,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of banshee-1 1.4.0:";;
+ short | recursive ) echo "Configuration of banshee-1 1.4.0.1:";;
esac
cat <<\_ACEOF
@@ -1940,7 +1940,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-banshee-1 configure 1.4.0
+banshee-1 configure 1.4.0.1
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1954,7 +1954,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by banshee-1 $as_me 1.4.0, which was
+It was created by banshee-1 $as_me 1.4.0.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2307,7 +2307,7 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-ASM_DISPLAY_VERSION="1.4.0"
+ASM_DISPLAY_VERSION="1.4.0.1"
DISTCHECK_CONFIGURE_FLAGS="--disable-docs --enable-mtp --enable-daap --enable-podcast --enable-release"
@@ -2778,7 +2778,7 @@
# Define the identity of the package.
PACKAGE='banshee-1'
- VERSION='1.4.0'
+ VERSION='1.4.0.1'
cat >>confdefs.h <<_ACEOF
@@ -3028,7 +3028,8 @@
-ASM_VERSION="$VERSION.0"
+ASM_VERSION="$VERSION"
+#ASM_VERSION="$VERSION.0"
@@ -5274,7 +5275,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5277 "configure"' > conftest.$ac_ext
+ echo '#line 5278 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -8326,11 +8327,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8329: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8330: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8333: \$? = $ac_status" >&5
+ echo "$as_me:8334: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8616,11 +8617,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8619: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8620: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8623: \$? = $ac_status" >&5
+ echo "$as_me:8624: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8720,11 +8721,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8723: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8724: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8727: \$? = $ac_status" >&5
+ echo "$as_me:8728: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -11084,7 +11085,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext < conftest.$ac_ext <&5)
+ (eval echo "\"\$as_me:13589: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13592: \$? = $ac_status" >&5
+ echo "$as_me:13593: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13689,11 +13690,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13692: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13693: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13696: \$? = $ac_status" >&5
+ echo "$as_me:13697: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -15272,11 +15273,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15275: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15276: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15279: \$? = $ac_status" >&5
+ echo "$as_me:15280: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15376,11 +15377,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15379: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15380: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15383: \$? = $ac_status" >&5
+ echo "$as_me:15384: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17583,11 +17584,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17586: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17587: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17590: \$? = $ac_status" >&5
+ echo "$as_me:17591: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17873,11 +17874,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17876: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17877: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17880: \$? = $ac_status" >&5
+ echo "$as_me:17881: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17977,11 +17978,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17980: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17981: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17984: \$? = $ac_status" >&5
+ echo "$as_me:17985: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -28534,7 +28535,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by banshee-1 $as_me 1.4.0, which was
+This file was extended by banshee-1 $as_me 1.4.0.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -28587,7 +28588,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-banshee-1 config.status 1.4.0
+banshee-1 config.status 1.4.0.1
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/banshee-1-1.4.0/configure.ac new/banshee-1-1.4.0.1/configure.ac
--- old/banshee-1-1.4.0/configure.ac 2008-11-05 00:19:09.000000000 +0100
+++ new/banshee-1-1.4.0.1/configure.ac 2008-11-07 16:37:27.000000000 +0100
@@ -1,6 +1,6 @@
dnl Automake setup
-AC_INIT([banshee-1], [1.4.0])
-ASM_DISPLAY_VERSION="1.4.0"
+AC_INIT([banshee-1], [1.4.0.1])
+ASM_DISPLAY_VERSION="1.4.0.1"
DISTCHECK_CONFIGURE_FLAGS="--disable-docs --enable-mtp --enable-daap --enable-podcast --enable-release"
AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
@@ -11,7 +11,8 @@
AM_INIT_AUTOMAKE([1.9 dist-bzip2 tar-ustar])
AM_MAINTAINER_MODE
-ASM_VERSION="$VERSION.0"
+ASM_VERSION="$VERSION"
+#ASM_VERSION="$VERSION.0"
AC_SUBST(ASM_VERSION)
AC_SUBST(ASM_DISPLAY_VERSION)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/banshee-1-1.4.0/src/AssemblyInfo.cs new/banshee-1-1.4.0.1/src/AssemblyInfo.cs
--- old/banshee-1-1.4.0/src/AssemblyInfo.cs 2008-11-07 13:35:38.000000000 +0100
+++ new/banshee-1-1.4.0.1/src/AssemblyInfo.cs 2008-11-07 16:37:57.000000000 +0100
@@ -2,8 +2,8 @@
using System.Reflection;
using System.Runtime.CompilerServices;
-[assembly: AssemblyVersion ("1.4.0.0")]
-[assembly: AssemblyDisplayVersion ("1.4.0")]
+[assembly: AssemblyVersion ("1.4.0.1")]
+[assembly: AssemblyDisplayVersion ("1.4.0.1")]
[assembly: AssemblyTitle ("Banshee")]
[assembly: AssemblyDescription ("Banshee Media Player")]
[assembly: AssemblyCopyright ("Copyright (C) 2005-2008 Novell, 2005 Aaron Bockover")]
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/banshee-1-1.4.0/src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs new/banshee-1-1.4.0.1/src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs
--- old/banshee-1-1.4.0/src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs 2008-09-12 03:52:41.000000000 +0200
+++ new/banshee-1-1.4.0.1/src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs 2008-11-07 16:07:19.000000000 +0100
@@ -177,8 +177,8 @@
if (new_progress >= 0.0 && new_progress <= 1.0 && Math.Abs (new_progress - old_progress) > 0.001) {
lock (number_format) {
string disp_progress = String.Format (ProgressMessage,
- import_element.ProcessedCount.ToString ("N", number_format),
- import_element.TotalCount.ToString ("N", number_format));
+ import_element.ProcessedCount,
+ import_element.TotalCount);
user_job.Title = disp_progress;
user_job.Status = String.IsNullOrEmpty (message) ? Catalog.GetString ("Scanning...") : message;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/banshee-1-1.4.0/src/Dap/Banshee.Dap/Banshee.Dap/MediaGroupSource.cs new/banshee-1-1.4.0.1/src/Dap/Banshee.Dap/Banshee.Dap/MediaGroupSource.cs
--- old/banshee-1-1.4.0/src/Dap/Banshee.Dap/Banshee.Dap/MediaGroupSource.cs 2008-11-07 10:59:36.000000000 +0100
+++ new/banshee-1-1.4.0.1/src/Dap/Banshee.Dap/Banshee.Dap/MediaGroupSource.cs 2008-11-07 16:02:47.000000000 +0100
@@ -41,10 +41,9 @@
namespace Banshee.Dap
{
- public abstract class MediaGroupSource : SmartPlaylistSource, IDisposable
+ public abstract class MediaGroupSource : SmartPlaylistSource
{
private DapSource parent;
- private PurchasedMusicActions actions;
public MediaGroupSource (DapSource parent, string name) : base (name, parent)
{
@@ -57,20 +56,12 @@
String.Format (Catalog.GetString ("Delete From {0}"), parent.Name));
if (this is IPurchasedMusicSource) {
- actions = new PurchasedMusicActions ((IPurchasedMusicSource)this);
+ PurchasedMusicActions.Create ();
Properties.Set<Assembly> ("ActiveSourceUIResource.Assembly", Assembly.GetExecutingAssembly ());
Properties.SetString ("ActiveSourceUIResource", "PurchasedMusicSourceUI.xml");
}
}
-
- public void Dispose ()
- {
- if (actions != null) {
- actions.Dispose ();
- actions = null;
- }
- }
protected override void AfterInitialized ()
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/banshee-1-1.4.0/src/Dap/Banshee.Dap/Banshee.Dap.Gui/PurchasedMusicActions.cs new/banshee-1-1.4.0.1/src/Dap/Banshee.Dap/Banshee.Dap.Gui/PurchasedMusicActions.cs
--- old/banshee-1-1.4.0/src/Dap/Banshee.Dap/Banshee.Dap.Gui/PurchasedMusicActions.cs 2008-11-07 10:55:46.000000000 +0100
+++ new/banshee-1-1.4.0.1/src/Dap/Banshee.Dap/Banshee.Dap.Gui/PurchasedMusicActions.cs 2008-11-07 16:02:32.000000000 +0100
@@ -38,12 +38,16 @@
{
public class PurchasedMusicActions : BansheeActionGroup
{
- private IPurchasedMusicSource source;
-
- public PurchasedMusicActions (IPurchasedMusicSource source) : base ("dap-purchased-music")
+ private static PurchasedMusicActions instance;
+ public static void Create ()
+ {
+ if (instance == null) {
+ instance = new PurchasedMusicActions ();
+ }
+ }
+
+ private PurchasedMusicActions () : base ("dap-purchased-music")
{
- this.source = source;
-
AddImportant (
new ActionEntry ("PurchasedMusicImportAction", null,
Catalog.GetString ("Import Purchased Music"), null,
@@ -52,18 +56,21 @@
this["PurchasedMusicImportAction"].IconName = Stock.Save;
- Actions.AddActionGroup (this);
+ Actions.SourceActions.Updated += OnUpdateActions;
+ Register ();
}
-
- public override void Dispose ()
+
+ private void OnUpdateActions (Banshee.Sources.Source source)
{
- Actions.RemoveActionGroup (this);
- base.Dispose ();
+ UpdateAction ("PurchasedMusicImportAction", source is IPurchasedMusicSource);
}
-
+
private void OnImportPurchasedMusic (object o, EventArgs args)
{
- source.Import ();
+ IPurchasedMusicSource source = Actions.SourceActions.ActionSource as IPurchasedMusicSource;
+ if (source != null) {
+ source.Import ();
+ }
}
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/banshee-1-1.4.0/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/AndroidDevice.cs new/banshee-1-1.4.0.1/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/AndroidDevice.cs
--- old/banshee-1-1.4.0/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/AndroidDevice.cs 2008-11-07 11:05:27.000000000 +0100
+++ new/banshee-1-1.4.0.1/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/AndroidDevice.cs 2008-11-07 15:48:22.000000000 +0100
@@ -29,8 +29,10 @@
using System;
using Mono.Unix;
+using Banshee.Base;
using Banshee.Hardware;
using Banshee.Library;
+using Banshee.Collection;
using Banshee.Collection.Database;
namespace Banshee.Dap.MassStorage
@@ -50,7 +52,7 @@
};
private static string [] audio_folders = new string [] {
- "music/",
+ "Music/",
"amazonmp3/"
};
@@ -101,6 +103,10 @@
// packages/apps/Music/src/com/android/music/MusicUtils.java
// <3 open source
+ public override int FolderDepth {
+ get { return 2; }
+ }
+
public override string CoverArtFileName {
get { return "AlbumArt.jpg"; }
}
@@ -113,6 +119,14 @@
get { return 320; }
}
+ public override bool GetTrackPath (TrackInfo track, out string path)
+ {
+ path = FileNamePattern.CreateFromTrackInfo (
+ "%artist%%path_sep%%album%%path_sep%%track_number%. %title%",
+ track);
+ return true;
+ }
+
#region Amazon MP3 Store Purchased Tracks Management
public override bool DeleteTrackHook (DatabaseTrackInfo track)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/banshee-1-1.4.0/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs new/banshee-1-1.4.0.1/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs
--- old/banshee-1-1.4.0/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs 2008-11-07 09:21:28.000000000 +0100
+++ new/banshee-1-1.4.0.1/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs 2008-11-07 15:40:56.000000000 +0100
@@ -34,6 +34,7 @@
using Banshee.Base;
using Banshee.Hardware;
+using Banshee.Collection;
using Banshee.Collection.Database;
namespace Banshee.Dap.MassStorage
@@ -106,6 +107,12 @@
return true;
}
+ public virtual bool GetTrackPath (TrackInfo track, out string path)
+ {
+ path = null;
+ return false;
+ }
+
private bool has_is_audio_player_file;
public bool HasIsAudioPlayerFile {
get { return has_is_audio_player_file; }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/banshee-1-1.4.0/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs new/banshee-1-1.4.0.1/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs
--- old/banshee-1-1.4.0/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs 2008-11-07 09:21:38.000000000 +0100
+++ new/banshee-1-1.4.0.1/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs 2008-11-07 15:30:31.000000000 +0100
@@ -534,8 +534,16 @@
private string GetTrackPath (TrackInfo track, string ext)
{
- string file_path = WritePath;
+ string file_path = null;
+ if (ms_device == null || !ms_device.GetTrackPath (track, out file_path)) {
+ file_path = FileNamePattern.CreateFromTrackInfo (track);
+ }
+
+ file_path = System.IO.Path.Combine (WritePath, file_path);
+ file_path += ext;
+ return file_path;
+
/*string artist = FileNamePattern.Escape (track.ArtistName);
string album = FileNamePattern.Escape (track.AlbumTitle);
string number_title = FileNamePattern.Escape (track.TrackNumberTitle);
@@ -572,11 +580,6 @@
file_path = System.IO.Path.Combine (file_path, FileNamePattern.CreateFromTrackInfo (track));
}
*/
-
- file_path = System.IO.Path.Combine (file_path, FileNamePattern.CreateFromTrackInfo (track));
- file_path += ext;
-
- return file_path;
}
}
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org