X-Git-Url: https://git.decadent.org.uk/gitweb/?p=videolink.git;a=blobdiff_plain;f=webdvd.cpp;h=43f54c7021a703b8be936cb8280548239dfee6f0;hp=9a5dd04e8b078af7c6de36d07c2e36e3076a73e1;hb=c13714f6498df33e02635421354f5fb88a60eb3d;hpb=0acb5f1329d294faf42e247f8c2daf68d82150f6 diff --git a/webdvd.cpp b/webdvd.cpp index 9a5dd04..43f54c7 100644 --- a/webdvd.cpp +++ b/webdvd.cpp @@ -1,4 +1,4 @@ -// Copyright 2005 Ben Hutchings . +// Copyright 2005-6 Ben Hutchings . // See the file "COPYING" for licence details. #include @@ -53,12 +53,14 @@ #include "browser_widget.hpp" #include "child_iterator.hpp" #include "dvd.hpp" +#include "generate_dvd.hpp" #include "link_iterator.hpp" #include "pixbufs.hpp" #include "style_sheets.hpp" #include "temp_file.hpp" #include "video.hpp" #include "x_frame_buffer.hpp" +#include "xml_utils.hpp" #include "xpcom_support.hpp" using xpcom_support::check; @@ -142,6 +144,7 @@ namespace return result; } + class webdvd_window : public Gtk::Window { public: @@ -151,34 +154,36 @@ namespace const std::string & output_dir); private: - void add_page(const std::string & uri); - void add_video(const std::string & uri); + dvd_contents::pgc_ref add_menu(const std::string & uri); + dvd_contents::pgc_ref add_title(const std::string & uri); void load_next_page(); void on_net_state_change(const char * uri, gint flags, guint status); + bool browser_is_busy() const + { + return pending_window_update_ || pending_req_count_; + } bool process_page(); void save_screenshot(); void process_links(nsIPresShell * pres_shell, nsIPresContext * pres_context, nsIDOMWindow * dom_window); - void generate_dvd(); - enum resource_type { page_resource, video_resource }; - typedef std::pair resource_entry; video::frame_params frame_params_; std::string output_dir_; browser_widget browser_widget_; nsCOMPtr stylesheet_; + + dvd_contents contents_; + typedef std::map resource_map_type; + resource_map_type resource_map_; + std::queue page_queue_; - std::map resource_map_; - std::vector > page_links_; - std::vector video_paths_; bool pending_window_update_; int pending_req_count_; bool have_tweaked_page_; std::auto_ptr background_temp_; struct page_state; std::auto_ptr page_state_; - std::vector > page_temp_files_; }; webdvd_window::webdvd_window( @@ -200,34 +205,68 @@ namespace browser_widget_.signal_net_state().connect( SigC::slot(*this, &webdvd_window::on_net_state_change)); - add_page(main_page_uri); + add_menu(main_page_uri); load_next_page(); } - void webdvd_window::add_page(const std::string & uri) + dvd_contents::pgc_ref webdvd_window::add_menu(const std::string & uri) { - if (resource_map_.insert( - std::make_pair(uri, resource_entry(page_resource, 0))) - .second) + dvd_contents::pgc_ref next_menu(dvd_contents::menu_pgc, + contents_.menus.size()); + std::pair insert_result( + resource_map_.insert(std::make_pair(uri, next_menu))); + + if (!insert_result.second) + { + return insert_result.first->second; + } + else { page_queue_.push(uri); + contents_.menus.resize(contents_.menus.size() + 1); + return next_menu; } } - void webdvd_window::add_video(const std::string & uri) + dvd_contents::pgc_ref webdvd_window::add_title(const std::string & uri) { - if (resource_map_.insert( - std::make_pair(uri, resource_entry(video_resource, - video_paths_.size() + 1))) - .second) + dvd_contents::pgc_ref next_title(dvd_contents::title_pgc, + contents_.titles.size()); + std::pair insert_result( + resource_map_.insert(std::make_pair(uri, next_title))); + + if (!insert_result.second) + { + return insert_result.first->second; + } + else { Glib::ustring hostname; - std::string filename(Glib::filename_from_uri(uri, hostname)); + std::string path(Glib::filename_from_uri(uri, hostname)); // FIXME: Should check the hostname - if (!Glib::file_test(filename, Glib::FILE_TEST_IS_REGULAR)) - throw std::runtime_error( - filename + " is missing or not a regular file"); - video_paths_.push_back(filename); + + vob_list list; + + // Store a reference to a linked VOB file, or the contents + // of a linked VOB list file. + if (path.compare(path.size() - 4, 4, ".vob") == 0) + { + if (!Glib::file_test(path, Glib::FILE_TEST_IS_REGULAR)) + throw std::runtime_error( + path + " is missing or not a regular file"); + vob_ref ref; + ref.file = path; + list.push_back(ref); + } + else + { + assert(path.compare(path.size() - 8, 8, ".voblist") == 0); + read_vob_list(path).swap(list); + } + + contents_.titles.resize(contents_.titles.size() + 1); + contents_.titles.back().swap(list); + return next_title; } } @@ -237,10 +276,6 @@ namespace const std::string & uri = page_queue_.front(); std::cout << "loading " << uri << std::endl; - std::size_t page_count = page_links_.size(); - resource_map_[uri].second = ++page_count; - page_links_.resize(page_count); - browser_widget_.load_uri(uri); } @@ -316,7 +351,7 @@ namespace pending_window_update_ = false; } - if (pending_req_count_ == 0 && !pending_window_update_) + if (!browser_is_busy()) { try { @@ -332,6 +367,15 @@ namespace std::cerr << ": " << e.what() << "\n"; Gtk::Main::quit(); } + catch (Glib::Exception & e) + { + std::cerr << "Fatal error"; + if (!page_queue_.empty()) + std::cerr << " while processing <" << page_queue_.front() + << ">"; + std::cerr << ": " << e.what() << "\n"; + Gtk::Main::quit(); + } } } @@ -364,14 +408,14 @@ namespace // Might need to wait a while for things to load or more // likely for a re-layout. - if (pending_req_count_ > 0) + if (browser_is_busy()) return true; } // All further work should only be done if we're not in preview mode. if (!output_dir_.empty()) { - // If we haven't already started work on this page, save a + // If we haven't already started work on this menu, save a // screenshot of its normal appearance. if (!page_state_.get()) save_screenshot(); @@ -386,7 +430,7 @@ namespace page_queue_.pop(); if (page_queue_.empty()) { - generate_dvd(); + generate_dvd(contents_, output_dir_); return false; } else @@ -439,7 +483,7 @@ namespace temp_file links_temp; - int link_num; + unsigned link_num; link_iterator links_it, links_end; rectangle link_rect; @@ -490,25 +534,32 @@ namespace 0, 0, frame_params_.width, frame_params_.height }; + unsigned menu_num = resource_map_[page_queue_.front()].index; + for (/* no initialisation */; state->links_it != state->links_end; ++state->links_it) { nsCOMPtr node(*state->links_it); - // Find the link URI. + // Find the link URI and separate any fragment from it. nsCOMPtr link(do_QueryInterface(node)); assert(link); - nsCOMPtr uri; - check(link->GetHrefURI(getter_AddRefs(uri))); - std::string uri_string; + nsCOMPtr uri_iface; + check(link->GetHrefURI(getter_AddRefs(uri_iface))); + std::string uri_and_fragment, uri, fragment; { - nsCString uri_ns_string; - check(uri->GetSpec(uri_ns_string)); - uri_string.assign(uri_ns_string.BeginReading(), - uri_ns_string.EndReading()); + nsCString uri_and_fragment_ns; + check(uri_iface->GetSpec(uri_and_fragment_ns)); + uri_and_fragment.assign(uri_and_fragment_ns.BeginReading(), + uri_and_fragment_ns.EndReading()); + + std::size_t hash_pos = uri_and_fragment.find('#'); + uri.assign(uri_and_fragment, 0, hash_pos); + if (hash_pos != std::string::npos) + fragment.assign(uri_and_fragment, + hash_pos + 1, std::string::npos); } - std::string uri_sans_fragment(uri_string, 0, uri_string.find('#')); // Is this a new link? if (!state->link_changing) @@ -523,47 +574,58 @@ namespace if (state->link_rect.empty()) { std::cerr << "Ignoring invisible link to " - << uri_string << "\n"; + << uri_and_fragment << "\n"; continue; } ++state->link_num; - if (state->link_num >= dvd::menu_buttons_max) + if (state->link_num >= unsigned(dvd::menu_buttons_max)) { - if (state->link_num == dvd::menu_buttons_max) + if (state->link_num == unsigned(dvd::menu_buttons_max)) std::cerr << "No more than " << dvd::menu_buttons_max - << " buttons can be placed on a page\n"; - std::cerr << "Ignoring link to " << uri_string << "\n"; + << " buttons can be placed on a menu\n"; + std::cerr << "Ignoring link to " << uri_and_fragment + << "\n"; continue; } + state->spumux_file << + " \n"; - } - - file << " \n"; - } - - file << - " \n" - " \n"; - - // Generate a titleset for each video. This appears to make - // jumping to titles a whole lot simpler. - for (std::size_t video_num = 1; - video_num <= video_paths_.size(); - ++video_num) - { - file << - " \n" - // Generate a dummy menu so that the menu button on the - // remote control will work. - " \n" - " \n" - " 
 jump vmgm menu;
