Brought documentation up to date.

Changed my email address.

diff --git a/INSTALL b/INSTALL
index 666e2d11e84ab9fe765d0d00d0c0cfdf2d05eccc..e272e3dbf30c1047d618c56ed000567eefc5bfc2 100644 (file)
--- 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@decadentplace.org.uk>
+- Ben Hutchings <ben@decadent.org.uk>

diff --git a/README b/README
index 8c840b238673ae146c7d10be64d2b7b1da915f33..45c0189c3cfac96f930a85fa7dd36f7807de0231 100644 (file)
--- 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
-<http://womble.decadentplace.org.uk/software/debconf5-dvd/menus/main.html>.
+<http://womble.decadent.org.uk/software/debconf5-dvd/menus/main.html>.
 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 <ben@decadentplace.org.uk>.
+WebDVD was written by Ben Hutchings <ben@decadent.org.uk>.
 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 686e1cbcdd9bc15c4479166e7a22df0de275e3c9..1c64870827120ade6ee1f6ccf6e99fde29fc1909 100644 (file)
--- 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 6567be2b5917f496bffe66fca286d74a831a04ab..0da455efc67c2a4465c82ffe92bc71842d1e3438 100644 (file)
--- a/auto_array.hpp
+++ b/auto_array.hpp
@@ -1,4 +1,4 @@
-// Copyright 2005 Ben Hutchings <ben@decadentplace.org.uk>.
+// Copyright 2005 Ben Hutchings <ben@decadent.org.uk>.
 // See the file "COPYING" for licence details.
 
 #ifndef INC_AUTO_ARRAY_HPP

diff --git a/auto_fd.hpp b/auto_fd.hpp
index d89cd8c81d77f3186b0417425d82a1a241660ddb..a48279c95997e1ba4b584671d6d09de4186b650a 100644 (file)
--- a/auto_fd.hpp
+++ b/auto_fd.hpp
@@ -1,4 +1,4 @@
-// Copyright 2005 Ben Hutchings <ben@decadentplace.org.uk>.
+// Copyright 2005 Ben Hutchings <ben@decadent.org.uk>.
 // See the file "COPYING" for licence details.
 
 #ifndef INC_AUTO_FD_HPP

diff --git a/auto_proc.cpp b/auto_proc.cpp
index ad04a125f25a9001a7d9288e5d861ff9f2bd5143..06abfad3b454dd11b084e129890511413352e242 100644 (file)
--- a/auto_proc.cpp
+++ b/auto_proc.cpp
@@ -1,4 +1,4 @@
-// Copyright 2005 Ben Hutchings <ben@decadentplace.org.uk>.
+// Copyright 2005 Ben Hutchings <ben@decadent.org.uk>.
 // See the file "COPYING" for licence details.
 
 #include <cassert>

diff --git a/auto_proc.hpp b/auto_proc.hpp
index 3dd2b66452f25fa573f59ab4d1a973144d523ae4..1832b0757e49e5756bbb3f3ee7ed4f807450fd20 100644 (file)
--- a/auto_proc.hpp
+++ b/auto_proc.hpp
@@ -1,4 +1,4 @@
-// Copyright 2005 Ben Hutchings <ben@decadentplace.org.uk>.
+// Copyright 2005 Ben Hutchings <ben@decadent.org.uk>.
 // See the file "COPYING" for licence details.
 
 #ifndef INC_AUTO_PROC_HPP

diff --git a/browser_widget.cpp b/browser_widget.cpp
index 0f6b53da24b018c822bd8fad8236b17accc6f79d..7d640e5cfd358cfa6836a5b1335ec8a3c8e4e5b9 100644 (file)
--- a/browser_widget.cpp
+++ b/browser_widget.cpp
@@ -1,4 +1,4 @@
-// Copyright 2005 Ben Hutchings <ben@decadentplace.org.uk>.
+// Copyright 2005 Ben Hutchings <ben@decadent.org.uk>.
 // See the file "COPYING" for licence details.
 
 #include "browser_widget.hpp"

diff --git a/browser_widget.hpp b/browser_widget.hpp
index 16d302323f7dc8b7727412a4aa71402d251d9a3d..456067bf39df4067182d84b12342ef7e48d8fa6e 100644 (file)
--- a/browser_widget.hpp
+++ b/browser_widget.hpp
@@ -1,4 +1,4 @@
-// Copyright 2005 Ben Hutchings <ben@decadentplace.org.uk>.
+// Copyright 2005 Ben Hutchings <ben@decadent.org.uk>.
 // See the file "COPYING" for licence details.
 
 #ifndef INC_BROWSER_WIDGET_HPP

