From 91f374edec601c001288f9018830f2173a11a06c Mon Sep 17 00:00:00 2001 From: Steffen Liebergeld Date: Thu, 9 Jun 2016 20:02:01 +0200 Subject: [PATCH] Revert ""duration" parameter in onSetMusicInfo uses microseconds" The decision on granularity of APIs is up to the maintainers. This reverts commit 204748c518c0477689c05730c30ab57859ef89fd. --- .../freeyourgadget/gadgetbridge/activities/DebugActivity.java | 2 +- .../gadgetbridge/externalevents/NotificationListener.java | 2 +- .../gadgetbridge/service/devices/pebble/PebbleProtocol.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DebugActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DebugActivity.java index feea0e95c..3922505ef 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DebugActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DebugActivity.java @@ -218,7 +218,7 @@ public class DebugActivity extends GBActivity { musicSpec.artist = editContent.getText().toString() + "(artist)"; musicSpec.album = editContent.getText().toString() + "(album)"; musicSpec.track = editContent.getText().toString() + "(track)"; - musicSpec.duration = 10 * 1000; + musicSpec.duration = 10; musicSpec.trackCount = 5; musicSpec.trackNr = 2; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java index 369d18bac..a6abd06fb 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java @@ -380,7 +380,7 @@ public class NotificationListener extends NotificationListenerService { if (d.containsKey(MediaMetadata.METADATA_KEY_TITLE)) musicSpec.track = d.getString(MediaMetadata.METADATA_KEY_TITLE); if (d.containsKey(MediaMetadata.METADATA_KEY_DURATION)) - musicSpec.duration = (int)d.getLong(MediaMetadata.METADATA_KEY_DURATION); + musicSpec.duration = (int)d.getLong(MediaMetadata.METADATA_KEY_DURATION) / 1000; // finally, tell the device about it GBApplication.deviceService().onSetMusicInfo(musicSpec); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleProtocol.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleProtocol.java index ffa2ce873..333971451 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleProtocol.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleProtocol.java @@ -1159,7 +1159,7 @@ public class PebbleProtocol extends GBDeviceProtocol { } buf.order(ByteOrder.LITTLE_ENDIAN); - buf.putInt(duration); + buf.putInt(duration * 1000); buf.putShort((short) (trackCount & 0xffff)); buf.putShort((short) (trackNr & 0xffff));