X-Git-Url: https://git.decadent.org.uk/gitweb/?p=videolink.git;a=blobdiff_plain;f=videolink.cpp;h=a15bbea1bfe125a2cf9c67e152935203a1e3e2a3;hp=5867023ae9aa0b0e8d0511b8dbe6017d096ea4b5;hb=HEAD;hpb=814b5048b5fbd960fe9e1bdcf3cc4ca980cfd74e

diff --git a/videolink.cpp b/videolink.cpp
index 5867023..a15bbea 100644
--- a/videolink.cpp
+++ b/videolink.cpp
@@ -1,4 +1,4 @@
-// Copyright 2005-6 Ben Hutchings <ben@decadent.org.uk>.
+// Copyright 2005-8 Ben Hutchings <ben@decadent.org.uk>.
 // See the file "COPYING" for licence details.
 
 #include <cassert>
@@ -22,7 +22,14 @@
 #include <gtkmm/main.h>
 #include <gtkmm/window.h>
 
+#include "videolink.hpp"
+#include "wchar_t_short.h"
 #include <ImageErrors.h>
+#if MOZ_VERSION_GE(1,9,0)
+#include <nsWeakPtr.h>
+/* For some reason <nsWeakPtr.h> no longer defines this */
+typedef nsCOMPtr<nsIWeakReference> nsWeakPtr;
+#endif
 #include <nsGUIEvent.h>
 #include <nsIBoxObject.h>
 #include <nsIContent.h>
@@ -42,16 +49,21 @@
 #include <nsIURI.h> // required before nsILink.h
 #include <nsILink.h>
 #include <nsIPrefBranch.h>
-#include <nsPresContext.h>
 #include <nsIPrefService.h>
 #include <nsIPresShell.h>
 #include <nsServiceManagerUtils.h>
 #include <nsIWebBrowser.h>
+#ifdef MOZILLA_INTERNAL_API
 #include <nsString.h>
+#else
+#include <nsStringAPI.h>
+#endif
+#include "wchar_t_default.h"
 
 #include "browser_widget.hpp"
 #include "child_iterator.hpp"
 #include "dvd.hpp"
+#include "event_state_manager.hpp"
 #include "generate_dvd.hpp"
 #include "geometry.hpp"
 #include "link_iterator.hpp"