\n" - " \n" - " \n" - " \n" - " \n" - // Record calling page/menu. - " 
 g12 = g1;
\n"; - - // Write a reference to a linked VOB file, or the contents - // of a linked VOB list file. - const std::string & video_path = video_paths_[video_num - 1]; - if (video_path.compare(video_path.size() - 4, 4, ".vob") == 0) - { - // FIXME: Should XML-escape the path - file << " \n"; - } - else - { - assert(video_path.compare(video_path.size() - 8, 8, - ".voblist") == 0); - // TODO: Validate the file contents; - file << Glib::file_get_contents(video_path); - } - - file << - // If page/menu location has not been changed during the - // video, change the location to be the following - // link/button when returning to it. In any case, - // return to a page/menu. - " if (g1 eq g12) g1 = g1 + " << link_mult - << "; call menu; \n" - " \n" - " \n" - " \n"; - } - - file << - "\n"; - - file.close(); - - { - const char * argv[] = { - "dvdauthor", - "-o", output_dir_.c_str(), - "-x", temp.get_name().c_str(), - 0 - }; - int command_result; - Glib::spawn_sync(".", - Glib::ArrayHandle( - argv, sizeof(argv)/sizeof(argv[0]), - Glib::OWNERSHIP_NONE), - Glib::SPAWN_SEARCH_PATH - | Glib::SPAWN_STDOUT_TO_DEV_NULL, - SigC::Slot0(), - 0, 0, - &command_result); - if (command_result != 0) - throw std::runtime_error("dvdauthor failed"); - } - } - - void generate_page_dispatch(std::ostream & file, int indent, - int first_page, int last_page) - { - if (first_page == 1 && last_page == 1) - { - // The dispatch code is *on* page 1 so we must not dispatch to - // page 1 since that would cause an infinite loop. This case - // should be unreachable if there is more than one page due - // to the following case. - } - else if (first_page == 1 && last_page == 2) - { - // dvdauthor doesn't allow empty blocks or null statements so - // when selecting between pages 1 and 2 we don't use an "else" - // part. We must use braces so that a following "else" will - // match the right "if". - file << std::setw(indent) << "" << "{\n" - << std::setw(indent) << "" << "if (g0 eq 2)\n" - << std::setw(indent + 2) << "" << "jump menu 2;\n" - << std::setw(indent) << "" << "}\n"; - } - else if (first_page == last_page) - { - file << std::setw(indent) << "" - << "jump menu " << first_page << ";\n"; - } - else - { - int middle = (first_page + last_page) / 2; - file << std::setw(indent) << "" << "if (g0 le " << middle << ")\n"; - generate_page_dispatch(file, indent + 2, first_page, middle); - file << std::setw(indent) << "" << "else\n"; - generate_page_dispatch(file, indent + 2, middle + 1, last_page); } } @@ -980,16 +786,17 @@ namespace void set_browser_preferences() { - // Disable IE-compatibility kluge that causes backgrounds to - // sometimes/usually be missing from snapshots. This is only - // effective from Mozilla 1.8 onward. -# if MOZ_VERSION_MAJOR > 1 \ - || (MOZ_VERSION_MAJOR == 1 && MOZ_VERSION_MINOR >= 8) nsCOMPtr pref_service; static const nsCID pref_service_cid = NS_PREFSERVICE_CID; check(CallGetService(pref_service_cid, getter_AddRefs(pref_service))); nsCOMPtr pref_branch; + + // Disable IE-compatibility kluge that causes backgrounds to + // sometimes/usually be missing from snapshots. This is only + // effective from Mozilla 1.8 onward. +# if MOZ_VERSION_MAJOR > 1 \ + || (MOZ_VERSION_MAJOR == 1 && MOZ_VERSION_MINOR >= 8) check(pref_service->GetDefaultBranch("layout", getter_AddRefs(pref_branch))); check(pref_branch->SetBoolPref( @@ -997,9 +804,17 @@ namespace true)); # endif - // TODO: Set display resolution? Unfortunately Mozilla doesn't - // support non-square pixels (and neither do fontconfig or Xft - // anyway). + // Set display resolution. With standard-definition video we + // will be fitting ~600 pixels across a screen typically + // ranging from 10 to 25 inches wide, for a resolution of + // 24-60 dpi. I therefore declare the average horizontal + // resolution to be 40 dpi. The vertical resolution will be + // slightly higher (PAL/SECAM) or lower (NTSC), but + // unfortunately Mozilla doesn't support non-square pixels + // (and neither do fontconfig or Xft anyway). + check(pref_service->GetDefaultBranch("browser.display", + getter_AddRefs(pref_branch))); + check(pref_branch->SetIntPref("screen_resolution", 40)); } } // namespace