X-Git-Url: https://git.decadent.org.uk/gitweb/?p=videolink.git;a=blobdiff_plain;f=videolink.cpp;h=9ed174675f2a85d45f58737ded4d62a1d802677c;hp=112125ad2b27e47c2ab8e8ef1d3e08b76fb080cc;hb=588553096cd61ef36c1bc6ab6133764a608b0ef3;hpb=3aa895a3012db38e9528c59211f5314d77c5f8f7 diff --git a/videolink.cpp b/videolink.cpp index 112125a..9ed1746 100644 --- a/videolink.cpp +++ b/videolink.cpp @@ -1,4 +1,4 @@ -// Copyright 2005-6 Ben Hutchings . +// Copyright 2005-8 Ben Hutchings . // See the file "COPYING" for licence details. #include @@ -22,7 +22,13 @@ #include #include -#include +#include "wchar_t_short.h" +#include +#if MOZ_VERSION_MAJOR == 1 && MOZ_VERSION_MINOR == 9 +#include +/* For some reason no longer defines this */ +typedef nsCOMPtr nsWeakPtr; +#endif #include #include #include @@ -42,16 +48,21 @@ #include // required before nsILink.h #include #include -#include #include #include #include #include +#ifdef MOZILLA_INTERNAL_API #include +#else +#include +#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" @@ -146,10 +157,6 @@ namespace protected: video::frame_params frame_params_; browser_widget browser_widget_; - - private: - bool on_idle(); - virtual void do_late_initialisation() = 0; }; base_window::base_window(const video::frame_params & frame_params) @@ -160,15 +167,6 @@ namespace add(browser_widget_); browser_widget_.show(); - - Glib::signal_idle().connect( - sigc::mem_fun(this, &base_window::on_idle)); - } - - bool base_window::on_idle() - { - do_late_initialisation(); - return false; // don't call again thankyou } class preview_window : public base_window @@ -178,7 +176,7 @@ namespace const std::string & main_page_uri); private: - virtual void do_late_initialisation(); + bool on_idle(); bool on_key_press(GdkEventKey *); std::string main_page_uri_; @@ -189,13 +187,16 @@ namespace : base_window(frame_params), main_page_uri_(main_page_uri) { + Glib::signal_idle().connect( + sigc::mem_fun(this, &preview_window::on_idle)); signal_key_press_event().connect( sigc::mem_fun(this, &preview_window::on_key_press)); } - void preview_window::do_late_initialisation() + bool preview_window::on_idle() { browser_widget_.load_uri(main_page_uri_); + return false; // don't call again } bool preview_window::on_key_press(GdkEventKey * event) @@ -230,15 +231,12 @@ namespace dvd_generator::pgc_ref add_title(const std::string & uri, video_format format); void load_next_page(); - void do_late_initialisation(); + bool on_idle(); void on_net_state_change(const char * uri, gint flags, guint status); bool browser_is_busy() const { return pending_window_update_ || pending_req_count_; } - // Try to do as much processing as possible. Quit if done; - // report and quit if an exception occurs. - void try_process(); // Do as much processing as possible. Return a flag indicating // whether to call again once the browser is idle. bool process(); @@ -250,12 +248,17 @@ 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_; + enum { + state_initial, + state_processing, + state_finished + } state_; + dvd_generator generator_; typedef std::map resource_map_type; @@ -265,8 +268,6 @@ namespace bool pending_window_update_; int pending_req_count_; std::auto_ptr page_state_; - - bool finished_; }; conversion_window::conversion_window( @@ -276,11 +277,13 @@ namespace dvd_generator::mpeg_encoder encoder) : base_window(frame_params), output_dir_(output_dir), + state_(state_initial), generator_(frame_params, encoder), pending_window_update_(false), - pending_req_count_(0), - finished_(false) + pending_req_count_(0) { + Glib::signal_idle().connect( + sigc::mem_fun(this, &conversion_window::on_idle)); browser_widget_.signal_net_state().connect( sigc::mem_fun(this, &conversion_window::on_net_state_change)); @@ -289,7 +292,7 @@ namespace bool conversion_window::is_finished() const { - return finished_; + return state_ == state_finished; } dvd_generator::pgc_ref conversion_window::add_menu(const std::string & uri) @@ -351,16 +354,6 @@ namespace browser_widget_.load_uri(uri); } - void conversion_window::do_late_initialisation() - { - // Put pointer in the top-left so that no links appear in - // the hover state when we take a screenshot. - warp_pointer(get_window(), - -frame_params_.width, -frame_params_.height); - - load_next_page(); - } - void conversion_window::on_net_state_change(const char * uri, gint flags, guint status) { @@ -431,9 +424,6 @@ namespace pending_window_update_ = false; } - - if (!browser_is_busy()) - try_process(); } struct conversion_window::page_state @@ -460,48 +450,65 @@ namespace bool link_changing; }; - void conversion_window::try_process() + bool conversion_window::on_idle() { - try + if (state_ == state_initial) { - if (!process()) - { - finished_ = true; - Gtk::Main::quit(); - } + // Put pointer in the top-left so that no links appear in + // the hover state when we take a screenshot. + warp_pointer(get_window(), + -frame_params_.width, -frame_params_.height); + + load_next_page(); + + state_ = state_processing; } - catch (...) + else if (state_ == state_processing && !browser_is_busy()) { - // Print context of exception. - if (!page_queue_.empty()) - { - std::cerr << "ERROR: While processing page <" - << page_queue_.front() << ">:\n"; - if (page_state_.get() && !page_state_->link_target.empty()) - std::cerr << "ERROR: While processing link to <" - << page_state_->link_target << ">:\n"; - } - - // Print exception message. try { - throw; - } - catch (std::exception & e) - { - std::cerr << "ERROR: " << e.what() << "\n"; - } - catch (Glib::Exception & e) - { - std::cerr << "ERROR: " << e.what() << "\n"; + if (!process()) + { + state_ = state_finished; + Gtk::Main::quit(); + } } catch (...) { - std::cerr << "ERROR: Unknown exception\n"; - } + // Print context of exception. + if (!page_queue_.empty()) + { + std::cerr << "ERROR: While processing page <" + << page_queue_.front() << ">:\n"; + if (page_state_.get() && !page_state_->link_target.empty()) + std::cerr << "ERROR: While processing link to <" + << page_state_->link_target << ">:\n"; + } - Gtk::Main::quit(); + // Print exception message. + try + { + throw; + } + catch (std::exception & e) + { + std::cerr << "ERROR: " << e.what() << "\n"; + } + catch (Glib::Exception & e) + { + std::cerr << "ERROR: " << e.what() << "\n"; + } + catch (...) + { + std::cerr << "ERROR: Unknown exception\n"; + } + + Gtk::Main::quit(); + } } + + // Call again if we're not done. + return state_ != state_finished; } bool conversion_window::process() @@ -511,10 +518,6 @@ namespace nsCOMPtr browser(browser_widget_.get_browser()); nsCOMPtr doc_shell(do_GetInterface(browser)); assert(doc_shell); - nsCOMPtr pres_shell; - check(doc_shell->GetPresShell(getter_AddRefs(pres_shell))); - nsCOMPtr pres_context; - check(doc_shell->GetPresContext(getter_AddRefs(pres_context))); nsCOMPtr dom_window; check(browser->GetContentDOMWindow(getter_AddRefs(dom_window))); @@ -527,9 +530,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. @@ -572,8 +573,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 window(get_window()); @@ -581,8 +581,10 @@ namespace nsCOMPtr ns_doc(do_QueryInterface(basic_doc)); assert(ns_doc); + nsCOMPtr pres_shell; + check(doc_shell->GetPresShell(getter_AddRefs(pres_shell))); nsCOMPtr event_state_man( - pres_context->EventStateManager()); // does not AddRef + get_event_state_manager(doc_shell)); assert(event_state_man); nsCOMPtr event_factory( do_QueryInterface(basic_doc)); @@ -613,8 +615,9 @@ namespace { 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); @@ -761,7 +764,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"; } @@ -912,14 +915,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 {