storm/minidlna
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Put WMA artist tag info where the metadata parser expects it to be.

Browse Source
This commit is contained in:
Justin Maggard 2009-03-25 07:41:12 +00:00
parent 41170f4e30
commit 8bc1fae910
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tagutils/tagutils-asf.c
View File

@ -293,7 +293,7 @@ _asf_load_string(FILE *fp, int type, int size, char *buf, int len)
return i; return i;
} }
static void static void *
_asf_load_picture(FILE *fp, int size, void *bm, int *bm_size) _asf_load_picture(FILE *fp, int size, void *bm, int *bm_size)
{ {
int i; int i;
@ -309,10 +309,21 @@ _asf_load_picture(FILE *fp, int size, void *bm, int *bm_size)
// Picture data <binary data> // Picture data <binary data>
pic_type = fget_byte(fp); size -= 1; pic_type = fget_byte(fp); size -= 1;
pic_size = fget_le32(fp); size -= 2; pic_size = fget_le32(fp); size -= 4;
for(i = 0; i < sizeof(buf) - 1; i++)
{
buf[i] = fget_le16(fp); size -= 2;
if(!buf[i])
break;
}
buf[i] = '\0';
if(i == sizeof(buf) - 1)
{
while(fget_le16(fp))
size -= 2;
}
i = 0;
buf[i] = 0;
if(!strcasecmp(buf, "image/jpeg") || if(!strcasecmp(buf, "image/jpeg") ||
!strcasecmp(buf, "image/jpg") || !strcasecmp(buf, "image/jpg") ||
!strcasecmp(buf, "image/peg")) !strcasecmp(buf, "image/peg"))
@ -355,6 +366,7 @@ _asf_load_picture(FILE *fp, int size, void *bm, int *bm_size)
} }
*bm_size = size; *bm_size = size;
return bm;
} }
static int static int
@ -470,7 +482,7 @@ _get_asffileinfo(char *file, struct song_metadata *psong)
if(_asf_load_string(fp, ValueType, ValueLength, buf, sizeof(buf))) if(_asf_load_string(fp, ValueType, ValueLength, buf, sizeof(buf)))
{ {
if(buf[0]) if(buf[0])
psong->contributor[ROLE_ALBUMARTIST] = strdup(buf); psong->contributor[ROLE_ARTIST] = strdup(buf);
} }
} }
else if(!strcasecmp(buf, "Description") || !strcasecmp(buf, "WM/Track")) else if(!strcasecmp(buf, "Description") || !strcasecmp(buf, "WM/Track"))
@ -499,7 +511,7 @@ _get_asffileinfo(char *file, struct song_metadata *psong)
} }
else if(!strcasecmp(buf, "WM/Picture") && (ValueType == ASF_VT_BYTEARRAY)) else if(!strcasecmp(buf, "WM/Picture") && (ValueType == ASF_VT_BYTEARRAY))
{ {
_asf_load_picture(fp, ValueLength, psong->image, &psong->image_size); psong->image = _asf_load_picture(fp, ValueLength, psong->image, &psong->image_size);
} }
else if(!strcasecmp(buf, "TrackNumber") || !strcasecmp(buf, "WM/TrackNumber")) else if(!strcasecmp(buf, "TrackNumber") || !strcasecmp(buf, "WM/TrackNumber"))
{ {