From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Tue, 4 Jun 2013 19:16:48 +0000 (+0200)
Subject: Merge remote-tracking branch 'github/master'
X-Git-Url: https://git.pterodactylus.net/?p=sonitus.git;a=commitdiff_plain;h=1b5da82617f1ba7e569c63daf4fb981d0fd7f406;hp=-c

Merge remote-tracking branch 'github/master'
---

1b5da82617f1ba7e569c63daf4fb981d0fd7f406
diff --combined src/main/java/net/pterodactylus/sonitus/data/filter/TimeCounterFilter.java
index ce08a61,b584a48..0eb8281
--- a/src/main/java/net/pterodactylus/sonitus/data/filter/TimeCounterFilter.java
+++ b/src/main/java/net/pterodactylus/sonitus/data/filter/TimeCounterFilter.java
@@@ -21,7 -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;
  
@@@ -32,7 -31,7 +32,7 @@@
   *
   * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
   */
 -public class TimeCounterFilter extends DummyFilter {
 +public class TimeCounterFilter extends AbstractFilter implements Filter {
  
  	/** The byte counter. */
  	private final AtomicLong counter = new AtomicLong();
@@@ -96,7 -95,7 +96,7 @@@
  	}
  
  	//
 -	// DUMMYFILTER METHODS
 +	// FILTER METHODS
  	//
  
  	@Override
@@@ -123,7 -122,7 +123,7 @@@
  	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);
  		}
  	}