X-Git-Url: https://git.decadent.org.uk/gitweb/?p=videolink.git;a=blobdiff_plain;f=generate_dvd.hpp;h=e1e3e3cf4f7f8bd6d4a3ea95e855239c89e3941b;hp=7f3823fee19db43d98a41bf344dbec3550cfbcac;hb=HEAD;hpb=f5d9069647f70b7aab8e656f59cf42176c419461

diff --git a/generate_dvd.hpp b/generate_dvd.hpp
index 7f3823f..e1e3e3c 100644
--- a/generate_dvd.hpp
+++ b/generate_dvd.hpp
@@ -7,8 +7,6 @@
 #include <string>
 #include <vector>
 
-#include <boost/shared_ptr.hpp>
-
 #include <glibmm/refptr.h>
 
 #include "geometry.hpp"
@@ -51,19 +49,15 @@ public:
 	                    // unspecified; not compared!)
     };
 
-    // We can try using any of these encoders to convert PNG to MPEG.
+    // We can try using either of these encoders to convert PNG to MPEG.
     enum mpeg_encoder
     {
 	mpeg_encoder_ffmpeg,         // ffmpeg
-	mpeg_encoder_mjpegtools_old, // mjpegtools before version 1.8
-	mpeg_encoder_mjpegtools_new  // mjpegtools from version 1.8
+	mpeg_encoder_mjpegtools      // mjpegtools from version 1.8
     };
 
     dvd_generator(const video::frame_params & frame_params,
-		  mpeg_encoder encoder)
-	    : frame_params_(frame_params),
-	      encoder_(encoder)
-	{}
+		  mpeg_encoder encoder);
 
     // Create a new empty menu; return a reference to it.
     // The client must call generate_menu_vob() for each menu before
@@ -96,17 +90,12 @@ private:
     // Menu definition.
     struct menu
     {
-	menu();
-
-	// Temporary file in which the menu VOB should be generated.
-	// This is created as an empty file and then closed.
-	boost::shared_ptr<temp_file> vob_temp;
-
 	// References to the menus and titles that the menu buttons
 	// are meant to link to, in the same order as the buttons.
 	std::vector<menu_entry> entries;
     };
 
+    temp_dir temp_dir_;
     video::frame_params frame_params_;
     mpeg_encoder encoder_;
     std::vector<menu> menus_;