Brought documentation up to date.

[videolink.git] / generate_dvd.hpp

diff --git a/generate_dvd.hpp b/generate_dvd.hpp
index 8ce8f7b89e97f1ef1285e640d00de990b3c5c5b4..91e8da8d5e808ec4e52eef5cf234483e1aaf6b36 100644 (file)
--- a/generate_dvd.hpp
+++ b/generate_dvd.hpp
@@ -1,4 +1,4 @@
-// Copyright 2005-6 Ben Hutchings <ben@decadentplace.org.uk>.
+// Copyright 2005-6 Ben Hutchings <ben@decadent.org.uk>.
 // See the file "COPYING" for licence details.
 
 #ifndef INC_GENERATE_DVD_HPP
@@ -10,6 +10,7 @@
 #include <boost/shared_ptr.hpp>
 
 #include "temp_file.hpp"
+#include "vob_list.hpp"
 
 // Description of menus and titles to go on a DVD.
 
@@ -54,21 +55,8 @@ struct dvd_contents
        std::vector<pgc_ref> entries;
     };
 
-    // Title definition.  This is currently just an XML fragment
-    // consisting of one of more <vob> elements.  It is included
-    // directly within the corresponding <pgc> element in the file
-    // passed to dvdauthor.
-    struct title
-    {
-       explicit title(const std::string & vob_list)
-               : vob_list(vob_list)
-           {}
-
-       std::string vob_list;
-    };
-
     std::vector<menu> menus;
-    std::vector<title> titles;
+    std::vector<vob_list> titles;
 };
 
 // Use dvdauthor to generate a DVD filesystem with the given contents.