rhythmbox r5918 - in trunk: . plugins/mtpdevice

[jmatthew svn gnome org]

Author: jmatthew
Date: Sat Sep 13 23:58:22 2008
New Revision: 5918
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=5918&view=rev

Log:
2008-09-14  Jonathan Matthew  <jonathan d14n org>

	patch by:  Eric Shattow  <lucent+code gmail com>

	* plugins/mtpdevice/rb-mtp-source.c: (mimetype_to_filetype),
	(filetype_to_mimetype):
	Map LIBMTP_FILETYPE_ASF <=> video/x-ms-asf.  Might not be right,
	but probably helps a bit.  Fixes #552105.


Modified:
   trunk/ChangeLog
   trunk/plugins/mtpdevice/rb-mtp-source.c

Modified: trunk/plugins/mtpdevice/rb-mtp-source.c
==============================================================================
--- trunk/plugins/mtpdevice/rb-mtp-source.c	(original)
+++ trunk/plugins/mtpdevice/rb-mtp-source.c	Sat Sep 13 23:58:22 2008
@@ -473,6 +473,8 @@
 		return LIBMTP_FILETYPE_MP4;
 	} else if (!strcmp (mimetype, "audio/x-ms-wma") || !strcmp (mimetype, "audio/x-ms-asf")) {
 		return LIBMTP_FILETYPE_WMA;
+	} else if (!strcmp (mimetype, "video/x-ms-asf")) {
+		return LIBMTP_FILETYPE_ASF;
 	} else {
 		rb_debug ("\"%s\" is not a supported mimetype", mimetype);
 		return LIBMTP_FILETYPE_UNKNOWN;
@@ -494,6 +496,8 @@
 		return "audio/mp4";
 	} else if (filetype == LIBMTP_FILETYPE_WMV) {
 		return "audio/x-ms-wmv";
+	} else if (filetype == LIBMTP_FILETYPE_ASF) {
+		return "video/x-ms-asf";
 	} else {
 		return NULL;
 	}