diff --git a/child_iterator.cpp b/child_iterator.cpp
index d6e708e857aaff41084de771fafd350d257719ea..ccc009046277d3d85fe67feed892daf272ee31b7 100644 (file)
--- a/child_iterator.cpp
+++ b/child_iterator.cpp
@@ -1,4 +1,4 @@
-// Copyright 2005 Ben Hutchings <ben@decadentplace.org.uk>.
+// Copyright 2005 Ben Hutchings <ben@decadent.org.uk>.
 // See the file "COPYING" for licence details.
 
 #include "child_iterator.hpp"

diff --git a/child_iterator.hpp b/child_iterator.hpp
index e099676042cfcec49013f36567c4df716d1c8c71..53d88d319dfb63fb9241a2749023ed2c80b33d9d 100644 (file)
--- a/child_iterator.hpp
+++ b/child_iterator.hpp
@@ -1,4 +1,4 @@
-// Copyright 2005 Ben Hutchings <ben@decadentplace.org.uk>.
+// Copyright 2005 Ben Hutchings <ben@decadent.org.uk>.
 // See the file "COPYING" for licence details.
 
 #ifndef INC_CHILD_ITERATOR_HPP

diff --git a/debian/control b/debian/control
index 2c82145bffac696719c22fecc559147e3c7a2cc0..de94297f1978dd6ca7ae38bd5daf37bdf22150ac 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Source: webdvd
-Maintainer: Ben Hutchings <ben@decadentplace.org.uk>
+Maintainer: Ben Hutchings <ben@decadent.org.uk>
 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 36b1e3a4e3184292aa011b548a22449b7e3c9913..9f15d2f96a903e3d8dd73d74cadeb2788bcef142 100644 (file)
--- a/generate_dvd.cpp
+++ b/generate_dvd.cpp
@@ -1,4 +1,4 @@
-// Copyright 2005-6 Ben Hutchings <ben@decadentplace.org.uk>.
+// Copyright 2005-6 Ben Hutchings <ben@decadent.org.uk>.
 // See the file "COPYING" for licence details.
 
 #include <fstream>

diff --git a/generate_dvd.hpp b/generate_dvd.hpp
index f77d7da1d4bdf9e59ed954e7eb42b11519af3d91..91e8da8d5e808ec4e52eef5cf234483e1aaf6b36 100644 (file)
--- a/generate_dvd.hpp
+++ b/generate_dvd.hpp
@@ -1,4 +1,4 @@
-// Copyright 2005-6 Ben Hutchings <ben@decadentplace.org.uk>.
+// Copyright 2005-6 Ben Hutchings <ben@decadent.org.uk>.
 // See the file "COPYING" for licence details.
 
 #ifndef INC_GENERATE_DVD_HPP

diff --git a/link_iterator.cpp b/link_iterator.cpp
index 20d4b4c7aca0afda40efa36f627e83ffa6cba020..88d7dafc2e95a09405f008f81fd5161f1d2b3a09 100644 (file)
--- a/link_iterator.cpp
+++ b/link_iterator.cpp
@@ -1,4 +1,4 @@
-// Copyright 2005 Ben Hutchings <ben@decadentplace.org.uk>.
+// Copyright 2005 Ben Hutchings <ben@decadent.org.uk>.
 // See the file "COPYING" for licence details.
 
 #include "link_iterator.hpp"

diff --git a/link_iterator.hpp b/link_iterator.hpp
index d2b7a1ac228a42e1889a06cb2bb9d96677e1e27d..ceadc6d5363275a373ed1032196f83ba0364eccb 100644 (file)
--- a/link_iterator.hpp
+++ b/link_iterator.hpp
@@ -1,4 +1,4 @@
-// Copyright 2005 Ben Hutchings <ben@decadentplace.org.uk>.
+// Copyright 2005 Ben Hutchings <ben@decadent.org.uk>.
 // 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 dca78103dbdb020e6cdaca48b2142e18b1395849..878f7ff268f71057127e1f997287ad0b024d0077 100644 (file)
--- a/null_prompt_service.cpp
+++ b/null_prompt_service.cpp
@@ -1,4 +1,4 @@
-// Copyright 2006 Ben Hutchings <ben@decadentplace.org.uk>.
+// Copyright 2006 Ben Hutchings <ben@decadent.org.uk>.
 // See the file "COPYING" for licence details.
 
 #include <string>

