rhythmbox r5739 - in trunk: . plugins/ipod sources

[teuf svn gnome org]

Author: teuf
Date: Wed Jun 11 21:42:50 2008
New Revision: 5739
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=5739&view=rev

Log:
Patch by Shogun <shogun713 at gmail dot com>
* plugins/ipod/rb-ipod-source.c: (impl_get_mime_types): favour aac
over mp3s when transferring to an ipod
* sources/rb-removable-media-source.c: (impl_paste): audio/x-m4a
files are to be handled as audio/mpeg files
Fixes bug #508537


Modified:
   trunk/ChangeLog
   trunk/plugins/ipod/rb-ipod-source.c
   trunk/sources/rb-removable-media-source.c

Modified: trunk/plugins/ipod/rb-ipod-source.c
==============================================================================
--- trunk/plugins/ipod/rb-ipod-source.c	(original)
+++ trunk/plugins/ipod/rb-ipod-source.c	Wed Jun 11 21:42:50 2008
@@ -1669,8 +1669,8 @@
 	GList *ret = NULL;
 
 	/* FIXME: we should really query HAL for this */
-	ret = g_list_prepend (ret, g_strdup ("audio/aac"));
 	ret = g_list_prepend (ret, g_strdup ("audio/mpeg"));
+	ret = g_list_prepend (ret, g_strdup ("audio/aac"));
 
 	return ret;
 }

Modified: trunk/sources/rb-removable-media-source.c
==============================================================================
--- trunk/sources/rb-removable-media-source.c	(original)
+++ trunk/sources/rb-removable-media-source.c	Wed Jun 11 21:42:50 2008
@@ -322,6 +322,8 @@
 			/* if it has a bitrate, assume it's mp3-in-wav */
 			if (rhythmdb_entry_get_ulong (entry, RHYTHMDB_PROP_BITRATE) != 0)
 				entry_mime = "audio/mpeg";
+		} else if (strcmp (entry_mime, "audio/x-m4a") == 0) {
+			entry_mime = "audio/aac";
 		} else if (strcmp (entry_mime, "application/x-id3") == 0) {
 			entry_mime = "audio/mpeg";
 		} else if (strcmp (entry_mime, "audio/x-flac") == 0) {