From c5f98ff303d670f72a5d491a5f4e1989d2043219 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 6 Aug 2006 11:51:18 +0000 Subject: [PATCH] Brought documentation up to date. Changed my email address. --- INSTALL | 2 +- README | 19 +++++++++++-------- TODO | 1 - auto_array.hpp | 2 +- auto_fd.hpp | 2 +- auto_proc.cpp | 2 +- auto_proc.hpp | 2 +- browser_widget.cpp | 2 +- browser_widget.hpp | 2 +- child_iterator.cpp | 2 +- child_iterator.hpp | 2 +- debian/control | 4 ++-- generate_dvd.cpp | 2 +- generate_dvd.hpp | 2 +- link_iterator.cpp | 2 +- link_iterator.hpp | 2 +- null_prompt_service.cpp | 2 +- pixbufs.cpp | 2 +- pixbufs.hpp | 2 +- style_sheets.cpp | 2 +- style_sheets.hpp | 2 +- temp_file.cpp | 2 +- temp_file.hpp | 2 +- vob_list.cpp | 2 +- vob_list.hpp | 2 +- webdvd.cpp | 2 +- x_frame_buffer.cpp | 2 +- x_frame_buffer.hpp | 2 +- xml_utils.cpp | 2 +- xml_utils.hpp | 2 +- xpcom_support.cpp | 2 +- xpcom_support.hpp | 2 +- 32 files changed, 42 insertions(+), 40 deletions(-) diff --git a/INSTALL b/INSTALL index 666e2d1..e272e3d 100644 --- a/INSTALL +++ b/INSTALL @@ -15,4 +15,4 @@ systems, but it should work on most modern Unix-like systems. If the above requirements are satisfied, building it should be as simple as running "make" and then "sudo make install". -- Ben Hutchings +- Ben Hutchings diff --git a/README b/README index 8c840b2..45c0189 100644 --- a/README +++ b/README @@ -15,7 +15,7 @@ WebDVD depends on the following software: - dvdauthor - expat 1.x - Gtkmm 2.0 -- mjpegtools +- ffmpeg or mjpegtools - Mozilla 1.7.x (later versions may work but are untested) - netpbm - Xvfb (from XFree86 or X.org) @@ -24,8 +24,8 @@ To build a complete DVD image you will also need: - mkisofs -You will also need a program such as ffmpeg or mencoder for producing -DVD-suitable MPEG-1 or MPEG-2 video files. +You will also need a program for producing DVD-suitable MPEG-1 or +MPEG-2 video files. Usage ----- @@ -84,9 +84,12 @@ the directory in which to create the filesystem (which should be either nonexistent or empty). WebDVD will automatically follow links to the other pages and to the video files. -If you use mjpegtools 1.6.2 or earlier you must add the option -"--encoder mjpegtools-old". This is due to an incompatible change in -the syntax of the ppmtoy4m command between versions 1.6.2 and 1.8. +By default, WebDVD now calls ffmpeg to generate MPEG-2 streams for +menus. If you want it to use mjpegtools as it previously did, you +must add the option "--encoder mjpegtools". If you use mjpegtools +1.6.2 or earlier you must instead use "--encoder mjpegtools-old". +This is due to an incompatible change in the syntax of the ppmtoy4m +command between versions 1.6.2 and 1.8. If this is successful you can then use mkisofs to create a DVD image from the output directory. Alternately you can write this directory @@ -97,7 +100,7 @@ Example ------- A live example set of menus can currently be found at -. +. Note that this has large background images that will take some time to load. @@ -154,7 +157,7 @@ provide a better solution in a later version of WebDVD. Author and copyright -------------------- -WebDVD was written by Ben Hutchings . +WebDVD was written by Ben Hutchings . Copyright 2005-2006 Ben Hutchings. This software is based in part on the work of the Independent JPEG Group. diff --git a/TODO b/TODO index 686e1cb..1c64870 100644 --- a/TODO +++ b/TODO @@ -3,7 +3,6 @@ Investigate and fix the crash that occurs after we trigger exit from null_prompt Make linking to chapters actually work. Priority 2 -Use ffmpeg instead of mjpegtools to encode menus. Use ffmpeg to convert unsuitable video files (how do we check this?). Add keyboard command for "top menu" in preview mode. Add support for videos in preview mode. diff --git a/auto_array.hpp b/auto_array.hpp index 6567be2..0da455e 100644 --- a/auto_array.hpp +++ b/auto_array.hpp @@ -1,4 +1,4 @@ -// Copyright 2005 Ben Hutchings . +// Copyright 2005 Ben Hutchings . // See the file "COPYING" for licence details. #ifndef INC_AUTO_ARRAY_HPP diff --git a/auto_fd.hpp b/auto_fd.hpp index d89cd8c..a48279c 100644 --- a/auto_fd.hpp +++ b/auto_fd.hpp @@ -1,4 +1,4 @@ -// Copyright 2005 Ben Hutchings . +// Copyright 2005 Ben Hutchings . // See the file "COPYING" for licence details. #ifndef INC_AUTO_FD_HPP diff --git a/auto_proc.cpp b/auto_proc.cpp index ad04a12..06abfad 100644 --- a/auto_proc.cpp +++ b/auto_proc.cpp @@ -1,4 +1,4 @@ -// Copyright 2005 Ben Hutchings . +// Copyright 2005 Ben Hutchings . // See the file "COPYING" for licence details. #include diff --git a/auto_proc.hpp b/auto_proc.hpp index 3dd2b66..1832b07 100644 --- a/auto_proc.hpp +++ b/auto_proc.hpp @@ -1,4 +1,4 @@ -// Copyright 2005 Ben Hutchings . +// Copyright 2005 Ben Hutchings . // See the file "COPYING" for licence details. #ifndef INC_AUTO_PROC_HPP diff --git a/browser_widget.cpp b/browser_widget.cpp index 0f6b53d..7d640e5 100644 --- a/browser_widget.cpp +++ b/browser_widget.cpp @@ -1,4 +1,4 @@ -// Copyright 2005 Ben Hutchings . +// Copyright 2005 Ben Hutchings . // See the file "COPYING" for licence details. #include "browser_widget.hpp" diff --git a/browser_widget.hpp b/browser_widget.hpp index 16d3023..456067b 100644 --- a/browser_widget.hpp +++ b/browser_widget.hpp @@ -1,4 +1,4 @@ -// Copyright 2005 Ben Hutchings . +// Copyright 2005 Ben Hutchings . // See the file "COPYING" for licence details. #ifndef INC_BROWSER_WIDGET_HPP diff --git a/child_iterator.cpp b/child_iterator.cpp index d6e708e..ccc0090 100644 --- a/child_iterator.cpp +++ b/child_iterator.cpp @@ -1,4 +1,4 @@ -// Copyright 2005 Ben Hutchings . +// Copyright 2005 Ben Hutchings . // See the file "COPYING" for licence details. #include "child_iterator.hpp" diff --git a/child_iterator.hpp b/child_iterator.hpp index e099676..53d88d3 100644 --- a/child_iterator.hpp +++ b/child_iterator.hpp @@ -1,4 +1,4 @@ -// Copyright 2005 Ben Hutchings . +// Copyright 2005 Ben Hutchings . // See the file "COPYING" for licence details. #ifndef INC_CHILD_ITERATOR_HPP diff --git a/debian/control b/debian/control index 2c82145..de94297 100644 --- a/debian/control +++ b/debian/control @@ -1,5 +1,5 @@ Source: webdvd -Maintainer: Ben Hutchings +Maintainer: Ben Hutchings Section: graphics Priority: extra Build-Depends: debhelper (>=4), libboost-dev, libgtkmm2.0-dev, mozilla-dev, libexpat1-dev @@ -16,4 +16,4 @@ Description: Converts HTML pages into DVD menus. allows you to design DVDs using familiar HTML editing tools or your favourite text editor. . - Homepage: http://womble.decadentplace.org.uk/software/webdvd/ + Homepage: http://womble.decadent.org.uk/software/webdvd/ diff --git a/generate_dvd.cpp b/generate_dvd.cpp index 36b1e3a..9f15d2f 100644 --- a/generate_dvd.cpp +++ b/generate_dvd.cpp @@ -1,4 +1,4 @@ -// Copyright 2005-6 Ben Hutchings . +// Copyright 2005-6 Ben Hutchings . // See the file "COPYING" for licence details. #include diff --git a/generate_dvd.hpp b/generate_dvd.hpp index f77d7da..91e8da8 100644 --- a/generate_dvd.hpp +++ b/generate_dvd.hpp @@ -1,4 +1,4 @@ -// Copyright 2005-6 Ben Hutchings . +// Copyright 2005-6 Ben Hutchings . // See the file "COPYING" for licence details. #ifndef INC_GENERATE_DVD_HPP diff --git a/link_iterator.cpp b/link_iterator.cpp index 20d4b4c..88d7daf 100644 --- a/link_iterator.cpp +++ b/link_iterator.cpp @@ -1,4 +1,4 @@ -// Copyright 2005 Ben Hutchings . +// Copyright 2005 Ben Hutchings . // See the file "COPYING" for licence details. #include "link_iterator.hpp" diff --git a/link_iterator.hpp b/link_iterator.hpp index d2b7a1a..ceadc6d 100644 --- a/link_iterator.hpp +++ b/link_iterator.hpp @@ -1,4 +1,4 @@ -// Copyright 2005 Ben Hutchings . +// Copyright 2005 Ben Hutchings . // See the file "COPYING" for licence details. #ifndef INC_LINK_ITERATOR_HPP diff --git a/null_prompt_service.cpp b/null_prompt_service.cpp index dca7810..878f7ff 100644 --- a/null_prompt_service.cpp +++ b/null_prompt_service.cpp @@ -1,4 +1,4 @@ -// Copyright 2006 Ben Hutchings . +// Copyright 2006 Ben Hutchings . // See the file "COPYING" for licence details. #include diff --git a/pixbufs.cpp b/pixbufs.cpp index 39a569c..d6936de 100644 --- a/pixbufs.cpp +++ b/pixbufs.cpp @@ -1,4 +1,4 @@ -// Copyright 2005 Ben Hutchings . +// Copyright 2005 Ben Hutchings . // See the file "COPYING" for licence details. #include "pixbufs.hpp" diff --git a/pixbufs.hpp b/pixbufs.hpp index f2be337..f0b8a26 100644 --- a/pixbufs.hpp +++ b/pixbufs.hpp @@ -1,4 +1,4 @@ -// Copyright 2005 Ben Hutchings . +// Copyright 2005 Ben Hutchings . // See the file "COPYING" for licence details. #ifndef INC_PIXBUFS_HPP diff --git a/style_sheets.cpp b/style_sheets.cpp index 5767800..568c8e8 100644 --- a/style_sheets.cpp +++ b/style_sheets.cpp @@ -1,4 +1,4 @@ -// Copyright 2005 Ben Hutchings . +// Copyright 2005 Ben Hutchings . // See the file "COPYING" for licence details. #include "style_sheets.hpp" diff --git a/style_sheets.hpp b/style_sheets.hpp index aa9d942..bb39b22 100644 --- a/style_sheets.hpp +++ b/style_sheets.hpp @@ -1,4 +1,4 @@ -// Copyright 2005 Ben Hutchings . +// Copyright 2005 Ben Hutchings . // See the file "COPYING" for licence details. #ifndef INC_STYLESHEETS_HPP diff --git a/temp_file.cpp b/temp_file.cpp index 6dd6c55..fc4106c 100644 --- a/temp_file.cpp +++ b/temp_file.cpp @@ -1,4 +1,4 @@ -// Copyright 2005 Ben Hutchings . +// Copyright 2005 Ben Hutchings . // See the file "COPYING" for licence details. #include "temp_file.hpp" diff --git a/temp_file.hpp b/temp_file.hpp index e1d942e..1ead61a 100644 --- a/temp_file.hpp +++ b/temp_file.hpp @@ -1,4 +1,4 @@ -// Copyright 2005-6 Ben Hutchings . +// Copyright 2005-6 Ben Hutchings . // See the file "COPYING" for licence details. #ifndef INC_TEMP_FILE_HPP diff --git a/vob_list.cpp b/vob_list.cpp index 086e1a0..f9b304d 100644 --- a/vob_list.cpp +++ b/vob_list.cpp @@ -1,4 +1,4 @@ -// Copyright 2006 Ben Hutchings . +// Copyright 2006 Ben Hutchings . // See the file "COPYING" for licence details. #include diff --git a/vob_list.hpp b/vob_list.hpp index aaa58b5..4253bb1 100644 --- a/vob_list.hpp +++ b/vob_list.hpp @@ -1,4 +1,4 @@ -// Copyright 2006 Ben Hutchings . +// Copyright 2006 Ben Hutchings . // See the file "COPYING" for licence details. #ifndef INC_VOB_LIST_HPP diff --git a/webdvd.cpp b/webdvd.cpp index f8e4400..66c70ca 100644 --- a/webdvd.cpp +++ b/webdvd.cpp @@ -1,4 +1,4 @@ -// Copyright 2005-6 Ben Hutchings . +// Copyright 2005-6 Ben Hutchings . // See the file "COPYING" for licence details. #include diff --git a/x_frame_buffer.cpp b/x_frame_buffer.cpp index 75d9595..7707514 100644 --- a/x_frame_buffer.cpp +++ b/x_frame_buffer.cpp @@ -1,4 +1,4 @@ -// Copyright 2005 Ben Hutchings . +// Copyright 2005 Ben Hutchings . // See the file "COPYING" for licence details. #include "x_frame_buffer.hpp" diff --git a/x_frame_buffer.hpp b/x_frame_buffer.hpp index 198d586..63f3165 100644 --- a/x_frame_buffer.hpp +++ b/x_frame_buffer.hpp @@ -1,4 +1,4 @@ -// Copyright 2005 Ben Hutchings . +// Copyright 2005 Ben Hutchings . // See the file "COPYING" for licence details. #ifndef INC_X_FRAME_BUFFER_HPP diff --git a/xml_utils.cpp b/xml_utils.cpp index 981feba..90cd279 100644 --- a/xml_utils.cpp +++ b/xml_utils.cpp @@ -1,4 +1,4 @@ -// Copyright 2005-6 Ben Hutchings . +// Copyright 2005-6 Ben Hutchings . // See the file "COPYING" for licence details. #include diff --git a/xml_utils.hpp b/xml_utils.hpp index e61e387..e850233 100644 --- a/xml_utils.hpp +++ b/xml_utils.hpp @@ -1,4 +1,4 @@ -// Copyright 2006 Ben Hutchings . +// Copyright 2006 Ben Hutchings . // See the file "COPYING" for licence details. #ifndef INC_XML_UTILS_HPP diff --git a/xpcom_support.cpp b/xpcom_support.cpp index 6576665..2c452d7 100644 --- a/xpcom_support.cpp +++ b/xpcom_support.cpp @@ -1,4 +1,4 @@ -// Copyright 2005 Ben Hutchings . +// Copyright 2005 Ben Hutchings . // See the file "COPYING" for licence details. #include diff --git a/xpcom_support.hpp b/xpcom_support.hpp index 9d42692..4fc983f 100644 --- a/xpcom_support.hpp +++ b/xpcom_support.hpp @@ -1,4 +1,4 @@ -// Copyright 2005 Ben Hutchings . +// Copyright 2005 Ben Hutchings . // See the file "COPYING" for licence details. #ifndef INC_XPCOM_SUPPORT_HPP -- 2.39.5