tracker r2431 - in trunk: . src/tracker-extract

[mottela svn gnome org]

Author: mottela
Date: Wed Oct 29 17:25:44 2008
New Revision: 2431
URL: http://svn.gnome.org/viewvc/tracker?rev=2431&view=rev

Log:
Take embedded album art with no type if front cover is not found

Modified:
   trunk/ChangeLog
   trunk/src/tracker-extract/tracker-extract-gstreamer.c
   trunk/src/tracker-extract/tracker-extract-mp3.c

Modified: trunk/src/tracker-extract/tracker-extract-gstreamer.c
==============================================================================
--- trunk/src/tracker-extract/tracker-extract-gstreamer.c	(original)
+++ trunk/src/tracker-extract/tracker-extract-gstreamer.c	Wed Oct 29 17:25:44 2008
@@ -546,7 +546,8 @@
 						GST_TYPE_TAG_IMAGE_TYPE,
 						&type);
 			
-			if (type == GST_TAG_IMAGE_TYPE_FRONT_COVER) {
+			if ((type == GST_TAG_IMAGE_TYPE_FRONT_COVER)||
+			    ((type == GST_TAG_IMAGE_TYPE_UNDEFINED)&&(extractor->album_art_size == 0))) {
 				extractor->album_art_data = buffer->data;
 				extractor->album_art_size = buffer->size;
 

Modified: trunk/src/tracker-extract/tracker-extract-mp3.c
==============================================================================
--- trunk/src/tracker-extract/tracker-extract-mp3.c	(original)
+++ trunk/src/tracker-extract/tracker-extract-mp3.c	Wed Oct 29 17:25:44 2008
@@ -708,7 +708,7 @@
 			pic_type  =  data[pos+11+strlen(mime)+1];
 			desc      = &data[pos+11+strlen(mime)+1+1];
 
-			if (pic_type == 3) {
+			if ((pic_type == 3)||((pic_type == 0)&&(albumart->size == 0))) {
 
 				offset = pos+11+strlen(mime)+2+strlen(desc)+1;
 
@@ -924,8 +924,8 @@
 			mime      = &data[pos+11];
 			pic_type  =  data[pos+11+strlen(mime)+1];
 			desc      = &data[pos+11+strlen(mime)+1+1];
-
-			if (pic_type == 3) {
+			
+			if ((pic_type == 3)||((pic_type == 0)&&(albumart->size == 0))) {
 
 				offset = pos+11+strlen(mime)+2+strlen(desc)+1;
 
@@ -1084,7 +1084,7 @@
 			pic_type  =  data[pos+6+3+1+3];
 			desc      = &data[pos+6+3+1+3+1];
 
-			if (pic_type == 3) {
+			if ((pic_type == 3)||((pic_type == 0)&&(albumart->size == 0))) {
 
 				offset = pos+6+3+1+3+1+strlen(desc)+1;