diff --git a/airsonic-main/src/main/java/org/airsonic/player/ajax/PlayQueueInfo.java b/airsonic-main/src/main/java/org/airsonic/player/ajax/PlayQueueInfo.java index a52c8dc5..afce1b77 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/ajax/PlayQueueInfo.java +++ b/airsonic-main/src/main/java/org/airsonic/player/ajax/PlayQueueInfo.java @@ -61,7 +61,7 @@ public class PlayQueueInfo { durationSeconds += entry.getDuration(); } } - return StringUtil.formatDuration(durationSeconds); + return StringUtil.formatDurationMSS(durationSeconds); } public boolean isStopEnabled() { diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/VideoPlayerController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/VideoPlayerController.java index bb0c6199..8e891907 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/VideoPlayerController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/VideoPlayerController.java @@ -89,7 +89,7 @@ public class VideoPlayerController { public static Map createSkipOffsets(int durationSeconds) { LinkedHashMap result = new LinkedHashMap(); for (int i = 0; i < durationSeconds; i += 60) { - result.put(StringUtil.formatDuration(i), i); + result.put(StringUtil.formatDurationMSS(i), i); } return result; } diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/Playlist.java b/airsonic-main/src/main/java/org/airsonic/player/domain/Playlist.java index 22666fc1..61161b39 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/Playlist.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/Playlist.java @@ -113,7 +113,7 @@ public class Playlist { } public String getDurationAsString() { - return StringUtil.formatDuration(durationSeconds); + return StringUtil.formatDurationMSS(durationSeconds); } public Date getCreated() { diff --git a/airsonic-main/src/main/java/org/airsonic/player/util/StringUtil.java b/airsonic-main/src/main/java/org/airsonic/player/util/StringUtil.java index ebb0f725..b3ebfd58 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/util/StringUtil.java +++ b/airsonic-main/src/main/java/org/airsonic/player/util/StringUtil.java @@ -228,7 +228,7 @@ public final class StringUtil { /** * Formats a duration with minutes and seconds, e.g., "93:45" */ - public static String formatDuration(int seconds) { + public static String formatDurationMSS(int seconds) { int minutes = seconds / 60; int secs = seconds % 60; diff --git a/airsonic-main/src/test/java/org/airsonic/player/util/StringUtilTestCase.java b/airsonic-main/src/test/java/org/airsonic/player/util/StringUtilTestCase.java index c45cd14b..f57d62f4 100644 --- a/airsonic-main/src/test/java/org/airsonic/player/util/StringUtilTestCase.java +++ b/airsonic-main/src/test/java/org/airsonic/player/util/StringUtilTestCase.java @@ -81,17 +81,18 @@ public class StringUtilTestCase extends TestCase { assertEquals("Error in formatBytes().", "4413,43 TB", StringUtil.formatBytes(4852617603375432L, locale)); } - public void testFormatDuration() { - assertEquals("Error in formatDuration().", "0:00", StringUtil.formatDuration(0)); - assertEquals("Error in formatDuration().", "0:05", StringUtil.formatDuration(5)); - assertEquals("Error in formatDuration().", "0:10", StringUtil.formatDuration(10)); - assertEquals("Error in formatDuration().", "0:59", StringUtil.formatDuration(59)); - assertEquals("Error in formatDuration().", "1:00", StringUtil.formatDuration(60)); - assertEquals("Error in formatDuration().", "1:01", StringUtil.formatDuration(61)); - assertEquals("Error in formatDuration().", "1:10", StringUtil.formatDuration(70)); - assertEquals("Error in formatDuration().", "10:00", StringUtil.formatDuration(600)); - assertEquals("Error in formatDuration().", "45:50", StringUtil.formatDuration(2750)); - assertEquals("Error in formatDuration().", "83:45", StringUtil.formatDuration(5025)); + public void testFormatDurationMSS() { + assertEquals("Error in formatDurationMSS().", "0:00", StringUtil.formatDurationMSS(0)); + assertEquals("Error in formatDurationMSS().", "0:05", StringUtil.formatDurationMSS(5)); + assertEquals("Error in formatDurationMSS().", "0:10", StringUtil.formatDurationMSS(10)); + assertEquals("Error in formatDurationMSS().", "0:59", StringUtil.formatDurationMSS(59)); + assertEquals("Error in formatDurationMSS().", "1:00", StringUtil.formatDurationMSS(60)); + assertEquals("Error in formatDurationMSS().", "1:01", StringUtil.formatDurationMSS(61)); + assertEquals("Error in formatDurationMSS().", "1:10", StringUtil.formatDurationMSS(70)); + assertEquals("Error in formatDurationMSS().", "10:00", StringUtil.formatDurationMSS(600)); + assertEquals("Error in formatDurationMSS().", "45:50", StringUtil.formatDurationMSS(2750)); + assertEquals("Error in formatDurationMSS().", "83:45", StringUtil.formatDurationMSS(5025)); + assertEquals("Error in formatDurationMSS().", "121:40", StringUtil.formatDurationMSS(7300)); } public void testSplit() {