X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=generate_dvd.cpp;h=d5185c2702e6fa88926800ac62c03429d6df6f86;hb=4d4e86ecf74f72c983806f6c63c5de0abe972d32;hp=2fa3388d6bb1e5c6b6e1e8d3c1835ba4d095b0cc;hpb=84fb85103e80499cc8dc7929375e9a1798e043da;p=videolink.git

diff --git a/generate_dvd.cpp b/generate_dvd.cpp
index 2fa3388..d5185c2 100644
--- a/generate_dvd.cpp
+++ b/generate_dvd.cpp
@@ -161,12 +161,12 @@ void dvd_generator::generate_menu_vob(unsigned index,
 
     std::string background_name(
 	temp_file_name(temp_dir_, "menu-%3d-back.png", 1 + index));
-    std::cout << "saving " << background_name << std::endl;
+    std::cout << "INFO: Saving " << background_name << std::endl;
     background->save(background_name, "png");
 
     std::string highlights_name(
 	temp_file_name(temp_dir_, "menu-%3d-links.png", 1 + index));
-    std::cout << "saving " << highlights_name << std::endl;
+    std::cout << "INFO: Saving " << highlights_name << std::endl;
     highlights->save(highlights_name, "png");
 
     std::string spumux_name(
@@ -211,11 +211,15 @@ void dvd_generator::generate_menu_vob(unsigned index,
 		}
 	    }
 	}
+	// Pad vertically to even y coordinates since dvdauthor claims
+	// odd values may result in incorrect display.
+	// XXX This may cause overlappping where it wasn't previously
+	// a problem.
 	spumux_file << "      <button"
 	    " x0='" << this_entry.area.left << "'"
-	    " y0='" << this_entry.area.top << "'"
+	    " y0='" << (this_entry.area.top & ~1) << "'"
 	    " x1='" << this_entry.area.right << "'"
-	    " y1='" << this_entry.area.bottom << "'"
+	    " y1='" << ((this_entry.area.bottom + 1) & ~1) << "'"
 	    " left='" << (i == 0 ? button_count : i) << "'"
 	    " right='" << 1 + (i + 1) % button_count << "'"
 	    " up='" << 1 + up_button << "'"
@@ -281,14 +285,14 @@ void dvd_generator::generate_menu_vob(unsigned index,
     const char * argv[] = {
 	"/bin/sh", "-c", command.c_str(), 0
     };
-    std::cout << "running " << command << std::endl;
+    std::cout << "INFO: Running " << command << std::endl;
     int command_result;
     Glib::spawn_sync(".",
 		     Glib::ArrayHandle<std::string>(
 			 argv, sizeof(argv)/sizeof(argv[0]),
 			 Glib::OWNERSHIP_NONE),
 		     Glib::SPAWN_STDOUT_TO_DEV_NULL,
-		     SigC::Slot0<void>(),
+		     sigc::slot<void>(),
 		     0, 0,
 		     &command_result);
     if (command_result != 0)
@@ -372,8 +376,9 @@ void dvd_generator::generate(const std::string & output_dir) const
 	const unsigned menu_begin = titleset_num * dvdauthor_anonymous_menus_max;
 	const unsigned menu_end =
 	    have_real_menus
-	    ? std::min((titleset_num + 1) * dvdauthor_anonymous_menus_max,
-		       menus_.size())
+	    ? std::min<unsigned>(
+		(titleset_num + 1) * dvdauthor_anonymous_menus_max,
+		menus_.size())
 	    : menu_begin + 1;
 
 	for (unsigned menu_index = menu_begin;
@@ -707,7 +712,7 @@ void dvd_generator::generate(const std::string & output_dir) const
 			     Glib::OWNERSHIP_NONE),
 			 Glib::SPAWN_SEARCH_PATH
 			 | Glib::SPAWN_STDOUT_TO_DEV_NULL,
-			 SigC::Slot0<void>(),
+			 sigc::slot<void>(),
 			 0, 0,
 			 &command_result);
 	if (command_result != 0)