diff --git a/pixbufs.cpp b/pixbufs.cpp
index 39a569cf2e238fe2f098dddfb130578f638f3c3f..d6936de31abcfeb918af1358e9c8091d913cc6ad 100644 (file)
--- a/pixbufs.cpp
+++ b/pixbufs.cpp
@@ -1,4 +1,4 @@
-// Copyright 2005 Ben Hutchings <ben@decadentplace.org.uk>.
+// Copyright 2005 Ben Hutchings <ben@decadent.org.uk>.
 // See the file "COPYING" for licence details.
 
 #include "pixbufs.hpp"

diff --git a/pixbufs.hpp b/pixbufs.hpp
index f2be337b74281f1601120aa939613e2329d6d2a6..f0b8a26255f112b0bcac73785b992b1e93d3d87e 100644 (file)
--- a/pixbufs.hpp
+++ b/pixbufs.hpp
@@ -1,4 +1,4 @@
-// Copyright 2005 Ben Hutchings <ben@decadentplace.org.uk>.
+// Copyright 2005 Ben Hutchings <ben@decadent.org.uk>.
 // See the file "COPYING" for licence details.
 
 #ifndef INC_PIXBUFS_HPP

diff --git a/style_sheets.cpp b/style_sheets.cpp
index 576780055d514d5b2575c607329107628fa50c93..568c8e8228216a7f067d8c9f350d3030336eee55 100644 (file)
--- a/style_sheets.cpp
+++ b/style_sheets.cpp
@@ -1,4 +1,4 @@
-// Copyright 2005 Ben Hutchings <ben@decadentplace.org.uk>.
+// Copyright 2005 Ben Hutchings <ben@decadent.org.uk>.
 // See the file "COPYING" for licence details.
 
 #include "style_sheets.hpp"

diff --git a/style_sheets.hpp b/style_sheets.hpp
index aa9d942d638351267d0930934e44a415a4a69fda..bb39b2286f03b98d369ebc4107917ee9f670ab69 100644 (file)
--- a/style_sheets.hpp
+++ b/style_sheets.hpp
@@ -1,4 +1,4 @@
-// Copyright 2005 Ben Hutchings <ben@decadentplace.org.uk>.
+// Copyright 2005 Ben Hutchings <ben@decadent.org.uk>.
 // See the file "COPYING" for licence details.
 
 #ifndef INC_STYLESHEETS_HPP

diff --git a/temp_file.cpp b/temp_file.cpp
index 6dd6c555fcd62fd4725ac64a57c5498ce77eaa94..fc4106c27bc658e3377afae4caf9ea8ebcdb0e75 100644 (file)
--- a/temp_file.cpp
+++ b/temp_file.cpp
@@ -1,4 +1,4 @@
-// Copyright 2005 Ben Hutchings <ben@decadentplace.org.uk>.
+// Copyright 2005 Ben Hutchings <ben@decadent.org.uk>.
 // See the file "COPYING" for licence details.
 
 #include "temp_file.hpp"

diff --git a/temp_file.hpp b/temp_file.hpp
index e1d942efa0ecbd06b308f760af3394bc9c8abb94..1ead61afb9f3831ae3b7a12c7d29889fcfb19bc6 100644 (file)
--- a/temp_file.hpp
+++ b/temp_file.hpp
@@ -1,4 +1,4 @@
-// Copyright 2005-6 Ben Hutchings <ben@decadentplace.org.uk>.
+// Copyright 2005-6 Ben Hutchings <ben@decadent.org.uk>.
 // See the file "COPYING" for licence details.
 
 #ifndef INC_TEMP_FILE_HPP

diff --git a/vob_list.cpp b/vob_list.cpp
index 086e1a032138f3e399a868c2bdc2a65af99b2b79..f9b304dc2ca90e8cc09382a06d9ef81422d15962 100644 (file)
--- a/vob_list.cpp
+++ b/vob_list.cpp
@@ -1,4 +1,4 @@
-// Copyright 2006 Ben Hutchings <ben@decadentplace.org.uk>.
+// Copyright 2006 Ben Hutchings <ben@decadent.org.uk>.
 // See the file "COPYING" for licence details.
 
 #include <cerrno>

