File libgphoto2-music-player.patch of Package libgphoto2

Overview Repositories Revisions Requests Users Attributes Meta

File libgphoto2-music-player.patch of Package libgphoto2 (Revision 7515ae79f2ebf16db81436bda17259ae)

Currently displaying revision 7515ae79f2ebf16db81436bda17259ae , Show latest

--- libgphoto2/packaging/generic/print-camera-list.c	2006/04/26 09:15:01	1.1
+++ libgphoto2/packaging/generic/print-camera-list.c	2006/04/26 09:19:50
@@ -381,6 +381,7 @@
 		 const CameraAbilities *a)
 {
 	char	*s, *d, model[256];
+	int	ismusicplayer = 0;
 
 	if (!(a->port & GP_PORT_USB))
 		return 0;
@@ -398,6 +399,15 @@
 	}
 	*d = '\0';
 
+	/* Match out some MTP device vendors and mark them up as musicplayers */
+	if (	(a->usb_vendor == 0x041e)	|| /* Creative Zen */
+		(a->usb_vendor == 0x4102)	|| /* iRiver Zen */
+		(a->usb_vendor == 0x0471)	|| /* Philipps HDx */
+		(a->usb_vendor == 0x413c)	|| /* Dell */
+		(a->usb_vendor == 0x0930)	   /* Toshiba */
+	)
+		ismusicplayer = 1;
+
 	if (a->usb_vendor == 0x07b4 && a->usb_product == 0x105) {
 		/* Marcus says: The Olympus Sierra/Storage dual mode camera firmware.
 		 * Some HAL using software gets deeply confused by this being here
@@ -409,14 +419,26 @@
 	if (a->usb_vendor) { /* usb product id might be 0! */
 		printf("   <match key=\"usb.vendor_id\" int=\"%d\">\n", a->usb_vendor);
 		printf("    <match key=\"usb.product_id\" int=\"%d\">\n", a->usb_product);
-		printf("     <merge key=\"info.category\" type=\"string\">camera</merge>\n");
-		printf("     <append key=\"info.capabilities\" type=\"strlist\">camera</append>\n");
 
-		/* HACK alert ... but the HAL / gnome-volume-manager guys want that */
-		if (NULL!=strstr(a->library,"ptp"))
-			printf("     <merge key=\"camera.access_method\" type=\"string\">ptp</merge>\n");
-		else
-			printf("     <merge key=\"camera.access_method\" type=\"string\">proprietary</merge>\n");
+		if (!ismusicplayer) { /* CAMERA */
+			printf("     <merge key=\"info.category\" type=\"string\">camera</merge>\n");
+			printf("     <append key=\"info.capabilities\" type=\"strlist\">camera</append>\n");
+
+			/* HACK alert ... but the HAL / gnome-volume-manager guys want that */
+			if (NULL!=strstr(a->library,"ptp"))
+				printf("     <merge key=\"camera.access_method\" type=\"string\">ptp</merge>\n");
+			else
+				printf("     <merge key=\"camera.access_method\" type=\"string\">proprietary</merge>\n");
+		} else {
+			printf("     <merge key=\"info.category\" type=\"string\">portable_audio_player</merge>\n");
+			printf("     <append key=\"info.capabilities\" type=\"strlist\">portable_audio_player</append>\n");
+			printf("     <merge key=\"portable_audio_player.access_method\" type=\"string\">libgphoto2</merge>\n");
+			printf("     <merge key=\"portable_audio_player.type\" type=\"string\">user</merge>\n");
+
+			/* FIXME: needs true formats ... But all of them can do MP3 */
+			printf("     <append key=\"portable_audio_player.output_formats\" type=\"strlist\">audio/mpeg</append>\n");
+		}
+		/* leave this here, so we can grep for the names */
 		printf("     <merge key=\"camera.libgphoto2.name\" type=\"string\">%s</merge>\n", model);
 		printf("     <merge key=\"camera.libgphoto2.support\" type=\"bool\">true</merge>\n");
 		printf("    </match>\n");

Places

File libgphoto2-music-player.patch of Package libgphoto2 (Revision 7515ae79f2ebf16db81436bda17259ae)

Places