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 @@
flv
-
-
+
+
+ rm
rmvb
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 subtitles) throws XmlRpcFault {
+ public TryUploadResponse tryUploadSubtitles(SubFile... subtitles) throws XmlRpcFault {
Map struct = new HashMap();
// 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 subtitles) throws XmlRpcFault {
+ public URI uploadSubtitles(BaseInfo baseInfo, SubFile... subtitles) throws XmlRpcFault {
Map struct = new HashMap();
// 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);
}