korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-11-29 15:14:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

AVRCP: return empty string instead of rejecting

Browse Source 
If media attribute is not available for a certain media file, return an
empty string instead of rejecting the request. The spec is not so clear
if only the title should be handled as an empty string when not present,
but this is the only alternative to rejecting the request.

IOP tests showed that some CT devices don't like reject messages: they
never ask for an attribute again if they previously received a REJECTED
message for that attribute. They consider REJECTED as "TG doesn't
implement it these optional attributes" as opposed to what we had
before, "this attribute is currently not available".
This commit is contained in:
Lucas De Marchi 2011-09-28 19:35:56 -03:00 committed by Johan Hedberg
parent 547f9e37b8
commit 138f831787
1 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
audio/avrcp.c
View File

@ -678,46 +678,43 @@ static int mp_get_media_attribute(struct media_player *mp,
valp = mi->title;
break;
case MEDIA_INFO_ARTIST:
if (mi->artist == NULL)
return -ENOENT;
valp = mi->artist;
break;
case MEDIA_INFO_ALBUM:
if (mi->album == NULL)
return -ENOENT;
valp = mi->album;
break;
case MEDIA_INFO_GENRE:
if (mi->genre == NULL)
return -ENOENT;
valp = mi->genre;
break;
case MEDIA_INFO_TRACK:
if (!mi->track)
return -ENOENT;
if (mi->track) {
snprintf(valstr, 20, "%u", mi->track);
valp = valstr;
} else {
valp = NULL;
}
snprintf(valstr, 20, "%u", mi->track);
valp = valstr;
break;
case MEDIA_INFO_N_TRACKS:
if (!mi->ntracks)
return -ENOENT;
if (mi->ntracks) {
snprintf(valstr, 20, "%u", mi->ntracks);
valp = valstr;
} else {
valp = NULL;
}
snprintf(valstr, 20, "%u", mi->ntracks);
valp = valstr;
break;
case MEDIA_INFO_PLAYING_TIME:
if (mi->track_len == 0xFFFFFFFF)
return -ENOENT;
if (mi->track_len == 0xFFFFFFFF) {
snprintf(valstr, 20, "%u", mi->track_len);
valp = valstr;
} else {
valp = NULL;
}
snprintf(valstr, 20, "%u", mi->track_len);
valp = valstr;
break;
default:
return -EINVAL;
return -ENOENT;
}
if (valp) {