summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-07-10 20:29:00 +0100
committerCarl Hetherington <cth@carlh.net>2013-07-10 20:29:00 +0100
commit320a74efb8d9c8aacded2799459a92d5b7235d90 (patch)
tree1f547cb3cde20bd025dabddc6209390e22826b6a /test
parent623f3c66821d6a99bf0e683a8072b99a168f3a1c (diff)
Make subtitles work at least a bit.
Diffstat (limited to 'test')
-rw-r--r--test/client_server_test.cc2
-rw-r--r--test/test.cc1
2 files changed, 1 insertions, 2 deletions
diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index 51b52331a..232190286 100644
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -56,7 +56,7 @@ BOOST_AUTO_TEST_CASE (client_server_test)
p += sub_image->stride()[0];
}
- shared_ptr<Subtitle> subtitle (new Subtitle (Position (50, 60), sub_image));
+// shared_ptr<Subtitle> subtitle (new Subtitle (Position<int> (50, 60), sub_image));
shared_ptr<FileLog> log (new FileLog ("build/test/client_server_test.log"));
diff --git a/test/test.cc b/test/test.cc
index d6c7842d7..0a682383a 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -36,7 +36,6 @@
#include "server.h"
#include "cross.h"
#include "job.h"
-#include "subtitle.h"
#include "scaler.h"
#include "ffmpeg_decoder.h"
#include "sndfile_decoder.h"