Merge remote-tracking branch 'github/master'

[sonitus.git] / src / main / java / net / pterodactylus / sonitus / data / filter / TimeCounterFilter.java

diff --git a/src/main/java/net/pterodactylus/sonitus/data/filter/TimeCounterFilter.java b/src/main/java/net/pterodactylus/sonitus/data/filter/TimeCounterFilter.java
index cfa93af..0eb8281 100644 (file)
--- a/src/main/java/net/pterodactylus/sonitus/data/filter/TimeCounterFilter.java
+++ b/src/main/java/net/pterodactylus/sonitus/data/filter/TimeCounterFilter.java
@@ -21,6 +21,7 @@ import java.io.IOException;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
 
+import net.pterodactylus.sonitus.data.AbstractFilter;
 import net.pterodactylus.sonitus.data.Filter;
 import net.pterodactylus.sonitus.data.Metadata;
 
@@ -31,7 +32,7 @@ import net.pterodactylus.sonitus.data.Metadata;
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public class TimeCounterFilter extends BasicFilter {
+public class TimeCounterFilter extends AbstractFilter implements Filter {
 
        /** The byte counter. */
        private final AtomicLong counter = new AtomicLong();
@@ -95,7 +96,7 @@ public class TimeCounterFilter extends BasicFilter {
        }
 
        //
-       // BASICFILTER METHODS
+       // FILTER METHODS
        //
 
        @Override
@@ -122,7 +123,7 @@ public class TimeCounterFilter extends BasicFilter {
        private void updateTimestamp(boolean now) {
                long timestamp = getMillis() / 1000;
                if (now || (lastTimestamp.get() != timestamp)) {
-                       super.metadataUpdated(parentMetadata.get().comment(String.format("%02d:%02d", timestamp / 60, timestamp % 60)));
+                       super.metadataUpdated(parentMetadata.get().comment(String.format("%s%02d:%02d", (timestamp >= 3600) ? String.format("%d:", timestamp / 3600) : "" , (timestamp % 3600) / 60, timestamp % 60)));
                        lastTimestamp.set(timestamp);
                }
        }