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

* Reorder a couple artist roles, to be more similar to the familar WMP organisation.

Browse Source
This commit is contained in:
Justin Maggard 2011-02-15 01:03:15 +00:00
parent 3164baa423
commit 87e71c443a
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tagutils/tagutils-asf.c
View File

@ -62,7 +62,7 @@ _asf_read_audio_stream(FILE *fp, struct song_metadata *psong, int size)
case WMAV2:
if( (psong->bitrate/1000+1) >= 385 || psong->samplerate > 48000 )
asprintf(&(psong->dlna_pn), "WMAPRO");
else if( (psong->bitrate / 1000)+1 < 192 )
else if( ((psong->bitrate+1) / 1000) <= 192 )
asprintf(&(psong->dlna_pn), "WMABASE");
else
asprintf(&(psong->dlna_pn), "WMAFULL");
@ -140,7 +140,7 @@ _asf_read_stream_object(FILE *fp, struct song_metadata *psong, __u32 size)
_asf_read_audio_stream(fp, psong, s.TypeSpecificSize);
else if(IsEqualGUID(&s.StreamType, &ASF_StreamBufferStream))
_asf_read_media_stream(fp, psong, s.TypeSpecificSize);
else
else if(!IsEqualGUID(&s.StreamType, &ASF_VideoStream))
{
DPRINTF(E_ERROR, L_SCANNER, "Unknown asf stream type.\n");
}
@ -521,6 +521,12 @@ _get_asffileinfo(char *file, struct song_metadata *psong)
if(buf[0])
psong->contributor[ROLE_CONDUCTOR] = strdup(buf);
}
else if(!strcasecmp(buf, "WM/Composer"))
{
if(_asf_load_string(fp, ValueType, ValueLength, buf, sizeof(buf)))
if(buf[0])
psong->contributor[ROLE_COMPOSER] = strdup(buf);
}
else if(!strcasecmp(buf, "WM/Picture") && (ValueType == ASF_VT_BYTEARRAY))
{
psong->image = _asf_load_picture(fp, ValueLength, psong->image, &psong->image_size);

8
tagutils/tagutils.h
View File

@ -34,11 +34,11 @@
#define ROLE_NOUSE 0
#define ROLE_START 1
#define ROLE_ARTIST 1
#define ROLE_COMPOSER 2
#define ROLE_CONDUCTOR 3
#define ROLE_TRACKARTIST 2
#define ROLE_ALBUMARTIST 3
#define ROLE_BAND 4
#define ROLE_ALBUMARTIST 5
#define ROLE_TRACKARTIST 6
#define ROLE_CONDUCTOR 5
#define ROLE_COMPOSER 6
#define ROLE_LAST 6
#define N_ROLE 7