* [PATCH 2/3] AVRCP: Metadata item #7 should return TrackDuration
@ 2011-08-24 13:05 David Stockwell
2011-08-24 15:02 ` Lucas De Marchi
0 siblings, 1 reply; 5+ messages in thread
From: David Stockwell @ 2011-08-24 13:05 UTC (permalink / raw)
To: linux-bluetooth; +Cc: johan.hedberg
[PATCH 2/3] AVRCP: Metadata item #7 should return TrackDuration
Should be total playing time of the track (TrackDuration)
in msec, not current position within track.
---
audio/control.c | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/audio/control.c b/audio/control.c
index be95c19..eb86029 100644
--- a/audio/control.c
+++ b/audio/control.c
@@ -194,7 +194,8 @@ enum media_info_id {
MEDIA_INFO_TRACK = 4,
MEDIA_INFO_N_TRACKS = 5,
MEDIA_INFO_GENRE = 6,
- MEDIA_INFO_CURRENT_POSITION = 7,
+ MEDIA_INFO_PLAYING_TIME = 7,
+ MEDIA_INFO_LAST,
};
static DBusConnection *connection = NULL;
@@ -928,19 +929,13 @@ static int mp_get_media_attribute(struct media_player
*mp,
len = strlen(valstr);
memcpy(elem->val, valstr, len);
break;
- case MEDIA_INFO_CURRENT_POSITION:
- if (mi->elapsed != 0xFFFFFFFF) {
- uint32_t elapsed;
-
- mp_get_playback_status(mp, NULL, &elapsed, NULL);
-
- snprintf(valstr, 20, "%u", elapsed);
- len = strlen(valstr);
- memcpy(elem->val, valstr, len);
- } else {
+ case MEDIA_INFO_PLAYING_TIME:
+ if (!mi->track_len)
return -ENOENT;
- }
+ snprintf(valstr, 20, "%u", mi->track_len);
+ len = strlen(valstr);
+ memcpy(elem->val, valstr, len);
break;
default:
return -EINVAL;
@@ -1126,7 +1121,7 @@ static int avrcp_handle_get_element_attributes(struct
control *control,
* Return all available information, at least
* title must be returned.
*/
- for (i = 1; i <= MEDIA_INFO_CURRENT_POSITION; i++) {
+ for (i = 1; i < MEDIA_INFO_LAST; i++) {
size = mp_get_media_attribute(control->mp, i,
&pdu->params[pos]);
--
1.7.3.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 2/3] AVRCP: Metadata item #7 should return TrackDuration
2011-08-24 13:05 [PATCH 2/3] AVRCP: Metadata item #7 should return TrackDuration David Stockwell
@ 2011-08-24 15:02 ` Lucas De Marchi
0 siblings, 0 replies; 5+ messages in thread
From: Lucas De Marchi @ 2011-08-24 15:02 UTC (permalink / raw)
To: David Stockwell; +Cc: linux-bluetooth, johan.hedberg
Hi David,
* David Stockwell <dstockwell@frequency-one.com> [2011-08-24 08:05:59 -0500]:
> [PATCH 2/3] AVRCP: Metadata item #7 should return TrackDuration
>
> Should be total playing time of the track (TrackDuration)
> in msec, not current position within track.
> ---
> audio/control.c | 21 ++++++++-------------
> 1 files changed, 8 insertions(+), 13 deletions(-)
>
> diff --git a/audio/control.c b/audio/control.c
> index be95c19..eb86029 100644
> --- a/audio/control.c
> +++ b/audio/control.c
> @@ -194,7 +194,8 @@ enum media_info_id {
> MEDIA_INFO_TRACK = 4,
> MEDIA_INFO_N_TRACKS = 5,
> MEDIA_INFO_GENRE = 6,
> - MEDIA_INFO_CURRENT_POSITION = 7,
> + MEDIA_INFO_PLAYING_TIME = 7,
> + MEDIA_INFO_LAST,
> };
>
> static DBusConnection *connection = NULL;
> @@ -928,19 +929,13 @@ static int mp_get_media_attribute(struct media_player
> *mp,
> len = strlen(valstr);
> memcpy(elem->val, valstr, len);
> break;
> - case MEDIA_INFO_CURRENT_POSITION:
> - if (mi->elapsed != 0xFFFFFFFF) {
> - uint32_t elapsed;
> -
> - mp_get_playback_status(mp, NULL, &elapsed, NULL);
> -
> - snprintf(valstr, 20, "%u", elapsed);
> - len = strlen(valstr);
> - memcpy(elem->val, valstr, len);
> - } else {
> + case MEDIA_INFO_PLAYING_TIME:
> + if (!mi->track_len)
track_len is initialized with 0xFFFFFFFF, because as per spec when it
has this value it means it's not available (see media_info_init())
Otherwise seems good.
regards,
Lucas De Marchi
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/3] AVRCP: Metadata item #7 should return TrackDuration
@ 2011-08-24 3:25 David Stockwell
2011-08-24 8:30 ` Johan Hedberg
0 siblings, 1 reply; 5+ messages in thread
From: David Stockwell @ 2011-08-24 3:25 UTC (permalink / raw)
To: linux-bluetooth
Metadata item #7 should return TrackDuration
Should be total playing time of the track (TrackDuration)
in msec, not current position within track.
---
audio/control.c | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/audio/control.c b/audio/control.c
index be95c19..dd2930c 100644
--- a/audio/control.c
+++ b/audio/control.c
@@ -194,7 +194,8 @@ enum media_info_id {
MEDIA_INFO_TRACK = 4,
MEDIA_INFO_N_TRACKS = 5,
MEDIA_INFO_GENRE = 6,
- MEDIA_INFO_CURRENT_POSITION = 7,
+ MEDIA_INFO_PLAYING_TIME = 7,
+ MEDIA_INFO_LAST = MEDIA_INFO_PLAYING_TIME,
};
static DBusConnection *connection = NULL;
@@ -928,19 +929,13 @@ static int mp_get_media_attribute(struct media_player
*mp,
len = strlen(valstr);
memcpy(elem->val, valstr, len);
break;
- case MEDIA_INFO_CURRENT_POSITION:
- if (mi->elapsed != 0xFFFFFFFF) {
- uint32_t elapsed;
-
- mp_get_playback_status(mp, NULL, &elapsed, NULL);
-
- snprintf(valstr, 20, "%u", elapsed);
- len = strlen(valstr);
- memcpy(elem->val, valstr, len);
- } else {
+ case MEDIA_INFO_PLAYING_TIME:
+ if (!mi->track_len)
return -ENOENT;
- }
+ snprintf(valstr, 20, "%u", mi->track_len);
+ len = strlen(valstr);
+ memcpy(elem->val, valstr, len);
break;
default:
return -EINVAL;
@@ -1126,7 +1121,7 @@ static int avrcp_handle_get_element_attributes(struct
control *control,
* Return all available information, at least
* title must be returned.
*/
- for (i = 1; i <= MEDIA_INFO_CURRENT_POSITION; i++) {
+ for (i = 1; i <= MEDIA_INFO_LAST; i++) {
size = mp_get_media_attribute(control->mp, i,
&pdu->params[pos]);
--
1.7.3.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 2/3] AVRCP: Metadata item #7 should return TrackDuration
2011-08-24 3:25 David Stockwell
@ 2011-08-24 8:30 ` Johan Hedberg
2011-08-24 12:39 ` David Stockwell
0 siblings, 1 reply; 5+ messages in thread
From: Johan Hedberg @ 2011-08-24 8:30 UTC (permalink / raw)
To: David Stockwell; +Cc: linux-bluetooth
Hi David,
On Tue, Aug 23, 2011, David Stockwell wrote:
> @@ -194,7 +194,8 @@ enum media_info_id {
> MEDIA_INFO_TRACK = 4,
> MEDIA_INFO_N_TRACKS = 5,
> MEDIA_INFO_GENRE = 6,
> - MEDIA_INFO_CURRENT_POSITION = 7,
> + MEDIA_INFO_PLAYING_TIME = 7,
> + MEDIA_INFO_LAST = MEDIA_INFO_PLAYING_TIME,
> };
Actually that's not quite what I meant. The idea was this:
MEDIA_INFO_PLAYING_TIME = 7,
MEDIA_INFO_LAST,
That way you can just keep adding new entries above MEDIA_INFO_LAST and
its value will always be the last "real" value + 1 (which also means
that the comparison in the for-loop changes from <= to <).
Johan
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 2/3] AVRCP: Metadata item #7 should return TrackDuration
2011-08-24 8:30 ` Johan Hedberg
@ 2011-08-24 12:39 ` David Stockwell
0 siblings, 0 replies; 5+ messages in thread
From: David Stockwell @ 2011-08-24 12:39 UTC (permalink / raw)
To: Johan Hedberg; +Cc: linux-bluetooth
Hi Johan
-----Original Message-----
From: Johan Hedberg
Sent: Wednesday, August 24, 2011 3:30 AM
To: David Stockwell
Cc: linux-bluetooth@vger.kernel.org
Subject: Re: [PATCH 2/3] AVRCP: Metadata item #7 should return TrackDuration
Hi David,
On Tue, Aug 23, 2011, David Stockwell wrote:
> @@ -194,7 +194,8 @@ enum media_info_id {
> MEDIA_INFO_TRACK = 4,
> MEDIA_INFO_N_TRACKS = 5,
> MEDIA_INFO_GENRE = 6,
> - MEDIA_INFO_CURRENT_POSITION = 7,
> + MEDIA_INFO_PLAYING_TIME = 7,
> + MEDIA_INFO_LAST = MEDIA_INFO_PLAYING_TIME,
> };
Actually that's not quite what I meant. The idea was this:
MEDIA_INFO_PLAYING_TIME = 7,
MEDIA_INFO_LAST,
That way you can just keep adding new entries above MEDIA_INFO_LAST and
its value will always be the last "real" value + 1 (which also means
that the comparison in the for-loop changes from <= to <).
+++++ Thanks. As you can tell, C is not my most frequently used language...
I'll take care of it and resubmit.
Johan
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-08-24 15:02 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-08-24 13:05 [PATCH 2/3] AVRCP: Metadata item #7 should return TrackDuration David Stockwell
2011-08-24 15:02 ` Lucas De Marchi
-- strict thread matches above, loose matches on Subject: below --
2011-08-24 3:25 David Stockwell
2011-08-24 8:30 ` Johan Hedberg
2011-08-24 12:39 ` David Stockwell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.