@@ -69,14 +81,17 @@ using xpcom_support::check;
 
 namespace
 {
-    rectangle get_elem_rect(nsIDOMNSDocument * ns_doc,
-			    nsIDOMElement * elem)
+#if MOZ_VERSION_GE(2,0,-1)
+    rectangle get_elem_rect(nsIDocument * doc, nsIDOMElement * elem)
+#else
+    rectangle get_elem_rect(nsIDOMNSDocument * doc, nsIDOMElement * elem)
+#endif
     {
 	rectangle result;
 
 	// Start with this element's bounding box
 	nsCOMPtr<nsIBoxObject> box;
-	check(ns_doc->GetBoxObjectFor(elem, getter_AddRefs(box)));
+	check(doc->GetBoxObjectFor(elem, getter_AddRefs(box)));
 	int width, height;
 	check(box->GetScreenX(&result.left));
 	check(box->GetScreenY(&result.top));
@@ -95,7 +110,7 @@ namespace
 	    {
 		nsCOMPtr<nsIDOMElement> child_elem(
 		    do_QueryInterface(child_node));
-		result |= get_elem_rect(ns_doc, child_elem);
+		result |= get_elem_rect(doc, child_elem);
 	    }
 	}
 
@@ -237,8 +252,7 @@ namespace
 	bool process_links(
 	    page_state * state,
 	    nsIDOMDocument * basic_doc,
-	    nsIPresShell * pres_shell,
-	    nsPresContext * pres_context,
+	    nsIDocShell * doc_shell,
 	    nsIDOMWindow * dom_window);
 
 	std::string output_dir_;
@@ -409,7 +423,9 @@ namespace
 	{
 	    // Check whether the load was successful, ignoring this
 	    // pseudo-error.
+#ifdef NS_IMAGELIB_ERROR_LOAD_ABORTED
 	    if (status != NS_IMAGELIB_ERROR_LOAD_ABORTED)
+#endif
 		check(status);
 
 	    pending_window_update_ = false;
@@ -508,10 +524,6 @@ namespace
 	nsCOMPtr<nsIWebBrowser> browser(browser_widget_.get_browser());
 	nsCOMPtr<nsIDocShell> doc_shell(do_GetInterface(browser));
 	assert(doc_shell);
-	nsCOMPtr<nsIPresShell> pres_shell;
-	check(doc_shell->GetPresShell(getter_AddRefs(pres_shell)));
-	nsCOMPtr<nsPresContext> pres_context;
-	check(doc_shell->GetPresContext(getter_AddRefs(pres_context)));
 	nsCOMPtr<nsIDOMWindow> dom_window;
 	check(browser->GetContentDOMWindow(getter_AddRefs(dom_window)));
 
@@ -524,9 +536,7 @@ namespace
 		new page_state(
 		    get_screenshot(),
 		    basic_doc, frame_params_.width, frame_params_.height));
-	if (!process_links(
-		page_state_.get(),
-		basic_doc, pres_shell, pres_context, dom_window))
+	if (!process_links(page_state_.get(), basic_doc, doc_shell, dom_window))
 	{
 	    // We've finished work on the links so generate the
 	    // menu VOB.
@@ -569,8 +579,7 @@ namespace
     bool conversion_window::process_links(
 	page_state * state,
 	nsIDOMDocument * basic_doc,
-	nsIPresShell * pres_shell,
-	nsPresContext * pres_context,
+	nsIDocShell * doc_shell,
 	nsIDOMWindow * dom_window)
     {
 	Glib::RefPtr<Gdk::Window> window(get_window());
@@ -578,8 +587,14 @@ namespace
 
 	nsCOMPtr<nsIDOMNSDocument> ns_doc(do_QueryInterface(basic_doc));
 	assert(ns_doc);
+#if MOZ_VERSION_GE(2,0,-1)
+	nsCOMPtr<nsIDocument> doc(do_QueryInterface(basic_doc));
+	assert(doc);
+#endif
+	nsCOMPtr<nsIPresShell> pres_shell;
+	check(doc_shell->GetPresShell(getter_AddRefs(pres_shell)));
 	nsCOMPtr<nsIEventStateManager> event_state_man(
-	    pres_context->EventStateManager()); // does not AddRef
+	    get_event_state_manager(doc_shell));
 	assert(event_state_man);
 	nsCOMPtr<nsIDOMDocumentEvent> event_factory(
 	    do_QueryInterface(basic_doc));
@@ -602,16 +617,24 @@ namespace
 	    nsCOMPtr<nsIDOMNode> node(*state->links_it);
 
 	    // Find the link URI and separate any fragment from it.
+	    nsCOMPtr<nsIURI> uri_iface;
+#if MOZ_VERSION_GE(2,0,-1)
+	    nsCOMPtr<nsIContent> content(do_QueryInterface(node));
+	    assert(content);
+	    uri_iface = content->GetHrefURI();
+	    assert(uri_iface);
+#else
 	    nsCOMPtr<nsILink> link(do_QueryInterface(node));
 	    assert(link);
-	    nsCOMPtr<nsIURI> uri_iface;
 	    check(link->GetHrefURI(getter_AddRefs(uri_iface)));
+#endif
 	    std::string uri, fragment;
 	    {
 		nsCString link_target_ns;
 		check(uri_iface->GetSpec(link_target_ns));
-		state->link_target.assign(link_target_ns.BeginReading(),
-					  link_target_ns.EndReading());
+		const char * str;
+		PRUint32 len = NS_CStringGetData(link_target_ns, &str);
+		state->link_target.assign(str, len);
 
 		std::size_t hash_pos = state->link_target.find('#');
 		uri.assign(state->link_target, 0, hash_pos);
@@ -627,7 +650,11 @@ namespace
 		// window.
 		nsCOMPtr<nsIDOMElement> elem(do_QueryInterface(node));
 		assert(elem);
+#if MOZ_VERSION_GE(2,0,-1)
+		state->link_rect = get_elem_rect(doc, elem);
+#else
 		state->link_rect = get_elem_rect(ns_doc, elem);
+#endif
 		state->link_rect &= window_rect;
 
 		if (state->link_rect.empty())
@@ -758,7 +785,7 @@ namespace
 	    "Usage: " << command_name << " [gtk-options] [--preview]\n"
 	    "           [--video-std {525|525/60|NTSC|ntsc"
 	    " | 625|625/50|PAL|pal}]\n"
-	    "           [--encoder {mjpegtools|mjpegtools-old}]\n"
+	    "           [--encoder {ffmpeg|mjpegtools}]\n"
 	    "           menu-url [output-dir]\n";
     }
     
@@ -909,14 +936,9 @@ int main(int argc, char ** argv)
 		{
 		    encoder = dvd_generator::mpeg_encoder_ffmpeg;
 		}
-		else if (std::strcmp(argv[argi + 1], "mjpegtools-old") == 0)
-		{
-		    encoder = dvd_generator::mpeg_encoder_mjpegtools_old;
-		}
-		else if (std::strcmp(argv[argi + 1], "mjpegtools") == 0
-			 || std::strcmp(argv[argi + 1], "mjpegtools-new") == 0)
+		else if (std::strcmp(argv[argi + 1], "mjpegtools") == 0)
 		{
-		    encoder = dvd_generator::mpeg_encoder_mjpegtools_new;
+		    encoder = dvd_generator::mpeg_encoder_mjpegtools;
 		}
 		else
 		{