diff --git a/vob_list.hpp b/vob_list.hpp
index aaa58b56e2c2fe4905c0e27ea361bbc3c1ce8cc1..4253bb145d8eae7af0ea93c485c238b7dc53b61f 100644 (file)
--- a/vob_list.hpp
+++ b/vob_list.hpp
@@ -1,4 +1,4 @@
-// Copyright 2006 Ben Hutchings <ben@decadentplace.org.uk>.
+// Copyright 2006 Ben Hutchings <ben@decadent.org.uk>.
 // See the file "COPYING" for licence details.
 
 #ifndef INC_VOB_LIST_HPP

diff --git a/webdvd.cpp b/webdvd.cpp
index f8e44005f204f24bcd80a7196e126dad7ff97c6b..66c70caddaa5897fe5ef864d1732b40451c73c61 100644 (file)
--- a/webdvd.cpp
+++ b/webdvd.cpp
@@ -1,4 +1,4 @@
-// Copyright 2005-6 Ben Hutchings <ben@decadentplace.org.uk>.
+// Copyright 2005-6 Ben Hutchings <ben@decadent.org.uk>.
 // See the file "COPYING" for licence details.
 
 #include <cassert>

diff --git a/x_frame_buffer.cpp b/x_frame_buffer.cpp
index 75d95957a29d86bd6a264c7c7a1f0bee62d0f49d..770751427ade4ea6e1bedce9a212a5ce226e27c4 100644 (file)
--- a/x_frame_buffer.cpp
+++ b/x_frame_buffer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2005 Ben Hutchings <ben@decadentplace.org.uk>.
+// Copyright 2005 Ben Hutchings <ben@decadent.org.uk>.
 // 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 198d58619b1beb03138146771f34eae23d197f1a..63f31657fb56d82834d04a91bb58073db5ea94dd 100644 (file)
--- a/x_frame_buffer.hpp
+++ b/x_frame_buffer.hpp
@@ -1,4 +1,4 @@
-// Copyright 2005 Ben Hutchings <ben@decadentplace.org.uk>.
+// Copyright 2005 Ben Hutchings <ben@decadent.org.uk>.
 // See the file "COPYING" for licence details.
 
 #ifndef INC_X_FRAME_BUFFER_HPP

diff --git a/xml_utils.cpp b/xml_utils.cpp
index 981febaea141db3b04a470559462a08447a04612..90cd27960e704bcc39d01c23bd9ee23d4cf06262 100644 (file)
--- a/xml_utils.cpp
+++ b/xml_utils.cpp
@@ -1,4 +1,4 @@
-// Copyright 2005-6 Ben Hutchings <ben@decadentplace.org.uk>.
+// Copyright 2005-6 Ben Hutchings <ben@decadent.org.uk>.
 // See the file "COPYING" for licence details.
 
 #include <cassert>

diff --git a/xml_utils.hpp b/xml_utils.hpp
index e61e3872f0c68c3a83d29360e06093cd3c219cb9..e850233145211ccdcb0ff6f4a912617bfe167d20 100644 (file)
--- a/xml_utils.hpp
+++ b/xml_utils.hpp
@@ -1,4 +1,4 @@
-// Copyright 2006 Ben Hutchings <ben@decadentplace.org.uk>.
+// Copyright 2006 Ben Hutchings <ben@decadent.org.uk>.
 // See the file "COPYING" for licence details.
 
 #ifndef INC_XML_UTILS_HPP

diff --git a/xpcom_support.cpp b/xpcom_support.cpp
index 6576665c648109fe3f3f025afd08f2ff71b41ce9..2c452d76369344ae9ff401cb9d02cc7ad9edd3c7 100644 (file)
--- a/xpcom_support.cpp
+++ b/xpcom_support.cpp
@@ -1,4 +1,4 @@
-// Copyright 2005 Ben Hutchings <ben@decadentplace.org.uk>.
+// Copyright 2005 Ben Hutchings <ben@decadent.org.uk>.
 // See the file "COPYING" for licence details.
 
 #include <cassert>

diff --git a/xpcom_support.hpp b/xpcom_support.hpp
index 9d426924dd56c49192d48e3596e1edb8f779ac92..4fc983f12b26dbad52d8a5cd1f17e90068a4b00c 100644 (file)
--- a/xpcom_support.hpp
+++ b/xpcom_support.hpp
@@ -1,4 +1,4 @@
-// Copyright 2005 Ben Hutchings <ben@decadentplace.org.uk>.
+// Copyright 2005 Ben Hutchings <ben@decadent.org.uk>.
 // See the file "COPYING" for licence details.
 
 #ifndef INC_XPCOM_SUPPORT_HPP