From 36ad3d826db14fc9f90443a5369dbfaa16f5fccb Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <rednoah@users.noreply.github.com>
Date: Tue, 13 Oct 2009 00:28:59 +0000
Subject: [PATCH] * minor updates

---
 source/net/sourceforge/filebot/media.types       |  5 +++--
 .../filebot/web/OpenSubtitlesXmlRpc.java         | 16 +++-------------
 source/net/sourceforge/tuned/Timer.java          |  4 +---
 .../filebot/web/SublightSubtitleClientTest.java  |  2 +-
 4 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/source/net/sourceforge/filebot/media.types b/source/net/sourceforge/filebot/media.types
index 5a777818..0c344356 100644
--- a/source/net/sourceforge/filebot/media.types
+++ b/source/net/sourceforge/filebot/media.types
@@ -91,8 +91,9 @@
 	<type name="video/flash">
 		<extension>flv</extension>
 	</type>
-
-	<type name="video/rmvb">
+	
+	<type name="video/realmedia">
+		<extension>rm</extension>
 		<extension>rmvb</extension>
 	</type>
 	
diff --git a/source/net/sourceforge/filebot/web/OpenSubtitlesXmlRpc.java b/source/net/sourceforge/filebot/web/OpenSubtitlesXmlRpc.java
index e5eb7879..9746ba37 100644
--- a/source/net/sourceforge/filebot/web/OpenSubtitlesXmlRpc.java
+++ b/source/net/sourceforge/filebot/web/OpenSubtitlesXmlRpc.java
@@ -142,13 +142,8 @@ public class OpenSubtitlesXmlRpc {
 	}
 	
 
-	public TryUploadResponse tryUploadSubtitles(SubFile subtitle) throws XmlRpcFault {
-		return tryUploadSubtitles(singleton(subtitle));
-	}
-	
-
 	@SuppressWarnings("unchecked")
-	public TryUploadResponse tryUploadSubtitles(Collection<SubFile> subtitles) throws XmlRpcFault {
+	public TryUploadResponse tryUploadSubtitles(SubFile... subtitles) throws XmlRpcFault {
 		Map<String, SubFile> struct = new HashMap<String, SubFile>();
 		
 		// put cd1, cd2, ...
@@ -165,12 +160,7 @@ public class OpenSubtitlesXmlRpc {
 	}
 	
 
-	public URI uploadSubtitles(BaseInfo baseInfo, SubFile subtitle) throws XmlRpcFault {
-		return uploadSubtitles(baseInfo, singleton(subtitle));
-	}
-	
-
-	public URI uploadSubtitles(BaseInfo baseInfo, Collection<SubFile> subtitles) throws XmlRpcFault {
+	public URI uploadSubtitles(BaseInfo baseInfo, SubFile... subtitles) throws XmlRpcFault {
 		Map<String, Object> struct = new HashMap<String, Object>();
 		
 		// put cd1, cd2, ...
@@ -283,7 +273,7 @@ public class OpenSubtitlesXmlRpc {
 
 	protected URL getXmlRpcUrl() {
 		try {
-			return new URL("http://www.opensubtitles.org/xml-rpc");
+			return new URL("http://api.opensubtitles.org/xml-rpc");
 		} catch (MalformedURLException e) {
 			// will never happen
 			throw new RuntimeException(e);
diff --git a/source/net/sourceforge/tuned/Timer.java b/source/net/sourceforge/tuned/Timer.java
index ca42c06f..bd63c16a 100644
--- a/source/net/sourceforge/tuned/Timer.java
+++ b/source/net/sourceforge/tuned/Timer.java
@@ -16,9 +16,7 @@ public abstract class Timer implements Runnable {
 	
 
 	public Timer() {
-		executor = new ScheduledThreadPoolExecutor(1);
-		executor.setKeepAliveTime(200, TimeUnit.MILLISECONDS);
-		executor.allowCoreThreadTimeOut(true);
+		executor = new ScheduledThreadPoolExecutor(1, new DefaultThreadFactory("Timer", Thread.NORM_PRIORITY, true));
 	}
 	
 
diff --git a/test/net/sourceforge/filebot/web/SublightSubtitleClientTest.java b/test/net/sourceforge/filebot/web/SublightSubtitleClientTest.java
index d9063d13..22e1111f 100644
--- a/test/net/sourceforge/filebot/web/SublightSubtitleClientTest.java
+++ b/test/net/sourceforge/filebot/web/SublightSubtitleClientTest.java
@@ -67,7 +67,7 @@ public class SublightSubtitleClientTest {
 		assertEquals("English", sample.getLanguageName());
 		
 		// check size
-		assertTrue(list.size() > 20);
+		assertTrue(list.size() > 15);
 	}