bugfix duration

theopenbit · theopenbit · commit 938b41f29c21 · 2015-06-08T21:17:28.000Z
diff --git a/yaacc/src/de/yaacc/browser/ServerListActivity.java b/yaacc/src/de/yaacc/browser/ServerListActivity.java
@@ -133,5 +133,11 @@ public void deviceUpdated(Device<?, ?, ?> device) {
         populateDeviceList();
     }
 
+    @Override
+    public void onResume(){
+        super.onResume();
+        //refresh device list
+        populateDeviceList();
+    }
 
 }
diff --git a/yaacc/src/de/yaacc/player/AbstractPlayer.java b/yaacc/src/de/yaacc/player/AbstractPlayer.java
@@ -452,6 +452,7 @@ protected long getSilenceDuration() {
      * @param duration in millis
      */
     public void startTimer(final long duration) {
+        Log.d(getClass().getName(), "Start timer duration: " + duration);
         if (playerTimer != null) {
             cancelTimer();
         }
diff --git a/yaacc/src/de/yaacc/player/LocalBackgoundMusicPlayer.java b/yaacc/src/de/yaacc/player/LocalBackgoundMusicPlayer.java
@@ -276,15 +276,24 @@ public URI getAlbumArt() {
     }
 
     @SuppressLint("SimpleDateFormat")
-    private String formatMillis(int millis) {
-        SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm:ss");
-        //next don't work with this line dateFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
-        return dateFormat.format(new Date(millis));
-
-        /*int minutes = (int) Math.floor(millis / 1000 / 60);
-        int seconds = (int) ((millis / 1000) - (minutes * 60));
-        return "00:"+minutes + ":" + String.format("%02d", seconds);
-        */
+    private String formatMillis(long millis) {
+
+        StringBuffer buf = new StringBuffer();
+
+        int hours = (int) (millis / (1000 * 60 * 60));
+        int minutes = (int) ((millis % (1000 * 60 * 60)) / (1000 * 60));
+        int seconds = (int) (((millis % (1000 * 60 * 60)) % (1000 * 60)) / 1000);
+
+        buf
+                .append(String.format("%02d", hours))
+                .append(":")
+                .append(String.format("%02d", minutes))
+                .append(":")
+                .append(String.format("%02d", seconds));
+
+        return buf.toString();
+
+
     }
 
     @Override
diff --git a/yaacc/src/de/yaacc/player/PlayableItem.java b/yaacc/src/de/yaacc/player/PlayableItem.java
@@ -58,16 +58,16 @@ public PlayableItem(Item item, int defaultDuration){
 			setMimeType(mimeType);
 
 			// calculate duration
-			SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm:ss");
-            dateFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
+
 			long millis = defaultDuration;
 			if (resource.getDuration() != null) {
-				try {
-					Date date = dateFormat.parse(resource.getDuration());
-					//millis = (date.getHours() * 3600 + date.getMinutes() * 60 + date.getSeconds()) * 1000;
-                    millis = date.getTime();
-                    Log.d(getClass().getName(), "Duration date object: " + date);
-				} catch (ParseException e) {
+			    try{
+                    String[] tokens = resource.getDuration().split(":");
+					millis = (Long.valueOf(tokens[0]) * 3600 + Long.valueOf(tokens[1]) * 60 + Long.valueOf(tokens[2])) * 1000;
+
+                    Log.d(getClass().getName(), "resource.getDuration(): " + resource.getDuration() +" millis: " + millis);
+
+				} catch (Exception e) {
 					Log.d(getClass().getName(), "bad duration format", e);
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -133,5 +133,11 @@ public void deviceUpdated(Device<?, ?, ?> device) {`
`133`	`133`	`populateDeviceList();`
`134`	`134`	`}`
`135`	`135`
	`136`	`+ @Override`
	`137`	`+ public void onResume(){`
	`138`	`+ super.onResume();`
	`139`	`+ //refresh device list`
	`140`	`+ populateDeviceList();`
	`141`	`+ }`
`136`	`142`
`137`	`143`	`}`
Original file line number	Diff line number	Diff line change
`@@ -452,6 +452,7 @@ protected long getSilenceDuration() {`
`452`	`452`	`* @param duration in millis`
`453`	`453`	`*/`
`454`	`454`	`public void startTimer(final long duration) {`
	`455`	`+ Log.d(getClass().getName(), "Start timer duration: " + duration);`
`455`	`456`	`if (playerTimer != null) {`
`456`	`457`	`cancelTimer();`
`457`	`458`	`}`