Merge branch 'dead-wood'

16 files changed, 0 insertions, 28 deletions

diff --git a/test/dvd/VIDEO_TS/VIDEO_TS.BUP b/test/dvd/VIDEO_TS/VIDEO_TS.BUP
deleted file mode 100644
index e69de29bb..000000000
--- a/test/dvd/VIDEO_TS/VIDEO_TS.BUP
+++ /dev/null
diff --git a/test/dvd/VIDEO_TS/VIDEO_TS.IFO b/test/dvd/VIDEO_TS/VIDEO_TS.IFO
deleted file mode 100644
index e69de29bb..000000000
--- a/test/dvd/VIDEO_TS/VIDEO_TS.IFO
+++ /dev/null
diff --git a/test/dvd/VIDEO_TS/VIDEO_TS.VOB b/test/dvd/VIDEO_TS/VIDEO_TS.VOB
deleted file mode 100644
index e69de29bb..000000000
--- a/test/dvd/VIDEO_TS/VIDEO_TS.VOB
+++ /dev/null
diff --git a/test/dvd/VIDEO_TS/VST_01_1.VOB b/test/dvd/VIDEO_TS/VST_01_1.VOB
deleted file mode 100644
index 190a18037..000000000
--- a/test/dvd/VIDEO_TS/VST_01_1.VOB
+++ /dev/null
@@ -1 +0,0 @@
-123
diff --git a/test/dvd/VIDEO_TS/VTS_01_0.IFO b/test/dvd/VIDEO_TS/VTS_01_0.IFO
deleted file mode 100644
index e69de29bb..000000000
--- a/test/dvd/VIDEO_TS/VTS_01_0.IFO
+++ /dev/null
diff --git a/test/dvd/VIDEO_TS/VTS_01_0.VOB b/test/dvd/VIDEO_TS/VTS_01_0.VOB
deleted file mode 100644
index e69de29bb..000000000
--- a/test/dvd/VIDEO_TS/VTS_01_0.VOB
+++ /dev/null
diff --git a/test/dvd/VIDEO_TS/VTS_01_1.VOB b/test/dvd/VIDEO_TS/VTS_01_1.VOB
deleted file mode 100644
index e69de29bb..000000000
--- a/test/dvd/VIDEO_TS/VTS_01_1.VOB
+++ /dev/null
diff --git a/test/dvd/VIDEO_TS/VTS_02_0.VOB b/test/dvd/VIDEO_TS/VTS_02_0.VOB
deleted file mode 100644
index 8d38505c1..000000000
--- a/test/dvd/VIDEO_TS/VTS_02_0.VOB
+++ /dev/null
@@ -1 +0,0 @@
-456
diff --git a/test/dvd/VIDEO_TS/VTS_02_1.VOB b/test/dvd/VIDEO_TS/VTS_02_1.VOB
deleted file mode 100644
index d00491fd7..000000000
--- a/test/dvd/VIDEO_TS/VTS_02_1.VOB
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/dvd/VIDEO_TS/VTS_02_2.VOB b/test/dvd/VIDEO_TS/VTS_02_2.VOB
deleted file mode 100644
index 48082f72f..000000000
--- a/test/dvd/VIDEO_TS/VTS_02_2.VOB
+++ /dev/null
@@ -1 +0,0 @@
-12
diff --git a/test/dvd/VIDEO_TS/VTS_02_3.VOB b/test/dvd/VIDEO_TS/VTS_02_3.VOB
deleted file mode 100644
index 190a18037..000000000
--- a/test/dvd/VIDEO_TS/VTS_02_3.VOB
+++ /dev/null
@@ -1 +0,0 @@
-123
diff --git a/test/dvd/VIDEO_TS/VTS_02_4.VOB b/test/dvd/VIDEO_TS/VTS_02_4.VOB
deleted file mode 100644
index 81c545efe..000000000
--- a/test/dvd/VIDEO_TS/VTS_02_4.VOB
+++ /dev/null
@@ -1 +0,0 @@
-1234
diff --git a/test/dvd/VIDEO_TS/VTS_03_0.IFO b/test/dvd/VIDEO_TS/VTS_03_0.IFO
deleted file mode 100644
index e56e15bb7..000000000
--- a/test/dvd/VIDEO_TS/VTS_03_0.IFO
+++ /dev/null
@@ -1 +0,0 @@
-12345
diff --git a/test/dvd/VIDEO_TS/VTS_03_0.VOB b/test/dvd/VIDEO_TS/VTS_03_0.VOB
deleted file mode 100644
index e56e15bb7..000000000
--- a/test/dvd/VIDEO_TS/VTS_03_0.VOB
+++ /dev/null
@@ -1 +0,0 @@
-12345
diff --git a/test/dvd/VIDEO_TS/VTS_03_1.VOB b/test/dvd/VIDEO_TS/VTS_03_1.VOB
deleted file mode 100644
index 9f358a4ad..000000000
--- a/test/dvd/VIDEO_TS/VTS_03_1.VOB
+++ /dev/null
@@ -1 +0,0 @@
-123456
diff --git a/test/test.cc b/test/test.cc
index d1286dd76..5addc2d75 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -27,7 +27,6 @@
 #include "job_manager.h"
 #include "util.h"
 #include "exceptions.h"
-#include "dvd.h"
 #include "delay_line.h"
 #include "image.h"
 #include "log.h"
@@ -159,24 +158,6 @@ BOOST_AUTO_TEST_CASE (util_test)
 	BOOST_CHECK_EQUAL (*i++, "them");
 }
 
-BOOST_AUTO_TEST_CASE (dvd_test)
-{
-	list<DVDTitle> const t = dvd_titles ("test/dvd");
-	BOOST_CHECK_EQUAL (t.size(), 3);
-	list<DVDTitle>::const_iterator i = t.begin ();
-	
-	BOOST_CHECK_EQUAL (i->number, 1);
-	BOOST_CHECK_EQUAL (i->size, 0);
-	++i;
-	
-	BOOST_CHECK_EQUAL (i->number, 2);
-	BOOST_CHECK_EQUAL (i->size, 14);
-	++i;
-	
-	BOOST_CHECK_EQUAL (i->number, 3);
-	BOOST_CHECK_EQUAL (i->size, 7);
-}
-
 void
 do_positive_delay_line_test (int delay_length, int data_length)
 {