Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 3

tovid.changes Changed

tovid.spec Changed

@@ -10,7 +10,7 @@
 
 Summary:        Video conversion and DVD authoring tools
 Name:           tovid
-Version:        0.33
+Version:        0.34
 Release:        0.pm.1
 Group:          Productivity/Multimedia/Video/Editors and Convertors
 License:        GNU General Public License version 2 or later (GPLv2 or later)
@@ -34,7 +34,6 @@
 Requires:       dvdauthor >= 0.6.0
 Requires:       ffmpeg
 Requires:       ImageMagick >= 6.0
-Requires:       licenses
 Requires:       lsdvd
 Requires:       mjpegtools
 Requires:       mkisofs
@@ -56,7 +55,6 @@
 BuildRequires:  dvdauthor >= 0.6.0
 BuildRequires:  ffmpeg
 BuildRequires:  ImageMagick >= 6.0
-BuildRequires:  licenses
 BuildRequires:  lsdvd
 BuildRequires:  mjpegtools
 BuildRequires:  mkisofs
@@ -92,12 +90,11 @@
 
 %__rm -f "%{buildroot}%{_usr}/lib/tovid/.install.log"
 
-%suse_update_desktop_file -r tovidgui AudioVideo AudioVideoEditing
+for x in tovidgui titleset-wizard; do
+    %suse_update_desktop_file -r "$x" AudioVideo AudioVideoEditing
+done
 
-h="%{_usr}/share/doc/licenses/md5/$(md5sum COPYING|cut -f1 -d" ")"
-[ -e "$h" ] && %__ln_s -f "$h" COPYING
-
-%fdupes -s %{buildroot}
+%fdupes -s "%{buildroot}"
 
 %clean
 %{?buildroot:%__rm -rf "%{buildroot}"}
@@ -110,7 +107,9 @@
 %{python_sitelib}/tovid-%{version}*
 %{_usr}/lib/tovid
 %{_datadir}/applications/tovidgui.desktop
+%{_datadir}/applications/titleset-wizard.desktop
 %{_datadir}/icons/*/*/apps/tovid.png
+%{_datadir}/icons/*/*/apps/titleset-wizard.png
 %{_datadir}/icons/*/scalable/apps/*.svg
 %doc %{_mandir}/man1/tovid.1%{ext_man}

tovid-0.33.tar.bz2/Makefile Deleted

@@ -1,1220 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# Makefile.  Generated from Makefile.in by configure.
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-# Process this file with automake to produce a Makefile.in
-
-# Project homepage: http://tovid.wikia.com
-#
-#
-# Copyright (C) 2005 tovid <http://tovid.wikia.com>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later
-# version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Or see:
-#
-#           http://www.gnu.org/licenses/gpl.txt
-
-
-
-pkgdatadir = $(datadir)/tovid
-pkgincludedir = $(includedir)/tovid
-pkglibdir = $(libdir)/tovid
-pkglibexecdir = $(libexecdir)/tovid
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-subdir = .
-DIST_COMMON = README $(am__configure_deps) $(dist_app_DATA) \
-	$(dist_icon128_DATA) $(dist_icon32_DATA) $(dist_icon48_DATA) \
-	$(dist_icon64_DATA) $(dist_iconSVG_DATA) \
-	$(pythonBACKEND_PYTHON) $(pythonGUIS_PYTHON) \
-	$(pythonLIBTOVID_PYTHON) $(pythonMETAGUI_PYTHON) \
-	$(pythonRENDER_PYTHON) $(pythonTEMPLATE_PYTHON) \
-	$(pythonUTIL_PYTHON) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(top_srcdir)/configure \
-	$(top_srcdir)/src/tovid-init.in AUTHORS COPYING ChangeLog \
-	INSTALL NEWS install-sh missing py-compile
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(install_sh) -d
-CONFIG_CLEAN_FILES = src/tovid-init
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(bindir)" \
-	"$(DESTDIR)$(pythonBACKENDdir)" "$(DESTDIR)$(pythonGUISdir)" \
-	"$(DESTDIR)$(pythonLIBTOVIDdir)" \
-	"$(DESTDIR)$(pythonMETAGUIdir)" "$(DESTDIR)$(pythonRENDERdir)" \
-	"$(DESTDIR)$(pythonTEMPLATEdir)" "$(DESTDIR)$(pythonUTILdir)" \
-	"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(appdir)" \
-	"$(DESTDIR)$(icon128dir)" "$(DESTDIR)$(icon32dir)" \
-	"$(DESTDIR)$(icon48dir)" "$(DESTDIR)$(icon64dir)" \
-	"$(DESTDIR)$(iconSVGdir)"
-SCRIPTS = $(bin_SCRIPTS)
-SOURCES =
-DIST_SOURCES =
-py_compile = $(top_srcdir)/py-compile
-man1dir = $(mandir)/man1
-NROFF = nroff
-MANS = $(man_MANS)
-DATA = $(dist_app_DATA) $(dist_icon128_DATA) $(dist_icon32_DATA) \
-	$(dist_icon48_DATA) $(dist_icon64_DATA) $(dist_iconSVG_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  { test ! -d "$(distdir)" \
-    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr "$(distdir)"; }; }
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = ${SHELL} /home/eric/tovid/tovid/missing --run aclocal-1.11
-AMTAR = ${SHELL} /home/eric/tovid/tovid/missing --run tar
-AUTOCONF = ${SHELL} /home/eric/tovid/tovid/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/eric/tovid/tovid/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/eric/tovid/tovid/missing --run automake-1.11
-AWK = gawk
-CYGPATH_W = echo
-DEFS = -DPACKAGE_NAME=\"tovid\" -DPACKAGE_TARNAME=\"tovid\" -DPACKAGE_VERSION=\"svn\" -DPACKAGE_STRING=\"tovid\ svn\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE=\"tovid\" -DVERSION=\"svn\"
-ECHO_C = 
-ECHO_N = -n
-ECHO_T = 
-INSTALL = /usr/bin/install -c
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LIBOBJS = 
-LIBS = 
-LN_S = 
-LTLIBOBJS = 
-MAKEINFO = ${SHELL} /home/eric/tovid/tovid/missing --run makeinfo
-MKDIR_P = /bin/mkdir -p
-PACKAGE = tovid
-PACKAGE_BUGREPORT = 
-PACKAGE_NAME = tovid
-PACKAGE_STRING = tovid svn
-PACKAGE_TARNAME = tovid
-PACKAGE_VERSION = svn
-PATH_SEPARATOR = :
-PYTHON = /usr/bin/python
-PYTHON_EXEC_PREFIX = ${exec_prefix}
-PYTHON_PLATFORM = linux2
-PYTHON_PREFIX = ${prefix}
-PYTHON_VERSION = 2.6
-SET_MAKE = 
-SHELL = /bin/sh
-STRIP = 
-TXT2TAGS = :
-VERSION = svn-r3022
-abs_builddir = /home/eric/tovid/tovid
-abs_srcdir = /home/eric/tovid/tovid
-abs_top_builddir = /home/eric/tovid/tovid
-abs_top_srcdir = /home/eric/tovid/tovid
-am__leading_dot = .
-am__tar = ${AMTAR} chof - "$$tardir"
-am__untar = ${AMTAR} xf -
-
-# Override the default bindir, so the tovid executables are
-# installed to e.g. /usr/share/tovid/bin
-# FIXME: This is probably not the correct way to do it
-bindir = $(libdir)/tovid
-build_alias = 
-builddir = .
-datadir = ${datarootdir}
-datarootdir = ${prefix}/share
-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
-dvidir = ${docdir}
-exec_prefix = ${prefix}
-host_alias = 
-htmldir = ${docdir}
-includedir = ${prefix}/include
-infodir = ${datarootdir}/info
-install_sh = ${SHELL} /home/eric/tovid/tovid/install-sh
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localedir = ${datarootdir}/locale
-localstatedir = ${prefix}/var
-mandir = ${datarootdir}/man
-mkdir_p = /bin/mkdir -p
-oldincludedir = /usr/include

tovid-0.33.tar.bz2/Makefile.am Deleted

@@ -1,208 +0,0 @@
-# Process this file with automake to produce a Makefile.in
-
-# Project homepage: http://tovid.wikia.com
-#
-#
-# Copyright (C) 2005 tovid <http://tovid.wikia.com>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later
-# version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Or see:
-#
-#           http://www.gnu.org/licenses/gpl.txt
-
-# List the source files for each shell script
-sh_bin = \
-	src/idvid \
-	src/makedvd \
-	src/makemenu \
-	src/makevcd \
-	src/makexml \
-	src/postproc \
-	src/todisc \
-	src/todisc-fade-routine \
-	src/makempg \
-	src/tovid-batch \
-	src/tovid-init \
-	src/tovid-interactive \
-	src/make_titlesets
-
-# List the source files for each python script
-py_bin = \
-	src/tovid \
-	src/todiscgui \
-	src/tovid-stats \
-	src/titleset-wizard
-
-# Override the default bindir, so the tovid executables are
-# installed to e.g. /usr/share/tovid/bin
-# FIXME: This is probably not the correct way to do it
-bindir = $(libdir)/tovid
-
-# Specify the scripts to make and install.
-# The .gif is here because I can't be arsed to figure out the
-# Autohell way of doing it
-bin_SCRIPTS = \
-	$(sh_bin) \
-	$(py_bin) \
-	icons/tovid.gif
-
-# The manpages
-man_dir = docs/man
-man_src_dir = docs/src/en
-man_MANS = \
-	$(man_dir)/tovid.1
-src_MANS = \
-	$(man_src_dir)/tovid.t2t
-
-# Make the manpages for svn users (tarball users' man pages made in dist-hook)
-#   This is a static pattern rule as seen on (TV!)
-#   http://www.gnu.org/software/make/manual/make.html#Static-Pattern
-$(man_MANS): $(man_dir)/%.1: $(man_src_dir)/%.t2t
-	txt2tags -t man -i "$<" -o "$@"
-
-# Shared data: icons and .desktop files
-# Icons -- freedesktop.org scheme
-icon_top_dir = icons/hicolor
-icon_svg_dir = scalable/apps
-icon_128_dir = 128x128/apps
-icon_64_dir = 64x64/apps
-icon_48_dir = 48x48/apps
-icon_32_dir = 32x32/apps
-
-# Install directories, $(datadir) == $(prefix)/share
-icon_base_dir = $(datadir)/$(icon_top_dir)
-icon128dir = $(icon_base_dir)/$(icon_128_dir)
-icon64dir = $(icon_base_dir)/$(icon_64_dir)
-icon48dir = $(icon_base_dir)/$(icon_48_dir)
-icon32dir = $(icon_base_dir)/$(icon_32_dir)
-iconSVGdir = $(icon_base_dir)/$(icon_svg_dir)
-appdir = $(datadir)/applications
-
-# Distribute the data
-dist_icon128_DATA = $(icon_top_dir)/$(icon_128_dir)/tovid.png
-dist_icon64_DATA = $(icon_top_dir)/$(icon_64_dir)/tovid.png
-dist_icon48_DATA = $(icon_top_dir)/$(icon_48_dir)/tovid.png
-dist_icon32_DATA = $(icon_top_dir)/$(icon_32_dir)/tovid.png
-dist_iconSVG_DATA = $(icon_top_dir)/$(icon_svg_dir)/cd.svg \
-	$(icon_top_dir)/$(icon_svg_dir)/disc.svg \
-	$(icon_top_dir)/$(icon_svg_dir)/tovid.svg
-dist_app_DATA = \
-	tovidgui.desktop
-
-
-# Distribute the scripts and manpage source files
-# manpages are made and packaged in the dist-hook for tarball users which
-# prevents them from having to install txt2tags to make the mans, thus
-# they aren't listed here.
-#   NOTE: this is a bit of a hack. When 'make dist' is called, make puts
-#   the manpage source in the pre-tarball directory. After everything is
-#   finished, the dist-hook comes into play and fresh man pages are made.
-#   We're taking advangtage of this order (make will _always_ do the hook
-#   after the action, that's why it's a 'hook'!) to ensure that the derived
-#   .1 manpages are newer than the .t2t source files. If the man sources are
-#   removed from the distributed tarball, make will try to remake the .1 pages
-#   since it always executes rules for targets without prerequisites,
-#   thinking that it's a rule like clean: .
-EXTRA_DIST = \
-	$(bin_SCRIPTS) \
-	$(src_MANS) \
-	SENSE \
-	setup.py
-
-# Shared python libraries: libtovid and the gui
-# See lengthy comments in configure.ac
-# $(pythondir) is the "The directory name for the site-packages subdirectory
-# of the standard Python install tree." and is generated by configure.ac's
-# AM_PATH_PYTHON. Typically, this points to
-# $(prefix)/lib/pythonM.m/site-packages
-# $(prefix) generally defaults to /usr/local for ./configure
-# and "make install"
-
-# Specifying a module to install: use 'python'
-# 'python' works as a prefix of sorts: if you have files that need to be
-# installed into separate directories, use another python variable pair.
-# Say you want to install a python module in $(pythondir)/FOO , then
-# you'll need to define a pair of variables:
-#   (1) pythonFOO_PYTHON   which takes the python source files
-#   (2) pythonFOOdir       which points to where the module should be installed
-#                          (CAPS are not required, but helps readability)
-pythonLIBTOVID_PYTHON 	= libtovid/*.py
-pythonLIBTOVIDdir 		= $(pythondir)/libtovid
-# Submodules
-pythonGUIS_PYTHON 		= libtovid/guis/*.py
-pythonGUISdir 			= $(pythondir)/libtovid/guis
-pythonBACKEND_PYTHON 	= libtovid/backend/*.py
-pythonBACKENDdir 		= $(pythondir)/libtovid/backend
-pythonRENDER_PYTHON 	= libtovid/render/*.py
-pythonRENDERdir 		= $(pythondir)/libtovid/render
-pythonTEMPLATE_PYTHON 	= libtovid/template/*.py
-pythonTEMPLATEdir 		= $(pythondir)/libtovid/template
-pythonMETAGUI_PYTHON 	= libtovid/metagui/*.py
-pythonMETAGUIdir 		= $(pythondir)/libtovid/metagui
-pythonUTIL_PYTHON 		= libtovid/util/*.py
-pythonUTILdir 			= $(pythondir)/libtovid/util
-
-# src/tovid-init not needed b/c ./configure derives it from src/tovid-init.in
-# make the output directory for the man pages, since t2t won't
-dist-hook:
-	rm -rvf $(top_distdir)/src/tovid-init
-	mkdir $(top_distdir)/docs/man
-
-# Hook to create a symbolic link for the main 'tovid' script
-# FIXME: $(LN_S) is supposed to work since AC_PROG_LN_S is in configure.ac,
-# but it doesn't for whatever reason (evaluates to empty string).
-# For now, using explicit `ln -s`
-install-exec-hook:
-	rm -fv "$(prefix)/bin/tovid"
-	ln -s "$(DESTDIR)$(bindir)/tovid" "$(prefix)/bin/tovid"
-
-# After uninstalling tovid, remove the python module directories
-uninstall-hook:
-	rmdir $(pythonGUISdir)
-	rmdir $(pythonBACKENDdir)
-	rmdir $(pythonRENDERdir)
-	rmdir $(pythonTEMPLATEdir)
-	rmdir $(pythonMETAGUIdir)
-	rmdir $(pythonUTILdir)
-	rmdir $(pythonLIBTOVIDdir)
-	rm $(prefix)/bin/tovid
-
-# A little fun :-)
-sense:
-	fold -w 78 -s SENSE | less
-
-# Allow only the bash scripts to be installed/uninstalled
-# These were copied and modified from the Makefile after ./configure was
-# run. A little quantum leaping :-)
-install-bash: $(sh_bin)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(sh_bin)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f $$d$$p; then \
-	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	    echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	    $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
-	  else :; fi; \
-	done

tovid-0.33.tar.bz2/Makefile.in Deleted

@@ -1,1220 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# Process this file with automake to produce a Makefile.in
-
-# Project homepage: http://tovid.wikia.com
-#
-#
-# Copyright (C) 2005 tovid <http://tovid.wikia.com>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later
-# version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Or see:
-#
-#           http://www.gnu.org/licenses/gpl.txt
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-subdir = .
-DIST_COMMON = README $(am__configure_deps) $(dist_app_DATA) \
-	$(dist_icon128_DATA) $(dist_icon32_DATA) $(dist_icon48_DATA) \
-	$(dist_icon64_DATA) $(dist_iconSVG_DATA) \
-	$(pythonBACKEND_PYTHON) $(pythonGUIS_PYTHON) \
-	$(pythonLIBTOVID_PYTHON) $(pythonMETAGUI_PYTHON) \
-	$(pythonRENDER_PYTHON) $(pythonTEMPLATE_PYTHON) \
-	$(pythonUTIL_PYTHON) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(top_srcdir)/configure \
-	$(top_srcdir)/src/tovid-init.in AUTHORS COPYING ChangeLog \
-	INSTALL NEWS install-sh missing py-compile
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(install_sh) -d
-CONFIG_CLEAN_FILES = src/tovid-init
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(bindir)" \
-	"$(DESTDIR)$(pythonBACKENDdir)" "$(DESTDIR)$(pythonGUISdir)" \
-	"$(DESTDIR)$(pythonLIBTOVIDdir)" \
-	"$(DESTDIR)$(pythonMETAGUIdir)" "$(DESTDIR)$(pythonRENDERdir)" \
-	"$(DESTDIR)$(pythonTEMPLATEdir)" "$(DESTDIR)$(pythonUTILdir)" \
-	"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(appdir)" \
-	"$(DESTDIR)$(icon128dir)" "$(DESTDIR)$(icon32dir)" \
-	"$(DESTDIR)$(icon48dir)" "$(DESTDIR)$(icon64dir)" \
-	"$(DESTDIR)$(iconSVGdir)"
-SCRIPTS = $(bin_SCRIPTS)
-SOURCES =
-DIST_SOURCES =
-py_compile = $(top_srcdir)/py-compile
-man1dir = $(mandir)/man1
-NROFF = nroff
-MANS = $(man_MANS)
-DATA = $(dist_app_DATA) $(dist_icon128_DATA) $(dist_icon32_DATA) \
-	$(dist_icon48_DATA) $(dist_icon64_DATA) $(dist_iconSVG_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  { test ! -d "$(distdir)" \
-    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr "$(distdir)"; }; }
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PYTHON = @PYTHON@
-PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-PYTHON_PLATFORM = @PYTHON_PLATFORM@
-PYTHON_PREFIX = @PYTHON_PREFIX@
-PYTHON_VERSION = @PYTHON_VERSION@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-TXT2TAGS = @TXT2TAGS@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-am__leading_dot = @am__leading_dot@
-am__tar = @am__tar@
-am__untar = @am__untar@
-
-# Override the default bindir, so the tovid executables are
-# installed to e.g. /usr/share/tovid/bin
-# FIXME: This is probably not the correct way to do it
-bindir = $(libdir)/tovid
-build_alias = @build_alias@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@

tovid-0.33.tar.bz2/SENSE Deleted

@@ -1,28 +0,0 @@
-Master Foo once said to a visiting programmer: "There is more Unix-nature in one line of shell script than there is in ten thousand lines of C."
-
-The programmer, who was very proud of his mastery of C, said: "How can this be? C is the language in which the very kernel of Unix is implemented!"
-
-Master Foo replied: "That is so. Nevertheless, there is more Unix-nature in one line of shell script than there is in ten thousand lines of C."
-
-The programmer grew distressed. "But through the C language we experience the enlightenment of the Patriarch Ritchie! We become as one with the operating system and the machine, reaping matchless performance!"
-
-Master Foo replied: "All that you say is true. But there is still more Unix-nature in one line of shell script than there is in ten thousand lines of C."
-
-The programmer scoffed at Master Foo and rose to depart. But Master Foo nodded to his student Nubi, who wrote a line of shell script on a nearby whiteboard, and said: "Master programmer, consider this pipeline. Implemented in pure C, would it not span ten thousand lines?"
-
-The programmer muttered through his beard, contemplating what Nubi had written. Finally he agreed that it was so.
-
-"And how many hours would you require to implement and debug that C program?" asked Nubi.
-
-"Many," admitted the visiting programmer. "But only a fool would spend the time to do that when so many more worthy tasks await him."
-
-"And who better understands the Unix-nature?" Master Foo asked. "Is it he who writes the ten thousand lines, or he who, perceiving the emptiness of the task, gains merit by not coding?"
-
-Upon hearing this, the programmer was enlightened.
-
-         -- http://www.catb.org/~esr/writings/unix-koans/ten-thousand.html
-
-What happens when you have ten thousand lines of shell script (like tovid)?
-
-(q to quit)
-

tovid-0.33.tar.bz2/aclocal.m4 Deleted

@@ -1,823 +0,0 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
-[m4_warning([this file was generated for autoconf 2.63.
-You have another version of autoconf.  It may work, but is not guaranteed to.
-If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
-
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-# (This private macro should not be called outside this file.)
-AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.11'
-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11.1], [],
-      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-])
-
-# _AM_AUTOCONF_VERSION(VERSION)
-# -----------------------------
-# aclocal traces this macro to find the Autoconf version.
-# This is a private macro too.  Using m4_define simplifies
-# the logic in aclocal, which can simply ignore this definition.
-m4_define([_AM_AUTOCONF_VERSION], [])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.1])dnl
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-
-# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory.  The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run.  This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-#    fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-#    fails if $ac_aux_dir is absolute,
-#    fails when called from a subdirectory in a VPATH build with
-#          a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*$.*$"`
-# and then we would define $MISSING as
-#   MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH.  The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# Do all the work for Automake.                             -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 16
-
-# This macro actually does too much.  Some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition.  After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.62])dnl
-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
-  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-			     [_AM_PROG_TAR([v7])])])
-_AM_IF_OPTION([no-dependencies],,

tovid-0.33.tar.bz2/configure Deleted

@@ -1,3851 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for tovid svn.
-#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\$.*\$"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in
-      *"$as_nl"*)
-	expr "X$arg" : "X\$.*\$$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;
-      esac;
-      expr "X$arg" : "X\$.*\$" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
-fi
-
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# Required to use basename.
-if expr a : '$a$' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*$...$'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/$[^/][^/]*$/*$' \| \
-	 X"$0" : 'X$//$$' \| \
-	 X"$0" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/$[^/][^/]*$\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/$\/\/$$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/$\/$.*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# CDPATH.
-$as_unset CDPATH
-
-
-if test "x$CONFIG_SHELL" = x; then
-  if (eval ":") 2>/dev/null; then
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-
-  if test $as_have_required = yes &&	 (eval ":
-(as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :

tovid-0.33.tar.bz2/configure.ac Deleted

@@ -1,187 +0,0 @@
-# Process this file with autoconf to produce a configure script.
-# Autoconf documentation:
-#     http://www.gnu.org/software/autoconf/manual/index.html
-
-# Project homepage: http://tovid.wikia.com
-#
-#
-# Copyright (C) 2005 tovid <http://tovid.wikia.com>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later
-# version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Or see:
-#
-#           http://www.gnu.org/licenses/gpl.txt
-
-# ******************************************************************************
-# ******************************************************************************
-#
-#
-# INIT
-#
-#
-# ******************************************************************************
-# ******************************************************************************
-
-# The first arugment sets the package name, the second sets the package version.
-# eg [tovid], [0.40] would yield a tovid-0.40.tar.gz after "$ make dist"
-# the version number is also substituted into tovid-init.in
-AC_INIT([tovid], [svn])
-AC_CONFIG_SRCDIR([src/tovid])
-
-# Require minimum versions of the autotools
-AC_PREREQ(2.5)
-AM_INIT_AUTOMAKE([1.11])
-
-
-
-
-# ******************************************************************************
-# ******************************************************************************
-#
-#
-# CHECK FOR DEPENDENCIES
-#
-#
-# ******************************************************************************
-# ******************************************************************************
-
-# The only 'compile time' dependency we have is txt2tags, which is used to
-# build the man pages.
-AC_CHECK_PROG(TXT2TAGS, [txt2tags], [:], [false])
-if ! $TXT2TAGS; then
-    AC_MSG_ERROR([
-
- ERROR:
-
- txt2tags cannot be found on your system, but tovid needs it to build
- the man pages. Please install txt2tags (http://txt2tags.sf.net) and
- run ./configure again. Thanks!
-
-     -- http://tovid.wikia.com
-])
-fi
-
-# All run-time dependencies are checked in tovid-init now. In addition to being
-# the Correct Way to do things, it makes packaging much easier for deb|rpm|???
-# maintainers.
-
-# ******************************************************************************
-# Python
-# ******************************************************************************
-# As seen on http://sources.redhat.com/automake/automake.html#Python
-# AM_PATH_PYTHON sets many vars, including $(pythondir), which is the directory
-# name for the site-packages subdirectory of the standard Python install tree;
-# and $(pyexecdir), which is the directory where Python extension modules
-# (shared libraries) should be installed.
-
-# For example, on friedrij's woody debian system
-# $(pythondir) = ${prefix}/lib/python2.3/site-packages
-# $(pyexecdir) = ${exec_prefix}/lib/python2.3/site-packages
-
-# From the autoconf manual, available in anything _but_ html (uf, fsf) from
-# http://www.gnu.org/software/autoconf/manual/index.html
-# $(prefix) is "The common installation prefix for all files. If $(exec_prefix)
-# is defined to a different value, prefix is used only for architecture-
-# independent files."
-# $(exec_prefix) is "The installation prefix for architecture-dependent files.
-# By default it's the same as $(prefix). You should avoid installing anything
-# directly to $(exec_prefix). However, the default value for directories
-# containing architecture-dependent files should be relative to $(exec_prefix)."
-
-# The GNU Coding Standards, available in html (yosh) from
-# (http://www.gnu.org/prep/standards/standards.html#Directory-Variables),
-# clarifies the difference between $(prefix) and $(exec_prefix): "Generally,
-# $(exec_prefix) is used for directories that contain machine-specific files
-# (such as executables and subroutine libraries), while $(prefix) is used
-# directly for other directories."
-
-# So, this dev thinks we need $(pythondir) and some 'enlightened' python
-# scripts, as pointed out by
-# http://sources.redhat.com/automake/automake.html#Hard_002dCoded-Install-Paths
-# If you do [use $(pythondir) or $(pyexecdir)], then:
-#    * root users can install your package with the same --prefix as Python (you
-#      get the behavior of the previous attempt - eg /usr/lib/python-2.3/...)
-#    * non-root users can install your package too, they will have the extension
-#      module in a place that is not searched by Python but they can work around
-#      this using environment variables (and if you installed scripts that use
-#      this shared library, it's easy to tell Python were to look in the
-#      beginning of your script, so the script works in both cases).
-
-# Using pythondir_PYTHON for libtovid will install it to
-# ${prefix}/lib/python2.3/site-packages (for example)
-# and the pytovid suite (left as bin_SCRIPTS, so that they are installed as
-# executables and not byte-compiled like python_PYTHON would do) will need to be
-# told how to look for libtovid.
-
-AM_PATH_PYTHON(2.4)
-
-# Attempt to inform user that their pyton installation won't work
-#   with the default prefix (/usr/local)
-USER_PYTHON_PATH=$(python -c "import sys; print sys.path")
-PYTHON_LOCAL=$(echo $USER_PYTHON_PATH | awk -F ',' '{ for (f=1; f<=NF; f++) {print $f}; }' | grep local | tr -d "' ")
-
-if test -z $PYTHON_LOCAL && test x"$prefix" == "xNONE"; then
-    AC_MSG_ERROR([
-
-    ERROR:
-
-    It looks like your python installation doesn't look in /usr/local for
-    python modules. tovid installs a few modules on your system, and if
-    python can't find them, then tovid won't work!
-
-    Please try:  ./configure --prefix=/usr
-
-    to install tovid in a place where python will look for modules. Thanks!
-
-        -- http://tovid.wikia.com
-    ])
-fi
-
-
-# Check to see if this is a svn checkout and set version to revision number
-if test "$PACKAGE_VERSION" = "svn" && test -e bootstrap; then
-     VERSION="svn-r$(svn info bootstrap | grep Revision | awk '{print $2}')"
-fi
-
-AC_CONFIG_FILES([Makefile src/tovid-init])
-AC_OUTPUT
-
-# Enable symbolic links for automake
-AC_PROG_LN_S
-
-
-# ******************************************************************************
-# ******************************************************************************
-#
-# PRETTY SUMMARY
-#
-# ******************************************************************************
-# ******************************************************************************
-
-# Works for all distros
-INSTALL_COMMAND="su -c \"make install\""
-
-# but *buntu users are used to
-if $(cat /proc/version | grep -iq buntu); then
-    INSTALL_COMMAND="sudo make install"
-fi
-
-AC_MSG_NOTICE([
-
-
- You may now type '$INSTALL_COMMAND' to compile and install tovid.
-
-   (or you can try to 'make sense' of it all...)
- ])

tovid-0.33.tar.bz2/docs/clean Deleted

@@ -1,66 +0,0 @@
-#! /bin/sh
-
-CSS=`cat << 'EOF'
-<link rel="stylesheet" href="tovid_style.css" type="text\/css">
-EOF`
-
-ALTCSS=`cat << 'EOF'
-  <link rel="stylesheet" href="tovid_style.css" media="screen" type="text/css" title="Default">
-  <link rel="stylesheet" href="tovid_print.css" media="print" type="text/css">
-  <link rel="alternate stylesheet" href="tovid_print.css" media="screen" title="Printer-friendly">
-EOF`
-
-NAVMENU=`cat << 'EOF'
-  <ul id="navmenu">
-    <li><a href="toc.html">Site map</a></li>
-
-    <li><a href="http://sourceforge.net/projects/tovid">Get tovid</a></li>
-
-    <li class="menuparent">
-      <a href="#">Help</a>
-
-      <ul>
-        <li><a href="howto.html">howto</a></li>
-        <li><a href="faq.html">FAQ</a></li>
-        <li><a href="irc://irc.freenode.net/tovid">IRC channel</a></li>
-        <li><a href="http://www.createphpbb.com/phpbb/tovid.html">forum</a></li>
-        <li><a href="http://lists.sourceforge.net/lists/listinfo/tovid-users">user mailing list</a></li>
-      </ul>
-    </li>
-
-    <li class="menuparent">
-      <a href="manpages.html">Manpages</a>
-      <ul>
-        <li><a href="tovid.html">tovid</a></li>
-        <li><a href="idvid.html">idvid</a></li>
-        <li><a href="makemenu.html">makemenu</a></li>
-        <li><a href="makexml.html">makexml</a></li>
-        <li><a href="makedvd.html">makedvd</a></li>
-        <li><a href="postproc.html">postproc</a></li>
-        <li><a href="dvrequant.html">dvrequant</a></li>
-      </ul>
-    </li>
-
-    <li class="menuparent">
-      <a href="#">Language</a>
-      <ul>
-        <li><a href="fr/">Français</a></li>
-        <li><a href="es/">Español</a></li>
-      </ul>
-    </li>
-
-  </ul>
-EOF`
-
-# Replace css with altcss in all HTML files
-
-FILES="*.html"
-for FILE in $FILES; do
-    head -n 10 $FILE > $FILE.tmp
-    echo $"$ALTCSS" >> $FILE.tmp
-    cat $FILE | sed -n '12,/alink[^>]*\>/p' >> $FILE.tmp
-    echo $"$NAVMENU" >> $FILE.tmp
-    cat $FILE | sed -n '/div class="navheader"/,$p' >> $FILE.tmp
-    mv -v $FILE.tmp $FILE
-done
-

tovid-0.33.tar.bz2/docs/docmake Deleted

@@ -1,144 +0,0 @@
-#! /usr/bin/env python
-# -*- coding: utf-8 -*-
-
-"""Quick-and-dirty 'make' tool for building tovid documentation."""
-
-import os
-import sys
-import glob
-import libtovid
-from libtovid import gui
-# Get mypydoc
-import mypydoc
-
-# Directories are relative to the docmake script
-base_dir = os.path.dirname(sys.argv[0])
-
-# Directory containing .t2t doc sources
-source_dir = os.path.abspath(base_dir + '/src')
-# Directory to save output in
-dest_dir = os.path.abspath(base_dir + '/html')
-man_dir = os.path.abspath(base_dir + '/man')
-man_pages = ['todisc', 'tovid', 'idvid', 'makemenu', 'makedvd', \
-    'pymakexml', 'makexml', 'postproc', 'todisc']
-
-# Temporary directory to hold wikitext
-wiki_dir = os.path.abspath(base_dir + '/wiki')
-
-# Subdirectories of source_dir containing translations to build
-translation_subdirs = ['en', 'es']
-
-
-# Add full names of python modules to document with pydoc
-pydoc_modules = []
-mods = libtovid.__all__
-for mod in mods:
-    pydoc_modules.append('libtovid.%s' % mod)
-
-
-def newer(source, target):
-    """Return True if the source file is more recently modified than the
-    target; False otherwise."""
-    source_mod = os.path.getmtime(source)
-    if os.path.exists(target):
-        target_mod = os.path.getmtime(target)
-    else:
-        target_mod = 0
-
-    return source_mod > target_mod
-
-    
-def generate_t2t_tarballs():
-    """Create tar/gzip of all t2t sources in the html/download directory."""
-    print "Generating .tar.gz of all .t2t sources..."
-    for lang in translation_subdirs:
-        cmd = 'tar --exclude .svn -czvvf tovid_t2t_%s.tar.gz src/%s' % \
-                (lang, lang)
-        os.system(cmd)
-        print "Generated tovid_t2t_%s.tar.gz" % lang
-
-
-def generate_manpages():
-    for manpage in man_pages:
-        infile = '%s/en/%s.t2t' % (source_dir, manpage)
-        outfile = '%s/%s.1' % (man_dir, manpage)
-        if newer(infile, outfile):
-            generate_manpage(infile, outfile)
-        else:
-            print "Skipping %s" % outfile
-
-def generate_manpage(t2tfile, manfile):
-    print "Generating manual page from %s" % t2tfile
-    cmd = 'txt2tags -t man -i "%s" -o "%s"' % (t2tfile, manfile)
-    os.system(cmd)
-
-
-def generate_pydocs():
-    print "Generating HTML documentation of libtovid Python sources"
-    for mod in pydoc_modules:
-        print "Writing %s/pydocs/%s.html" % (dest_dir, mod)
-        htmlfile = open("%s/pydocs/%s.html" % (dest_dir, mod), 'w')
-        gen = mypydoc.HTMLGenerator()
-        html = gen.document(mod)
-        if html:
-            htmlfile.write(html)
-            htmlfile.close()
-        else:
-            print "Couldn't generate docs for %s" % mod
-        # Run tidy on HTML output
-        #os.popen2("tidy -utf8 -i -m %s" % htmlfile)
-
-
-def generate_html(t2tfile, htmlfile):
-    cmd = 'txt2tags -i %s -o %s' % (t2tfile, htmlfile)
-    cmd += ' --encoding iso-8859-1'
-    cmd += ' -t xhtml --css-sugar --toc --style=tovid_screen.css'
-    # Run txt2tags cmd, displaying its normal output
-    os.system(cmd)
-
-    # Run tidy on HTML output
-    #os.popen2("tidy -utf8 -i -m %s" % htmlfile)
-
-    
-def generate_all_html():
-    print "Generating HTML for all translations of documentation."
-    # Convert all language translations (.t2t sources) to HTML
-    for trans_dir in translation_subdirs:
-        print "Looking for .t2t sources in %s/%s" % (source_dir, trans_dir)
-        for t2tfile in glob.glob('%s/%s/*.t2t' % (source_dir, trans_dir)):
-            # Determine output path/filename
-            # (Strip .t2t from basename and put in dest_dir/trans_dir)
-            outfile = '%s/%s/%s.html' % \
-                    (dest_dir, trans_dir, os.path.basename(t2tfile)[:-4])
-            
-            # If the .t2t source is newer than the existing HTML target,
-            # recreate the HTML.
-            if newer(t2tfile, outfile):
-                print "Source file: %s is new. Regenerating %s" % \
-                    (t2tfile, outfile)
-                generate_html(t2tfile, outfile)
-            else:
-                print "Skipping file: %s" % t2tfile
-
-if __name__ == '__main__':
-
-    usage = "Usage: docmake [targets], where targets may be:\n"
-    usage += "manpages, pydocs, tarballs, or html (or any combination)\n"
-
-    print "tovid documentation maker"
-    if len(sys.argv) < 2:
-        print usage
-        sys.exit()
-    for arg in sys.argv[1:]:
-        if arg == 'manpages':
-            generate_manpages()
-        elif arg == 'pydocs':
-            generate_pydocs()
-        elif arg == 'tarballs':
-            generate_t2t_tarballs()
-        elif arg == 'html':
-            generate_all_html()
-        else:
-            print usage
-            print "Unknown argument: %s" % arg
-

tovid-0.33.tar.bz2/docs/html Deleted

tovid-0.33.tar.bz2/docs/html/favicon.ico Deleted

tovid-0.33.tar.bz2/docs/html/tovid_print.css Deleted

tovid-0.33.tar.bz2/docs/html/tovid_screen.css Deleted

@@ -1,197 +0,0 @@
-/* screen.css
- * CSS stylesheet definition for the tovid documentation
- * http://tovid.sourceforge.net/
- */
-
-/*
- * Body and link styles
- */
-body {
-  /*font-family: Arial, Helvetica, sans-serif;*/
-    font-family: sans-serif;
-    font-size: 15px;
-    color: #000;
-    background: white; /*url( "images/bg_film_white.jpg" ) 0 0 no-repeat fixed;*/
-    margin: 2em;
-    padding: 1em;
-}
-
-a { color: #44C; text-decoration: none; background: transparent; }
-a:hover {
-    background: #FFE;
-    border-width: 1px 0;
-    border-style: dotted;
-    border-color: #44C;
-}
-a:visited { color: #A4A; }
-
-.toc:before { content: 'Contents:' }
-.toc {
-    float: left;
-    padding: 0;
-    margin: 1em 3em 2em 1em;
-    font-family: Georgia, serif;
-    font-size: 16px;
-    font-weight: bold;
-}
-
-.toc a {
-    color: #653;
-    text-decoration: none;
-}
-
-
-h1 {
-    border-bottom: 3px solid grey;
-    padding: 0.5em 0;
-}
-
-h2 {
-    color: #000;
-    padding: 0.5em;
-    margin: 2em 0;
-    border-width: 1px;
-    border-style: solid;
-    border-color: #432;
-    clear: both;
-    text-shadow: #997 -0.2em 0.2em 0.2em;
-    background: #E7D8DB; /*url( "images/bg_film_negative.jpg" ) 0 0 no-repeat fixed;*/
-}
-
-h3 {
-    color: #383;
-    font-style: italic;
-    margin: 2em 0;
-    padding: 0.5em;
-    border-width: 1px 0 1px 0;
-    border-style: solid;
-    border-color: #8B8;
-    clear: left;
-    text-shadow: #CCB -0.3em 0.3em 0.2em;
-}
-
-pre
-{
-    padding: 1em;
-    margin: 2em;
-    background: #F8F8F8; /*url( "images/bg_film_sepia.jpg" ) 0 0 no-repeat fixed;*/
-    border: 1px dotted grey;
-}
-/* Indentation */
-body p   { margin-left: 2em }
-body pre { margin-left: 2em }
-body ul  { margin-left: 4em }
-body dl  { margin-left: 4em }
-.toc ul  { margin-left: 1em }
-
-dl { clear: both; }
-dt { font-weight: bold; }
-
-/* mypydoc styles */
-dl.class > dd {
-    margin: 1em 1em 1em 2em;
-    padding: 2em;
-    border-top: 3px solid #84A;
-    border-left: 3px solid #84A;
-}
-dl.class > dt {
-    margin-top: 2em;
-    padding: 0;
-    font-size: 140%;
-    font-style: italic;
-    color: #418;
-}
-
-pre.doc {
-    background: transparent;
-    border: none;
-    margin: 0;
-    color: #448;
-}
-pre.source {
-    background: white;
-    border: 2px dotted #080;
-    margin: 0;
-}
-
-code.args {
-    color: #A00;
-}
-
-/*
-dl.class dd {
-    margin: 1em 2em;
-    padding: 0;
-}
-*/
-
-/* CSS pop-out navigation menu
- * Adapted from Nick Rigby's:
- * http://www.nickrigby.com/article/25/drop-down-menus-horizontal-style-pt-3 
- */
-ul#navmenu {
-    margin: 1em;
-    padding: 0;
-    width: 9em;
-    font-family: Verdana, sans-serif;
-    text-shadow: #999 0.1em 0.1em 0.1em;
-    float: right;
-}
-
-ul#navmenu ul {
-    width: 9em;
-    margin: 0;
-    padding: 0;
-	position: absolute;
-    right: 9em;
-    top: 0;
-	display: none;
-}
-
-ul#navmenu li {
-	position: relative;
-    list-style: none;
-}
-
-ul#navmenu li a {
-	display: block;
-	text-decoration: none;
-    background: #E0E9C5;
-	color: black;
-	padding: 0.5em;
-	border: 1px solid black;
-    margin: 0;
-    text-align: right;
-}
-
-/* Fix IE. Hide from IE Mac \*/
-* html ul#navmenu li { float: left; height: 1%; }
-* html ul#navmenu li a { height: 1%; }
-/* End */
-
-ul#navmenu li ul li a { padding: 0.5em; } /* Sub Menu Styles */
-
-ul#navmenu li:hover ul ul,
-ul#navmenu li:hover ul ul ul,
-ul#navmenu li.over ul ul,
-ul#navmenu li.over ul ul ul { display: none; } /* Hide sub-menus initially */
-
-ul#navmenu li:hover ul,
-ul#navmenu li li:hover ul,
-ul#navmenu li li li:hover ul,
-ul#navmenu li.over ul,
-ul#navmenu li li.over ul,
-ul#navmenu li li li.over ul {
-    display: block;
-}
-
-ul#navmenu li.menuparent>a:before { content: '<- '; }
-
-ul#navmenu li.menuparent:hover,
-ul#navmenu li.over {
-}
-ul#navmenu li a:hover {
-    background: #F8F8F7; /*url( "images/bg_film_sepia.jpg" ) 0 0 no-repeat fixed;
-    color: #36A;
-    border-color: #753;
-}

tovid-0.33.tar.bz2/docs/mypydoc.py Deleted

@@ -1,291 +0,0 @@
-#! /usr/bin/env python
-# -*- coding: Latin-1 -*-
-
-
-"""Reimplementation of the pydoc HTML generator.
-
-Notes:
-
-__author__
-__date__
-__version__
-__credits__
-
-__class__
-__name__
-__all__
-__path__
-__bases__
-__module__
-
-
-======================
-try:
-    foo = object.__attrib__
-except AttributeError:
-    foo = None
-======================
-
-def describe(thing):
-    # Most return thing.__name__
-    inspect.ismodule(thing)
-    inspect.isbuiltin(thing)
-    inspect.isclass(thing)
-    inspect.isfunction(thing)
-    inspect.ismethod(thing)
-    type(thing) is types.InstanceType
-
-
-# Return a dictionary of member/value pairs
-# routines in thing
-for key, value in inspect.getmembers(thing, inspect.isroutine)
-# classes in thing
-for key, value in inspect.getmembers(thing, inspect.isclass)
-# etc.
-
-"""
-
-import datetime
-import re, sys, inspect, __builtin__
-from string import join, split, lower
-
-def trim(text):
-    """Strip leading indentation from a block of text.
-
-    Borrowed from http://www.python.org/peps/pep-0257.html 
-    """
-    if not text:
-        return ''
-    # Split text into lines, converting tabs to spaces
-    lines = text.expandtabs().splitlines()
-    # Determine minimum indentation (except first line)
-    indent = sys.maxint
-    for line in lines[1:]:
-        stripped = line.lstrip()
-        if stripped:
-            indent = min(indent, len(line) - len(stripped))
-    # Remove indentation (first line is special)
-    trimmed = [lines[0].strip()]
-    if indent < sys.maxint:
-        for line in lines[1:]:
-            # Append line, minus indentation
-            trimmed.append(line[indent:].rstrip())
-    # Strip leading blank lines
-    while trimmed and not trimmed[0]:
-        trimmed.pop(0)
-    # Strip trailing blank lines
-    while trimmed and not trimmed[-1]:
-        trimmed.pop()
-    # Return a string, rejoined with newlines
-    return '\n'.join(trimmed)
-    
-class ErrorDuringImport(Exception):
-    """Errors that occurred while trying to import something to document it."""
-    def __init__(self, filename, (exc, value, tb)):
-        self.filename = filename
-        self.exc = exc
-        self.value = value
-        self.tb = tb
-
-    def __str__(self):
-        exc = self.exc
-        if type(exc) is types.ClassType:
-            exc = exc.__name__
-        return 'problem in %s - %s: %s' % (self.filename, exc, self.value)
-
-# safeimport, locate and resolve Stolen from pydoc.py
-# (Clean up and rewrite later)
-def safeimport(path, forceload=0, cache={}):
-    """Import a module; handle errors; return None if the module isn't found.
-
-    If the module *is* found but an exception occurs, it's wrapped in an
-    ErrorDuringImport exception and reraised.  Unlike __import__, if a
-    package path is specified, the module at the end of the path is returned,
-    not the package at the beginning.  If the optional 'forceload' argument
-    is 1, we reload the module from disk (unless it's a dynamic extension)."""
-    if forceload and path in sys.modules:
-        # This is the only way to be sure.  Checking the mtime of the file
-        # isn't good enough (e.g. what if the module contains a class that
-        # inherits from another module that has changed?).
-        if path not in sys.builtin_module_names:
-            # Python never loads a dynamic extension a second time from the
-            # same path, even if the file is changed or missing.  Deleting
-            # the entry in sys.modules doesn't help for dynamic extensions,
-            # so we're not even going to try to keep them up to date.
-            info = inspect.getmoduleinfo(sys.modules[path].__file__)
-            if info[3] != imp.C_EXTENSION:
-                cache[path] = sys.modules[path] # prevent module from clearing
-                del sys.modules[path]
-    try:
-        print "Trying to import module: %s" % path
-        module = __import__(path)
-    except:
-        # Did the error occur before or after the module was found?
-        (exc, value, tb) = info = sys.exc_info()
-        if path in sys.modules:
-            # An error occured while executing the imported module.
-            raise ErrorDuringImport(sys.modules[path].__file__, info)
-        elif exc is SyntaxError:
-            # A SyntaxError occurred before we could execute the module.
-            raise ErrorDuringImport(value.filename, info)
-        elif exc is ImportError and \
-             split(lower(str(value)))[:2] == ['no', 'module']:
-            # The module was not found.
-            return None
-        else:
-            # Some other error occurred during the importing process.
-            raise ErrorDuringImport(path, sys.exc_info())
-    for part in split(path, '.')[1:]:
-        try: module = getattr(module, part)
-        except AttributeError: return None
-    return module
-
-def locate(path, forceload=0):
-    """Locate an object by name or dotted path, importing as necessary."""
-    parts = [part for part in split(path, '.') if part]
-    module, n = None, 0
-    while n < len(parts):
-        nextmodule = safeimport(join(parts[:n+1], '.'), forceload)
-        if nextmodule: module, n = nextmodule, n + 1
-        else: break
-    if module:
-        object = module
-        for part in parts[n:]:
-            try: object = getattr(object, part)
-            except AttributeError: return None
-        return object
-    else:
-        if hasattr(__builtin__, path):
-            return getattr(__builtin__, path)
-
-def resolve(thing, forceload=0):
-    """Given an object or a path to an object, get the object and its name."""
-    if isinstance(thing, str):
-        object = locate(thing, forceload)
-        if not object:
-            raise ImportError, 'no Python documentation found for %r' % thing
-        return object, thing
-    else:
-        return thing, getattr(thing, '__name__', None)
-
-
-class HTMLGenerator:
-
-    def __init__(self):
-        self.html = ''
-
-    def emit(self, text):
-        #if text: print text
-        if text: self.html += text
-
-    def emit_pre(self, text, css_class='doc', linenum=False):
-        if not text: return
-        # Replace '<' with '&lt;'
-        text = text.replace('<', '&lt;')
-        text = trim(text)
-        if linenum:
-            lines = text.split('\n')
-            self.emit('''<pre class="%s">''' % css_class)
-            lineno = 1
-            for line in lines:
-                strlineno = "%s" % lineno
-                self.emit('''%s:   %s\n''' % (strlineno.rjust(4), line))
-                lineno += 1
-            self.emit('''</pre>''')
-        else:
-            self.emit('''<pre class="%s">%s</pre>''' % \
-                (css_class, text))
-
-    # Generate docs for given name

tovid-0.33.tar.bz2/icons/tovid.gif Deleted

tovid-0.33.tar.bz2/install-sh Deleted

@@ -1,323 +0,0 @@
-#!/bin/sh
-# install - install a program, script, or datafile
-
-scriptversion=2005-02-02.21
-
-# This originates from X11R5 (mit/util/scripts/install.sh), which was
-# later released in X11R6 (xc/config/util/install.sh) with the
-# following copyright and license.
-#
-# Copyright (C) 1994 X Consortium
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the X Consortium shall not
-# be used in advertising or otherwise to promote the sale, use or other deal-
-# ings in this Software without prior written authorization from the X Consor-
-# tium.
-#
-#
-# FSF changes to this file are in the public domain.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-chmodcmd="$chmodprog 0755"
-chowncmd=
-chgrpcmd=
-stripcmd=
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=
-dst=
-dir_arg=
-dstarg=
-no_target_directory=
-
-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-   or: $0 [OPTION]... SRCFILES... DIRECTORY
-   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-   or: $0 [OPTION]... -d DIRECTORIES...
-
-In the 1st form, copy SRCFILE to DSTFILE.
-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-In the 4th, create DIRECTORIES.
-
-Options:
--c         (ignored)
--d         create directories instead of installing files.
--g GROUP   $chgrpprog installed files to GROUP.
--m MODE    $chmodprog installed files to MODE.
--o USER    $chownprog installed files to USER.
--s         $stripprog installed files.
--t DIRECTORY  install into DIRECTORY.
--T         report an error if DSTFILE is a directory.
---help     display this help and exit.
---version  display version info and exit.
-
-Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
-"
-
-while test -n "$1"; do
-  case $1 in
-    -c) shift
-        continue;;
-
-    -d) dir_arg=true
-        shift
-        continue;;
-
-    -g) chgrpcmd="$chgrpprog $2"
-        shift
-        shift
-        continue;;
-
-    --help) echo "$usage"; exit $?;;
-
-    -m) chmodcmd="$chmodprog $2"
-        shift
-        shift
-        continue;;
-
-    -o) chowncmd="$chownprog $2"
-        shift
-        shift
-        continue;;
-
-    -s) stripcmd=$stripprog
-        shift
-        continue;;
-
-    -t) dstarg=$2
-	shift
-	shift
-	continue;;
-
-    -T) no_target_directory=true
-	shift
-	continue;;
-
-    --version) echo "$0 $scriptversion"; exit $?;;
-
-    *)  # When -d is used, all remaining arguments are directories to create.
-	# When -t is used, the destination is already specified.
-	test -n "$dir_arg$dstarg" && break
-        # Otherwise, the last argument is the destination.  Remove it from $@.
-	for arg
-	do
-          if test -n "$dstarg"; then
-	    # $@ is not empty: it contains at least $arg.
-	    set fnord "$@" "$dstarg"
-	    shift # fnord
-	  fi
-	  shift # arg
-	  dstarg=$arg
-	done
-	break;;
-  esac
-done
-
-if test -z "$1"; then
-  if test -z "$dir_arg"; then
-    echo "$0: no input file specified." >&2
-    exit 1
-  fi
-  # It's OK to call `install-sh -d' without argument.
-  # This can happen when creating conditional directories.
-  exit 0
-fi
-
-for src
-do
-  # Protect names starting with `-'.
-  case $src in
-    -*) src=./$src ;;
-  esac
-
-  if test -n "$dir_arg"; then
-    dst=$src
-    src=
-
-    if test -d "$dst"; then
-      mkdircmd=:
-      chmodcmd=
-    else
-      mkdircmd=$mkdirprog
-    fi
-  else
-    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-    # might cause directories to be created, which would be especially bad
-    # if $src (and thus $dsttmp) contains '*'.
-    if test ! -f "$src" && test ! -d "$src"; then
-      echo "$0: $src does not exist." >&2
-      exit 1
-    fi
-
-    if test -z "$dstarg"; then
-      echo "$0: no destination specified." >&2
-      exit 1
-    fi
-
-    dst=$dstarg
-    # Protect names starting with `-'.

tovid-0.33.tar.bz2/missing Deleted

@@ -1,357 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-
-scriptversion=2005-02-08.22
-
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
-#   Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-run=:
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
-
-msg="missing on your system"
-
-case "$1" in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
-
-Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
-
-Send bug reports to <bug-automake@gnu.org>."
-    exit $?
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
-    exit $?
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-esac
-
-# Now exit if we have it, but it failed.  Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).
-case "$1" in
-  lex|yacc)
-    # Not GNU programs, they don't have --version.
-    ;;
-
-  tar)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
-
-  *)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
-       # $TOOL exists and not knowing $TOOL uses missing.
-       exit 1
-    fi
-    ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-  aclocal*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER($[^)]*$).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case "$f" in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n 's/.*--output[ =]*$[^ ]*$.*/\1/p'`
-    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*$[^ ]*$.*/\1/p'`
-    if test -f "$file"; then
-	touch $file
-    else

tovid-0.33.tar.bz2/py-compile Deleted

@@ -1,146 +0,0 @@
-#!/bin/sh
-# py-compile - Compile a Python program
-
-scriptversion=2005-05-14.22
-
-# Copyright (C) 2000, 2001, 2003, 2004, 2005  Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-if [ -z "$PYTHON" ]; then
-  PYTHON=python
-fi
-
-basedir=
-destdir=
-files=
-while test $# -ne 0; do
-  case "$1" in
-    --basedir)
-      basedir=$2
-      if test -z "$basedir"; then
-        echo "$0: Missing argument to --basedir." 1>&2
-        exit 1
-      fi
-      shift
-      ;;
-    --destdir)
-      destdir=$2
-      if test -z "$destdir"; then
-        echo "$0: Missing argument to --destdir." 1>&2
-        exit 1
-      fi
-      shift
-      ;;
-    -h|--h*)
-      cat <<\EOF
-Usage: py-compile [--help] [--version] [--basedir DIR] [--destdir DIR] FILES..."
-
-Byte compile some python scripts FILES.  Use --destdir to specify any
-leading directory path to the FILES that you don't want to include in the
-byte compiled file.  Specify --basedir for any additional path information you
-do want to be shown in the byte compiled file.
-
-Example:
-  py-compile --destdir /tmp/pkg-root --basedir /usr/share/test test.py test2.py
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-      exit $?
-      ;;
-    -v|--v*)
-      echo "py-compile $scriptversion"
-      exit $?
-      ;;
-    *)
-      files="$files $1"
-      ;;
-  esac
-  shift
-done
-
-if test -z "$files"; then
-    echo "$0: No files given.  Try \`$0 --help' for more information." 1>&2
-    exit 1
-fi
-
-# if basedir was given, then it should be prepended to filenames before
-# byte compilation.
-if [ -z "$basedir" ]; then
-    pathtrans="path = file"
-else
-    pathtrans="path = os.path.join('$basedir', file)"
-fi
-
-# if destdir was given, then it needs to be prepended to the filename to
-# byte compile but not go into the compiled file.
-if [ -z "$destdir" ]; then
-    filetrans="filepath = path"
-else
-    filetrans="filepath = os.path.normpath('$destdir' + os.sep + path)"
-fi
-
-$PYTHON -c "
-import sys, os, string, py_compile
-
-files = '''$files'''
-
-print 'Byte-compiling python modules...'
-for file in string.split(files):
-    $pathtrans
-    $filetrans
-    if not os.path.exists(filepath) or not (len(filepath) >= 3
-                                            and filepath[-3:] == '.py'):
-	continue
-    print file,
-    sys.stdout.flush()
-    py_compile.compile(filepath, filepath + 'c', path)
-print" || exit $?
-
-# this will fail for python < 1.5, but that doesn't matter ...
-$PYTHON -O -c "
-import sys, os, string, py_compile
-
-files = '''$files'''
-print 'Byte-compiling python modules (optimized versions) ...'
-for file in string.split(files):
-    $pathtrans
-    $filetrans
-    if not os.path.exists(filepath) or not (len(filepath) >= 3
-                                            and filepath[-3:] == '.py'):
-	continue
-    print file,
-    sys.stdout.flush()
-    py_compile.compile(filepath, filepath + 'o', path)
-print" 2>/dev/null || :
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:

tovid-0.33.tar.bz2/src/.tovid.swp Deleted

tovid-0.33.tar.bz2/INSTALL -> tovid-0.34.tar.bz2/INSTALL Changed

tovid-0.33.tar.bz2/PKG-INFO -> tovid-0.34.tar.bz2/PKG-INFO Changed

tovid-0.33.tar.bz2/README -> tovid-0.34.tar.bz2/README Changed

tovid-0.33.tar.bz2/docs/man/tovid.1 -> tovid-0.34.tar.bz2/docs/man/tovid.1 Changed

@@ -36,6 +36,9 @@
 \fBgui\fR
 Start the tovid GUI (was \fBtodiscgui\fR. See \fBCommand:gui\fR)
 .TP
+\fBtitlesets\fR
+A tovid GUI wizard for multiple titlesets. (new: See \fBCommand:titlesets\fR)
+.TP
 \fBdisc\fR
 Create a DVD with menus (was \fBtodisc\fR. See \fBCommand:disc\fR)
 .TP
@@ -59,6 +62,11 @@
 .TP
 \fBpostproc\fR
 Post\-process an MPEG video file (was \fBpostproc\fR. See \fBCommand:postproc\fR)
+.TP
+\fBchapters\fR
+A GUI using mplayer for setting chapter points.  It will return a string of
+chapter points in a format recognized by 'tovid disc' (todisc) or
+by 'tovid gui', for the  \fB\-chapters\fR option.
 
 .P
 The \fIOPTIONS\fR differ for each command; run \fBtovid <command>\fR with no
@@ -73,9 +81,9 @@
 Defines working directory for all scripts.
 In addition you can define the output directory for makempg here.
 .TP
-\fB~/.tovid/tovid.config\fR
-Includes command\-line options that should always be passed to
-makempg.
+\fB~/.tovid/tovid.ini\fR
+Includes command\-line options that should be passed to the various
+\fBtovid\fR sub\-commands.
 
 Edit these files if you wish to change your configuration.
 
@@ -89,9 +97,16 @@
 the easiest way to start creating DVDs with tovid. At this time, there are no
 additional command\-line options; the GUI controls take care of everything,
 and all help is integrated in the form of tooltips.  You can also see
-**Command:disc ** for more detail about the options.  Note: one limitation of
-the gui at present is that it does not do multiple titlesets (though it will do
-chapter menus).  Use the \fBtovid disc\fR command (below) for titlesets.
+**Command:disc ** for more detail about the options.  Note: if you wish to
+make multiple titlesets on the same DVD use 'tovid titlesets', which is a wizard
+that uses the the tovid GUI.  Chapter submenus can be made with 'tovid gui'
+however.
+
+.SH Command:titlesets
+.P
+\fBtovid titlesets\fR will assist in making a DVD with multiple titlesets.  It can
+be started without any options, or you can feed it the path to a saved titleset
+script as an option.
 
 .SH Command:disc
 .P
@@ -323,7 +338,7 @@
     \fB\-interlaced\fR, \fB\-interlaced_bf\fR, \fB\-type\fR, \fB\-fit\fR, \fB\-discsize\fR,
     \fB\-parallel\fR, \fB\-mkvsub\fR, \fB\-autosubs\fR, \fB\-subtitles\fR, \fB\-update\fR, \e
     \fB\-mplayeropts\fR, \fB\-audiotrack\fR, \fB\-downmix\fR, \fB\-ffmpeg\fR, \fB\-nofifo\fR,
-    \fB\-from\-gui\fR, \fB\-slice\fR, \fB\-async\fR, \fB\-quiet\fR,
+    \fB\-from\-gui\fR, \fB\-slice\fR, \fB\-quiet\fR,
     \fB\-fake\fR, \fB\-keepfiles\fR
 
 .SS Options
@@ -359,9 +374,9 @@
 This is a different arrangement of images for the menu: small thumbnails
 go at left (and right) side of screen, with a larger image in the centre.
 Maximum of 10 videos.  If the provided argument is a video file, the
-central thumb will be animated.  Pick a file of correct aspect ratio:
-i.e. it should still look good when resized to 720x480 (PAL 720x576),
-then resized to proper aspect ratio.
+central thumb will be animated. Only 4:3 or 16:9 videos and images are
+accepted for the showcase file: if not one of these todisc will assume it
+is the same ratio as the videos in the titleset.
 .TP
 \fB\-textmenu\fR, \fB\-text\-menu\fR NUM
 If used without an argument, create a textmenu out of the supplied titles
@@ -374,16 +389,17 @@
 the menu will be static.
 .TP
 \fB\-quick\-menu\fR
-(Note: unfortunately ffmpeg's 'vhooks' have been removed, so this
-option may not be available for you depending on your ffmpeg version)
-This will make a very quick  menu by using ffmpeg instead of imagemagick.
+If you are using ffmpeg 0.8 or newer you can use this option.  This will
+make a very quick  menu by using ffmpeg instead of imagemagick.
 There are two choices: you can either use '\-showcase IMAGE|VIDEO' or
 '\-background VIDEO'.  There are no fancy effects like \fB\-wave\fR
 or \fB\-rotate\fR available for it, but it is extremely fast.  It will be a
 text\-menu style of menu, with no video thumbs, and a central showcase
 IMAGE(static) | VIDEO(animated).
-( see \fB\-bg\-color\fR if you are not using a \fB\-background\fR and want to
+(i) see \fB\-bg\-color\fR if you are not using a \fB\-background\fR and want to
 change the default black )
+(ii) Note: todisc will still work with vhooks if you have an old ffmpeg with
+vhooks compiled in.
 
 Specifying the IMAGE|VIDEO argument to \fB\-showcase\fR is mandatory for this
 style of menu, unless used in conjunction with \fB\-switched\-menus\fR
@@ -400,31 +416,34 @@
 \fB\-quick\-menu\fR
 
 .TP
-\fB\-bg\-color\fR | \fB\-bg\-colour\fR
+\fB\-bg\-color\fR, \fB\-bg\-colour\fR
 The color to use for the menu background. (default: ntsc\-safe black)
 Note: use a color a great deal darker than you want, as it appears quite
 a bit lighter in the video version.  You can use hexadecimal ('#ffac5f')
 or named colors notation.
 .TP
-\fB\-submenu\-bg\-color\fR | \fB\-submenu\-bg\-colour\fR
+\fB\-submenu\-bg\-color\fR, \fB\-submenu\-bg\-colour\fR
 The color to use as background for the  submenu(s).
 (default: ntsc\-safe black)  See \fB\-bg\-color\fR
 .TP
-\fB\-use\-makemenu\fR
-This will use \fBtovid menu\fR to create a menu with the provided titles.
-.TP
 \fB\-static\fR
-Main menu will just be static thumbs (not animated) (default: animated)
+Main menu will consist of static thumbnail links. (default: animated)
+If you use a video for \-showcase or \-background then it will still be
+a 'moving' menu, in spite of the static buttons.  This option also does
+double duty for the \fB\-switched\-menus\fR option, and will create static
+"switched" images.
+See also \fB\-switched\-menu\fR
 .TP
 \fB\-background\fR IMAGE|VIDEO
 Menu background.  This can be a image file or an video file.  If it is a
 video file the background will be animated.  Pick a file of correct aspect
-ratio: i.e. it should still look good when resized to 720x480 (PAL 720x576)
+ratio: i.e. it should still look good when resized to 4:3 aspect ratio.
+It will be resized to fill the entire background.
 .TP
 \fB\-submenu\-background\fR IMAGE
 Submenu background.  This can be only be an image file.  Pick a file of
 correct aspect ratio: i.e. it should still look good when resized to
-720x480 (PAL 720x576)
+4:3 aspect ratio.  It will be resized to fill the entire background.
 .TP
 \fB\-menu\-title\fR
 Title for the root menu \- may be longer than thumbnail labels
@@ -498,7 +517,7 @@
 default.  \fBHint\fR: use \fB\-showcase\fR IMAGE/VIDEO to create a fancier
 VMGM menu.
 .TP
-\fB\-no\-vmgm\-menu\fR | \fB\-no\-vmgm\fR
+\fB\-no\-vmgm\-menu\fR, \fB\-no\-vmgm\fR
 This will skip the creation of a VMGM ( root menu ) for titlesets. The DVD
 will start with the first titleset.  You can not use this option unless also
 using \fB\-quick\-nav\fR as you would not have a way to get to other titlesets.
@@ -519,6 +538,9 @@
 process can be greatly sped up by using \fB\-quick\-menu\fR in conjunction with
 this, though you will lose fancy options like \fB\-rotate\fR and \fB\-wave\fR.
 
+Note that if you want to just have a static rather than an 'animated'
+image, add \fB\-static\fR to the command line.
+
 Example for using with \fB\-quick\-menu\fR:
 .nf
       -switched-menus -quick-menu
@@ -648,7 +670,7 @@
 without using an  argument is 12.  See also \fB\-slide\-frame\-color\fR
 
 .TP
-\fB\-slide\-frame\-color\fR | \fB\-slide\-frame\-colour\fR
+\fB\-slide\-frame\-color\fR, \fB\-slide\-frame\-colour\fR
 The color of the slide frame if passing \fB\-slide\-frame\fR.  The default if
 you don't use this option is a color\-safe white: rgb(235,235,235).
 
@@ -659,13 +681,15 @@
 from each slideshow in the menu.  The thumb for each slideshow button will
 be static.  If you used with a mixed menu of videos and slideshows, then
 the video thumbs WILL be animated, so you may wish to use \-static or
-\-textmenu with the option in that case.
+\-textmenu with the option in that case.  If you want to use the
+**\-switched\-menus option with a mixed menu leave this option out. 
 
 .TP
 \fB\-background\-slideshow\fR, \fB\-bg\-slideshow\fR
 If doing multiple slideshows or mixed videos and slideshow(s), then use
 the animated slideshow as a background video.  See \fB\-showcase\-slideshow\fR
 for additional details.
+
 .TP
 \fB\-no\-confirm\-backup\fR
 Slideshows are an experimental (but well tested) feature.  Todisc is
@@ -673,6 +697,7 @@
 and backup your images, as you would with any beta software.  Todisc
 will prompt you to backup your files normally.  If you have already backed
 up your images, use this option to disable the prompt.
+
 .TP
 \fB\-use\-dvd\-slideshow\fR CONFIG (FILE)
 If you pass this option without an argument, tovid will use the
@@ -777,7 +802,10 @@
 chapters.  Each title must be quoted, and the number of titles given
 must equal the total number of chapters for all videos.  In other words
 if you use \-chapters 4 6 8 , you must give 18 chapter titles, in the same
-order that the videos were passed in.

tovid-0.34.tar.bz2/docs/sphinx Added

tovid-0.34.tar.bz2/docs/sphinx/Makefile Added

@@ -0,0 +1,90 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+PAPER         =
+BUILDDIR      = _build
+
+# Internal variables.
+PAPEROPT_a4     = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+
+.PHONY: help clean html dirhtml pickle json htmlhelp qthelp latex changes linkcheck doctest
+
+help:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  html      to make standalone HTML files"
+	@echo "  dirhtml   to make HTML files named index.html in directories"
+	@echo "  pickle    to make pickle files"
+	@echo "  json      to make JSON files"
+	@echo "  htmlhelp  to make HTML files and a HTML help project"
+	@echo "  qthelp    to make HTML files and a qthelp project"
+	@echo "  latex     to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+	@echo "  changes   to make an overview of all changed/added/deprecated items"
+	@echo "  linkcheck to check all external links for integrity"
+	@echo "  doctest   to run all doctests embedded in the documentation (if enabled)"
+
+clean:
+	-rm -rf $(BUILDDIR)/*
+
+html:
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+dirhtml:
+	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+pickle:
+	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+	@echo
+	@echo "Build finished; now you can process the pickle files."
+
+json:
+	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+	@echo
+	@echo "Build finished; now you can process the JSON files."
+
+htmlhelp:
+	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+	@echo
+	@echo "Build finished; now you can run HTML Help Workshop with the" \
+	      ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+qthelp:
+	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+	@echo
+	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
+	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/tovid.qhcp"
+	@echo "To view the help file:"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/tovid.qhc"
+
+latex:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo
+	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+	@echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \
+	      "run these through (pdf)latex."
+
+changes:
+	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+	@echo
+	@echo "The overview file is in $(BUILDDIR)/changes."
+
+linkcheck:
+	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+	@echo
+	@echo "Link check complete; look for any errors in the above output " \
+	      "or in $(BUILDDIR)/linkcheck/output.txt."
+
+doctest:
+	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+	@echo "Testing of doctests in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/doctest/output.txt."
+

tovid-0.34.tar.bz2/docs/sphinx/README Added

tovid-0.34.tar.bz2/docs/sphinx/conf.py Added

@@ -0,0 +1,213 @@
+# -*- coding: utf-8 -*-
+#
+# tovid documentation build configuration file, created by
+# sphinx-quickstart on Thu May 27 11:53:17 2010.
+#
+# This file is execfile()d with the current directory set to its containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+import sys, os
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#sys.path.append(os.path.abspath('.'))
+# Look in the libtovid source directory before anything else
+# (to avoid having to install libtovid with every doc change)
+sys.path.insert(0, os.path.abspath('../../'))
+
+# -- General configuration -----------------------------------------------------
+
+# Add any Sphinx extension module names here, as strings. They can be extensions
+# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+extensions = [
+    'sphinx.ext.autodoc',
+    'sphinx.ext.doctest',
+    #'sphinx.ext.viewcode',
+]
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix of source filenames.
+source_suffix = '.rst'
+
+# The encoding of source files.
+#source_encoding = 'utf-8'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = u'tovid'
+copyright = u'2010, Eric Pierce'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = '0.33'
+# The full version, including alpha/beta/rc tags.
+release = '0.33'
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#today = ''
+# Else, today_fmt is used as the format for a strftime call.
+#today_fmt = '%B %d, %Y'
+
+# List of documents that shouldn't be included in the build.
+#unused_docs = []
+
+# List of directories, relative to source directory, that shouldn't be searched
+# for source files.
+exclude_trees = ['_build']
+
+# The reST default role (used for this markup: `text`) to use for all documents.
+#default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+add_module_names = False
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+#modindex_common_prefix = []
+
+
+# -- Options for HTML output ---------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  Major themes that come with
+# Sphinx are currently 'default' and 'sphinxdoc'.
+html_theme = 'sphinxdoc'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+#html_theme_options = {}
+
+# Add any paths that contain custom themes here, relative to this directory.
+#html_theme_path = []
+
+# The name for this set of Sphinx documents.  If None, it defaults to
+# "<project> v<release> documentation".
+#html_title = None
+
+# A shorter title for the navigation bar.  Default is the same as html_title.
+#html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#html_logo = None
+
+# The name of an image file (within the static path) to use as favicon of the
+# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#html_favicon = None
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+# using the given strftime format.
+#html_last_updated_fmt = '%b %d, %Y'
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#html_sidebars = {}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#html_additional_pages = {}
+
+# If false, no module index is generated.
+#html_use_modindex = True
+
+# If false, no index is generated.
+#html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+html_show_sourcelink = False
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it.  The value of this option must be the
+# base URL from which the finished HTML is served.
+#html_use_opensearch = ''
+
+# If nonempty, this is the file name suffix for HTML files (e.g. ".xhtml").
+#html_file_suffix = ''
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'toviddoc'
+
+
+# -- Options for LaTeX output --------------------------------------------------
+
+# The paper size ('letter' or 'a4').
+#latex_paper_size = 'letter'
+
+# The font size ('10pt', '11pt' or '12pt').
+#latex_font_size = '10pt'
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title, author, documentclass [howto/manual]).
+latex_documents = [
+  ('index', 'tovid.tex', u'tovid Documentation', u'Eric Pierce', 'manual'),
+]
+
+man_pages = [
+  ('man/tovid', 'tovid', u'Make DVDs from video files', u'Eric Pierce', '1'),
+]
+
+# The name of an image file (relative to this directory) to place at the top of
+# the title page.
+#latex_logo = None
+
+# For "manual" documents, if this is true, then toplevel headings are parts,
+# not chapters.
+#latex_use_parts = False
+
+# Additional stuff for the LaTeX preamble.
+#latex_preamble = ''
+

tovid-0.34.tar.bz2/docs/sphinx/index.rst Added

tovid-0.34.tar.bz2/docs/sphinx/libtovid Added

tovid-0.34.tar.bz2/docs/sphinx/libtovid/author.rst Added

tovid-0.34.tar.bz2/docs/sphinx/libtovid/backend.rst Added

tovid-0.34.tar.bz2/docs/sphinx/libtovid/cli.rst Added

tovid-0.34.tar.bz2/docs/sphinx/libtovid/deps.rst Added

tovid-0.34.tar.bz2/docs/sphinx/libtovid/encode.rst Added

tovid-0.34.tar.bz2/docs/sphinx/libtovid/index.rst Added

tovid-0.34.tar.bz2/docs/sphinx/libtovid/media.rst Added

tovid-0.34.tar.bz2/docs/sphinx/libtovid/metagui Added

tovid-0.34.tar.bz2/docs/sphinx/libtovid/metagui/control.rst Added

tovid-0.34.tar.bz2/docs/sphinx/libtovid/metagui/gui.rst Added

tovid-0.34.tar.bz2/docs/sphinx/libtovid/metagui/index.rst Added

tovid-0.34.tar.bz2/docs/sphinx/libtovid/metagui/panel.rst Added

tovid-0.34.tar.bz2/docs/sphinx/libtovid/metagui/support.rst Added

tovid-0.34.tar.bz2/docs/sphinx/libtovid/metagui/variable.rst Added

tovid-0.34.tar.bz2/docs/sphinx/libtovid/metagui/widget.rst Added

tovid-0.34.tar.bz2/docs/sphinx/libtovid/odict.rst Added

tovid-0.34.tar.bz2/docs/sphinx/libtovid/opts.rst Added

tovid-0.34.tar.bz2/docs/sphinx/libtovid/render.rst Added

tovid-0.34.tar.bz2/docs/sphinx/libtovid/standard.rst Added

tovid-0.34.tar.bz2/docs/sphinx/libtovid/stats.rst Added

tovid-0.34.tar.bz2/docs/sphinx/libtovid/util.rst Added

tovid-0.34.tar.bz2/docs/sphinx/libtovid/xml.rst Added

tovid-0.34.tar.bz2/docs/sphinx/man Added

tovid-0.34.tar.bz2/docs/sphinx/man/tovid.rst Added

@@ -0,0 +1,2037 @@
+===============================================================
+tovid manual
+===============================================================
+
+
+Description
+===============================================================================
+
+**tovid** is a command-line tool for creating DVDs. It can encode your video
+files to DVD-compliant MPEG format, generate simple or complex DVD menus,
+author and burn a ready-to-watch DVD, with just a few shell commands. A
+graphical interface is also provided to make the process even easier.
+
+**NOTE**: As of tovid 0.32, this is the only manual page provided by tovid.
+There is now a single executable frontend to all functionality in the suite, so
+if you were expecting to find manpages for **todisc**, **idvid**, **makemenu**
+and their kin, they can all be found in the **tovid** manpage you are reading now.
+
+And yes, this makes for a pretty large manual page. If you are viewing this
+manpage from the command-line **man** utility, which normally pages through the
+**less** utility, you can skip to a section by searching with the **/** key,
+followed by a **^** to match the given section name. For example, to skip to
+the **mpg** command, type **/^Command:mpg**. See :manpage:`less(1)` for more on how
+to navigate.
+
+Usage
+===============================================================================
+
+::
+
+ tovid COMMAND [OPTIONS]
+
+Where *COMMAND* is one of the following:
+
+    gui
+        Start the tovid GUI (was **todiscgui**. See :ref:`command-gui`)
+    disc
+        Create a DVD with menus (was **todisc**. See :ref:`command-disc`)
+    mpg
+        Encode videos to MPEG format (was **tovid**. See :ref:`command-mpg`)
+    id
+        Identify one or more video files (was **idvid**. See :ref:`command-id`)
+    menu
+        Create an MPEG menu (was **makemenu**. See :ref:`command-menu`)
+    xml
+        Create (S)VCD or DVD .xml file (was **makexml**. See :ref:`command-xml`)
+    dvd
+        Author and/or burn a DVD (was **makedvd**. See :ref:`command-dvd`)
+    vcd
+        Author and/or burn a VCD (was **makevcd**. See :ref:`command-vcd`)
+    postproc
+        Post-process an MPEG video file (was **postproc**. See :ref:`command-postproc`)
+
+The *OPTIONS* differ for each command; run **tovid <command>** with no
+further arguments to get help on a command, and what options it expects.
+
+Configuration
+===============================================================================
+
+Two configuration files are created the first time you run tovid:
+
+``~/.tovid/preferences``
+    Defines working directory for all scripts.
+    In addition you can define the output directory for makempg here.
+``~/.tovid/tovid.config``
+    Includes command-line options that should always be passed to
+    makempg.
+
+    Edit these files if you wish to change your configuration.
+
+The following environment variables are also honoured:
+
+``TOVID_WORKING_DIR``
+    working directory for all scripts
+``TOVID_OUTPUT_DIR``
+    output directory for the makempg script
+
+
+.. _command-gui:
+
+Command:gui
+===============================================================================
+
+**tovid gui** starts the graphical user interface (GUI) for tovid. This is
+the easiest way to start creating DVDs with tovid. At this time, there are no
+additional command-line options; the GUI controls take care of everything,
+and all help is integrated in the form of tooltips.  You can also see
+:ref:`command-disc` for more detail about the options.  Note: one limitation of
+the gui at present is that it does not do multiple titlesets (though it will do
+chapter menus).  Use the **tovid disc** command (below) for titlesets.
+
+
+.. _command-disc:
+
+Command:disc
+===============================================================================
+
+**tovid disc** creates a DVD file-system with menus, from a list of multimedia
+video files and their titles.  As this is a low level script it is the easiest
+command line program for creating a DVD from start to finish, including
+automatically converting non-compliant videos and prompting to burn at
+completion.  It does animated menus, static thumbnail menus and text only
+menus.  In addition, it can do slideshows, using images as input, and combine
+slideshows with videos.  It supports sub-menus for chapter breaks, configurable
+menu style, animated backgrounds and transparency effects.
+
+Usage
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+::
+
+ tovid disc [OPTIONS] \
+   -files <file list> -titles <title list>
+   -out OUT_PREFIX
+
+For example::
+
+ tovid disc -files File1.mpg File2.mpg File3.mpg \
+   -titles "Episode 1" "Episode 2" "Episode 3" \
+   -out Season_one
+
+The number of **-files** and **-titles** must be equal, though if you do not
+include any titles **tovid disc** will use the basename of the included files
+as titles.  If you are doing a slideshow or multiple slideshows, use
+**-slides** rather than **-files** for passing in the images.  You may use
+-files and -slides more than once to create an ordering in a mixed
+slideshows/videos menu.  See :ref:`usage-slideshows` under usage below.
+
+If the input files are not mpeg, you will have the option to auto-encode them.
+
+
+Display arrangements
+-------------------------------------------------------------------------------
+
+At present there are 2 display arrangements or "templates":
+
+A. (Default)
+    Thumbs will be centred, and as large as space restraints allow.
+
+B. **-showcase** IMAGE|VIDEO
+    Produces an arrangement with small buttons on
+    the side and the showcase image/video in the centre.  If no IMAGE or VIDEO
+    argument is supplied, the central thumb will be omitted.
+
+    Note: **-textmenu**, **-quick-menu** and **-switched-menus** are all types
+    of showcase style menus.  See descriptions in the :ref:`menu-style` section.
+
+The **-titles** arguments should be double or single quoted, or have the spaces
+backslash-escaped. Special characters (like ", !, \*, &, ?) may need to be
+backslash-escaped.  To include a quoted string within a title, backslash-escape
+the quotes.  These titles are used for labelling thumbnails on the main menu,
+and for the submenu title for that video.  ( see also **-submenu-titles** )
+
+The **-showcase** styles can use longer titles than the default arrangement.
+With a showcase style, use: **-showcase-titles-align west** to give more space
+for the title, or use **-showcase-titles-align east** to allow titles of more
+than one line.
+
+The default style can only show about 16 characters (depending on the number
+of thumbs, and what **-titles-font** and **-titles-fontsize** is being used).
+If your titles are too long to fit in the label area, you may try using
+sub-menus, which can display longer titles, for example::
+
+ $ tovid disc -submenus \
+      -files file1.mpg file2.mpg ... \
+      -titles "Short 1" "Short 2" \
+      -submenu-titles "Long Title One" "Long Title Two" \
+      -out foo
+
+The **-align** argument will position both titles and thumbs either south,
+north east, west, southwest, northwest, southeast, northeast, subject to
+certain constraints of each arrangement.
+
+
+.. _usage-titlesets:
+
+Titlesets
+-------------------------------------------------------------------------------
+
+A word should be mentioned here about titlesets, which is really just a
+hierarchy of menus.  You need to use titlesets, for example, if you have videos
+of different resolutions, or otherwise want to arrange videos on separate menus.
+If you want to have titlesets you need to put all the options for each titleset
+menu you would like to have between **-titleset** and **-end-titleset** options.
+
+Additionally, for the main menu (the opening menu that will let you jump to
+each titleset), you need to put options between **-vmgm** and **-end-vmgm**.
+You do not use **-files** for the opening menu options (**-vmgm**), but you
+will need as many TITLES after **-titles** as you have menus.
+
+Any options outside the **-titleset** **-end-titleset** and **-vmgm**
+**-end-vmgm** areas will be general options applying to every titleset.
+If a general option is duplicated inside a **-titleset** or **-vmgm** area, the
+general option will be overridden.
+
+Note: you do not need titlesets for a single menu with chapter break menus, for
+that just use **-submenus** or **-ani-submenus**
+
+Example of using **tovid disc** with titlesets::

tovid-0.33.tar.bz2/docs/src/en/tovid.t2t -> tovid-0.34.tar.bz2/docs/src/en/tovid.t2t Changed

@@ -34,6 +34,8 @@
 
 : **gui**
     Start the tovid GUI (was **todiscgui**. See **Command:gui**)
+: **titlesets**
+    A tovid GUI wizard for multiple titlesets. (new: See **Command:titlesets**)
 : **disc**
     Create a DVD with menus (was **todisc**. See **Command:disc**)
 : **mpg**
@@ -50,7 +52,11 @@
     Author and/or burn a VCD (was **makevcd**. See **Command:vcd**)
 : **postproc**
     Post-process an MPEG video file (was **postproc**. See **Command:postproc**)
-
+: **chapters**
+    A GUI using mplayer for setting chapter points.  It will return a string of
+    chapter points in a format recognized by 'tovid disc' (todisc) or
+    by 'tovid gui', for the  **-chapters** option.
+    
 
 The //OPTIONS// differ for each command; run **tovid <command>** with no
 further arguments to get help on a command, and what options it expects.
@@ -64,9 +70,9 @@
 : **~/.tovid/preferences**
     Defines working directory for all scripts.
     In addition you can define the output directory for makempg here.
-: **~/.tovid/tovid.config**
-    Includes command-line options that should always be passed to
-    makempg.
+: **~/.tovid/tovid.ini**
+    Includes command-line options that should be passed to the various
+    **tovid** sub-commands.
 
 Edit these files if you wish to change your configuration.
 
@@ -81,9 +87,17 @@
 the easiest way to start creating DVDs with tovid. At this time, there are no
 additional command-line options; the GUI controls take care of everything,
 and all help is integrated in the form of tooltips.  You can also see
-**Command:disc ** for more detail about the options.  Note: one limitation of
-the gui at present is that it does not do multiple titlesets (though it will do
-chapter menus).  Use the **tovid disc** command (below) for titlesets.
+**Command:disc ** for more detail about the options.  Note: if you wish to
+make multiple titlesets on the same DVD use 'tovid titlesets', which is a wizard
+that uses the the tovid GUI.  Chapter submenus can be made with 'tovid gui'
+however.
+
+
+=Command:titlesets=
+
+**tovid titlesets** will assist in making a DVD with multiple titlesets.  It can
+be started without any options, or you can feed it the path to a saved titleset
+script as an option.
 
 
 =Command:disc=
@@ -287,7 +301,7 @@
     **-interlaced**, **-interlaced_bf**, **-type**, **-fit**, **-discsize**,
     **-parallel**, **-mkvsub**, **-autosubs**, **-subtitles**, **-update**, \
     **-mplayeropts**, **-audiotrack**, **-downmix**, **-ffmpeg**, **-nofifo**,
-    **-from-gui**, **-slice**, **-async**, **-quiet**,
+    **-from-gui**, **-slice**, **-quiet**,
     **-fake**, **-keepfiles**
 
 ==Options==
@@ -319,9 +333,9 @@
     This is a different arrangement of images for the menu: small thumbnails
     go at left (and right) side of screen, with a larger image in the centre.
     Maximum of 10 videos.  If the provided argument is a video file, the
-    central thumb will be animated.  Pick a file of correct aspect ratio:
-    i.e. it should still look good when resized to 720x480 (PAL 720x576),
-    then resized to proper aspect ratio.
+    central thumb will be animated. Only 4:3 or 16:9 videos and images are
+    accepted for the showcase file: if not one of these todisc will assume it
+    is the same ratio as the videos in the titleset.
 : **-textmenu**, **-text-menu** NUM
     If used without an argument, create a textmenu out of the supplied titles
     The optional argument specifies how many titles are in the 1st column,
@@ -332,16 +346,17 @@
     If no video files for either **-background** or **-showcase** are supplied,
     the menu will be static.
 : **-quick-menu**
-    (Note: unfortunately ffmpeg's 'vhooks' have been removed, so this
-    option may not be available for you depending on your ffmpeg version)
-    This will make a very quick  menu by using ffmpeg instead of imagemagick.
+    If you are using ffmpeg 0.8 or newer you can use this option.  This will
+    make a very quick  menu by using ffmpeg instead of imagemagick.
     There are two choices: you can either use '-showcase IMAGE|VIDEO' or
     '-background VIDEO'.  There are no fancy effects like **-wave**
     or **-rotate** available for it, but it is extremely fast.  It will be a
     text-menu style of menu, with no video thumbs, and a central showcase
     IMAGE(static) | VIDEO(animated).
-    ( see **-bg-color** if you are not using a **-background** and want to
+    (i) see **-bg-color** if you are not using a **-background** and want to
     change the default black )
+    (ii) Note: todisc will still work with vhooks if you have an old ffmpeg with
+    vhooks compiled in.
 
     Specifying the IMAGE|VIDEO argument to **-showcase** is mandatory for this
     style of menu, unless used in conjunction with **-switched-menus**
@@ -356,26 +371,30 @@
     See **-switched-menus** for example of making switched menus with
     **-quick-menu**
 
-: **-bg-color** | **-bg-colour**
+: **-bg-color**, **-bg-colour**
     The color to use for the menu background. (default: ntsc-safe black)
     Note: use a color a great deal darker than you want, as it appears quite
     a bit lighter in the video version.  You can use hexadecimal ('#ffac5f')
     or named colors notation.
-: **-submenu-bg-color** | **-submenu-bg-colour**
+: **-submenu-bg-color**, **-submenu-bg-colour**
     The color to use as background for the  submenu(s).
     (default: ntsc-safe black)  See **-bg-color**
-: **-use-makemenu**
-    This will use **tovid menu** to create a menu with the provided titles.
 : **-static**
-    Main menu will just be static thumbs (not animated) (default: animated)
+    Main menu will consist of static thumbnail links. (default: animated)
+    If you use a video for -showcase or -background then it will still be
+    a 'moving' menu, in spite of the static buttons.  This option also does
+    double duty for the **-switched-menus** option, and will create static
+    "switched" images.
+    See also **-switched-menu**
 : **-background** IMAGE|VIDEO
     Menu background.  This can be a image file or an video file.  If it is a
     video file the background will be animated.  Pick a file of correct aspect
-    ratio: i.e. it should still look good when resized to 720x480 (PAL 720x576)
+    ratio: i.e. it should still look good when resized to 4:3 aspect ratio.
+    It will be resized to fill the entire background.
 : **-submenu-background** IMAGE
     Submenu background.  This can be only be an image file.  Pick a file of
     correct aspect ratio: i.e. it should still look good when resized to
-    720x480 (PAL 720x576)
+    4:3 aspect ratio.  It will be resized to fill the entire background.
 : **-menu-title**
     Title for the root menu - may be longer than thumbnail labels
     Also if you use \n in the title, you can use multi line titles, but you
@@ -436,7 +455,7 @@
     Any other options can be used, but the  menu will be a textmenu style by
     default.  **Hint**: use **-showcase** IMAGE/VIDEO to create a fancier
     VMGM menu.
-: **-no-vmgm-menu** | **-no-vmgm**
+: **-no-vmgm-menu**, **-no-vmgm**
   This will skip the creation of a VMGM ( root menu ) for titlesets. The DVD
   will start with the first titleset.  You can not use this option unless also
   using **-quick-nav** as you would not have a way to get to other titlesets.
@@ -455,6 +474,9 @@
     process can be greatly sped up by using **-quick-menu** in conjunction with
     this, though you will lose fancy options like **-rotate** and **-wave**.
 
+    Note that if you want to just have a static rather than an 'animated'
+    image, add **-static** to the command line.
+
     Example for using with **-quick-menu**:
 ```
     -switched-menus -quick-menu
@@ -570,7 +592,7 @@
     Frame the slides for the animated slideshow menu.  The default width
     without using an  argument is 12.  See also **-slide-frame-color**
 
-: **-slide-frame-color** | **-slide-frame-colour**
+: **-slide-frame-color**, **-slide-frame-colour**
     The color of the slide frame if passing **-slide-frame**.  The default if
     you don't use this option is a color-safe white: rgb(235,235,235).
 
@@ -580,18 +602,21 @@
     from each slideshow in the menu.  The thumb for each slideshow button will
     be static.  If you used with a mixed menu of videos and slideshows, then
     the video thumbs WILL be animated, so you may wish to use -static or
-    -textmenu with the option in that case.
+    -textmenu with the option in that case.  If you want to use the
+    **-switched-menus option with a mixed menu leave this option out. 
 
 : **-background-slideshow**, **-bg-slideshow**
     If doing multiple slideshows or mixed videos and slideshow(s), then use
     the animated slideshow as a background video.  See **-showcase-slideshow**
     for additional details.
+
 : **-no-confirm-backup**
     Slideshows are an experimental (but well tested) feature.  Todisc is
     unlikely to overwrite your personal files, but you should take precautions
     and backup your images, as you would with any beta software.  Todisc
     will prompt you to backup your files normally.  If you have already backed
     up your images, use this option to disable the prompt.
+
 : **-use-dvd-slideshow** [CONFIG FILE]
     If you pass this option without an argument, tovid will use the
     dvd-slideshow program to create the animated slide menu, assuming you have
@@ -687,7 +712,10 @@
     chapters.  Each title must be quoted, and the number of titles given
     must equal the total number of chapters for all videos.  In other words
     if you use -chapters 4 6 8 , you must give 18 chapter titles, in the same
-    order that the videos were passed in.
+    order that the videos were passed in.  Note: if you are passing in options
+    on the command line to the 'tovid disc' GUI, you must repeat the option
+    **-chapter-titles** for each video, accompanied by its respective chapter
+    titles. (you can also choose to use this syntax for the todisc script.)
 
 : **-chapter-font** FONT

tovid-0.34.tar.bz2/icons/hicolor/128x128/apps/titleset-wizard.png Added

tovid-0.34.tar.bz2/icons/hicolor/32x32/apps/titleset-wizard.png Added

tovid-0.34.tar.bz2/icons/hicolor/48x48/apps/titleset-wizard.png Added

tovid-0.34.tar.bz2/icons/hicolor/64x64/apps/titleset-wizard.png Added

tovid-0.34.tar.bz2/icons/hicolor/scalable/apps/titleset-wizard.svg Added

@@ -0,0 +1,586 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="128"
+   height="128"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.47 r22583"
+   version="1.0"
+   sodipodi:docname="titleset_wizard.svg">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 64 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="128 : 64 : 1"
+       inkscape:persp3d-origin="64 : 42.666667 : 1"
+       id="perspective3141" />
+    <linearGradient
+       id="linearGradient2495">
+      <stop
+         id="stop2497"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop2499"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0.02284264;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient792">
+      <stop
+         style="stop-color:#f5ffff;stop-opacity:1;"
+         offset="0"
+         id="stop793" />
+      <stop
+         style="stop-color:#ff0000;stop-opacity:0;"
+         offset="1"
+         id="stop794" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient783">
+      <stop
+         style="stop-color:#f50000;stop-opacity:1;"
+         offset="0"
+         id="stop784" />
+      <stop
+         style="stop-color:#ff0000;stop-opacity:0;"
+         offset="1"
+         id="stop785" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient777">
+      <stop
+         style="stop-color:#f5e2f8;stop-opacity:1;"
+         offset="0"
+         id="stop778" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="1"
+         id="stop779" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6659">
+      <stop
+         style="stop-color:#00b7ff;stop-opacity:0.60784316;"
+         offset="0"
+         id="stop6661" />
+      <stop
+         style="stop-color:#090b0c;stop-opacity:1;"
+         offset="1"
+         id="stop6663" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3269">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3271" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.31218275;"
+         offset="1"
+         id="stop3273" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2358">
+      <stop
+         style="stop-color:#e2afff;stop-opacity:1;"
+         offset="0"
+         id="stop2360" />
+      <stop
+         style="stop-color:#09004d;stop-opacity:0;"
+         offset="1"
+         id="stop2362" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2325">
+      <stop
+         style="stop-color:#ff7e00;stop-opacity:1;"
+         offset="0"
+         id="stop2327" />
+      <stop
+         id="stop2335"
+         offset="0.25460124"
+         style="stop-color:#ffffcc;stop-opacity:0.70558375;" />
+      <stop
+         style="stop-color:#00ff81;stop-opacity:0.02030457;"
+         offset="1"
+         id="stop2329" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2317">
+      <stop
+         style="stop-color:#100081;stop-opacity:0.01960784;"
+         offset="0"
+         id="stop2319" />
+      <stop
+         id="stop2333"
+         offset="0.5"
+         style="stop-color:#00558c;stop-opacity:0.50980395;" />
+      <stop
+         style="stop-color:#78ff88;stop-opacity:1;"
+         offset="1"
+         id="stop2321" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2650">
+      <stop
+         style="stop-color:#e9f4f3;stop-opacity:1;"
+         offset="0"
+         id="stop2652" />
+      <stop
+         style="stop-color:#6d4198;stop-opacity:1;"
+         offset="1"
+         id="stop2654" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2640">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="0"
+         id="stop2642" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop2644" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2624">
+      <stop
+         id="stop2626"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+      <stop
+         id="stop2628"
+         offset="1"
+         style="stop-color:#e8ab68;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2614">
+      <stop
+         style="stop-color:#fff1ff;stop-opacity:1;"
+         offset="0"
+         id="stop2616" />
+      <stop
+         style="stop-color:#765da5;stop-opacity:0;"
+         offset="1"
+         id="stop2618" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2602">
+      <stop
+         style="stop-color:#a695c5;stop-opacity:0.35294119;"
+         offset="0"
+         id="stop2604" />
+      <stop
+         id="stop2610"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         style="stop-color:#adb79f;stop-opacity:0.2;"
+         offset="1"
+         id="stop2606" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2594">
+      <stop
+         style="stop-color:#f4ffff;stop-opacity:0.64720809;"
+         offset="0"

tovid-0.33.tar.bz2/libtovid/__init__.py -> tovid-0.34.tar.bz2/libtovid/__init__.py Changed

tovid-0.33.tar.bz2/libtovid/author.py -> tovid-0.34.tar.bz2/libtovid/author.py Changed

@@ -39,32 +39,32 @@
     """A menu for navigating the titles on a video disc.
     """
     def __init__(self, filename='', videos=None):
-        """Create a menu linking to the given Videos."""
+        """Create a menu linking to the given `Video`\s."""
         self.filename = filename
         self.videos = videos or []
 
     def add(self, video):
-        """Add a Video to the Menu."""
+        """Add a `Video` to the Menu."""
         self.videos.append(video)
 
 
 class Titleset:
-    """A group of videos, with an optional Menu.
+    """A group of `Video`\s, with an optional `Menu`.
     """
     def __init__(self, menu=None, videos=None):
-        """Create a Titleset containing the given Videos.
+        """Create a Titleset containing the given `Video`\s.
         """
         self.menu = menu
         self.videos = videos or []
 
     def add(self, video):
-        """Add a Video to the Titleset."""
+        """Add a `Video` to the Titleset."""
         self.videos.append(video)
 
 
 class Disc:
-    """A video disc containing one or more Titlesets, and an optional
-    top Menu for navigating to each Titleset.
+    """A video disc containing one or more `Titleset`\s, and an optional
+    top `Menu` for navigating to each Titleset.
 
     """
     def __init__(self, name='Untitled', format='dvd', tvsys='ntsc',
@@ -78,7 +78,7 @@
             title
                 String containing the title of the disc
             titlesets
-                List of Titlesets
+                List of `Titleset` objects
         """
         self.name = name
         self.format = format
@@ -94,7 +94,7 @@
 
 def _add_titleset(titleset, ts_id, segment_items, sequence_items, pbc):
     """Add titleset content to a vcdimager XML structure. This function is
-    used internally, mainly to keep vcdimager_xml() from being too long.
+    used internally, mainly to keep `vcdimager_xml` from being too long.
     """
     menu = titleset.menu
     videos = titleset.videos
@@ -145,7 +145,7 @@
 ###
 
 def vcdimager_xml(disc):
-    """Return the vcdimager XML string for the given Disc.
+    """Return the vcdimager XML string for the given `Disc`.
     """
     assert isinstance(disc, Disc)
     # XML header (will be added later)
@@ -197,7 +197,7 @@
 
 
 def dvdauthor_xml(disc):
-    """Return the dvdauthor XML string for the given Disc.
+    """Return the dvdauthor XML string for the given `Disc`.
     """
     assert isinstance(disc, Disc)
     # Root dvdauthor element

tovid-0.33.tar.bz2/libtovid/backend/__init__.py -> tovid-0.34.tar.bz2/libtovid/backend/__init__.py Changed

tovid-0.33.tar.bz2/libtovid/backend/ffmpeg.py -> tovid-0.34.tar.bz2/libtovid/backend/ffmpeg.py Changed

@@ -15,9 +15,9 @@
     """Encode a multimedia video using ffmpeg.
 
         source
-            Input MediaFile
+            Input `~libtovid.media.MediaFile`
         target
-            Output MediaFile
+            Output `~libtovid.media.MediaFile`
         kw
             Keyword arguments to customize encoding behavior
 
@@ -81,7 +81,7 @@
     else:
         cmd.add('-aspect', '4:3')
 
-    cmd.add(target.filename)    
+    cmd.add(target.filename)
     cmd.run()
 
 
@@ -90,11 +90,11 @@
     to the given filename.
 
         source
-            Input MediaFile
+            Input `~libtovid.media.MediaFile`
         audiofile
             Filename for encoded audio
         target
-            Output MediaFile
+            Output `~libtovid.media.MediaFile`
 
     If no audio is present in the source file, encode silence.
     """
@@ -122,8 +122,8 @@
 from libtovid.media import MediaFile
 
 def identify(filename):
-    """Identify a video file using ffmpeg, and return a MediaFile with
-    the video's specifications.
+    """Identify a video file using ffmpeg, and return a
+    `~libtovid.media.MediaFile` with the video's specifications.
     """
     result = MediaFile(filename)
 
@@ -131,7 +131,7 @@
     cmd.run(capture=True)
 
     # ffmpeg puts its output on stderr
-    output = cmd.get_error()
+    output = cmd.get_errors()
 
     video_line = re.compile(''
         'Stream (?P<tracknum>[^:]+): Video: ' # Track number (ex. #0.0)

tovid-0.33.tar.bz2/libtovid/backend/mpeg2enc.py -> tovid-0.34.tar.bz2/libtovid/backend/mpeg2enc.py Changed

@@ -19,9 +19,9 @@
     """Encode a multimedia video using mplayer|yuvfps|mpeg2enc.
 
         source
-            Input MediaFile
+            Input `~libtovid.media.MediaFile`
         target
-            Output MediaFile
+            Output `~libtovid.media.MediaFile`
         kw
             Keyword arguments to customize encoding behavior
 
@@ -63,13 +63,13 @@
     """Encode a yuv4mpeg stream to an MPEG video stream.
 
         source
-            Input MediaFile
+            Input `~libtovid.media.MediaFile`
         yuvfile
             Filename of .yuv stream coming from mplayer
         videofile
             Filename of .m[1|2]v to write encoded video stream to
         target
-            Output MediaFile
+            Output `~libtovid.media.MediaFile`
 
     """
     # TODO: Control over quality (bitrate/quantization) and disc split size,
@@ -125,7 +125,7 @@
 
 def encode_frames(imagedir, outfile, format, tvsys, aspect, interlaced=False):
     """Convert an image sequence in the given directory to match a target
-    MediaFile, putting the output stream in outfile.
+    `~libtovid.media.MediaFile`, putting the output stream in outfile.
 
         imagedir
             Directory containing images (and only images)

tovid-0.33.tar.bz2/libtovid/backend/mplayer.py -> tovid-0.34.tar.bz2/libtovid/backend/mplayer.py Changed

@@ -16,9 +16,9 @@
     """Encode a multimedia video using mencoder.
 
         source
-            Input MediaFile
+            Input `~libtovid.media.MediaFile`
         target
-            Output MediaFile
+            Output `~libtovid.media.MediaFile`
         kw
             Keyword arguments to customize encoding behavior
 
@@ -105,8 +105,8 @@
 
 
 def identify(filename):
-    """Identify a video file using mplayer, and return a MediaFile with
-    the video's specifications.
+    """Identify a video file using mplayer, and return a
+    `~libtovid.media.MediaFile` with the video's specifications.
     """
     # TODO: Raise an exception if the file couldn't be identified
     # TODO: Infer aspect ratio
@@ -186,11 +186,11 @@
     """Rip video to the given yuv4mpeg file.
 
         source
-            Input MediaFile
+            Input `~libtovid.media.MediaFile`
         yuvfile
             File to put ripped video in
         target
-            Output MediaFile
+            Output `~libtovid.media.MediaFile`
 
     """
     # TODO: Custom mplayer options, subtitles, interlacing,

tovid-0.33.tar.bz2/libtovid/backend/spumux.py -> tovid-0.34.tar.bz2/libtovid/backend/spumux.py Changed

@@ -2,10 +2,10 @@
 
 Defined here are two functions for adding subtitles to an MPEG file:
 
-    add_subpictures
-        Add image files (.png)
-    add_subtitles
-        Add subtitle files (.sub, .srt etc.)
+    `add_subpictures`
+        Add image files (``.png``)
+    `add_subtitles`
+        Add subtitle files (``.sub``, ``.srt`` etc.)
 
 Use these if you just want to add subpictures or subtitles, and don't want
 to think much about the XML internals.
@@ -23,7 +23,7 @@
 from libtovid.backend import mplayer
 
 # spumux XML elements and valid attributes
-# 
+#
 # subpictures
 # stream
 # textsub
@@ -81,12 +81,12 @@
 
 
 def _mux_subs(subtitle, movie_filename, stream_id=0):
-    """Run spumux to multiplex the given subtitle with an .mpg file.
+    """Run spumux to multiplex the given subtitle with an ``.mpg`` file.
 
         subtitle
             Textsub or Spu element
         movie_filename
-            Name of an .mpg file to multiplex subtitle into
+            Name of an ``.mpg`` file to multiplex subtitle into
         stream_id
             Stream ID number to pass to spumux
     """
@@ -109,14 +109,14 @@
 
 
 def add_subpictures(movie_filename, select, image=None, highlight=None):
-    """Adds PNG image subpictures to an .mpg video file to create a DVD menu.
+    """Adds ``.png`` subpictures to an ``.mpg`` video file to create a DVD menu.
 
         select
-            Image shown as the navigational selector or "cursor"
+            ``.png`` filename shown for the navigational selector or "cursor"
         image
-            Image shown for non-selected regions
+            ``.png`` filename shown for non-selected regions
         highlight
-            Image shown when "enter" is pressed
+            ``.png`` filename shown when "enter" is pressed
 
     All images must be indexed, 4-color, transparent, non-antialiased PNG.
     Button regions are auto-inferred.
@@ -134,13 +134,13 @@
 
 
 def add_subtitles(movie_filename, sub_filenames):
-    """Adds one or more subtitle files to an .mpg video file.
+    """Adds one or more subtitle files to an ``.mpg`` video file.
 
         movie_filename
-            Name of .mpg file to add subtitles to
+            Name of ``.mpg`` file to add subtitles to
         sub_filenames
             Filename or list of filenames of subtitle
-            files to include (.sub/.srt etc.)
+            files to include (``.sub``, ``.srt`` etc.)
 
     """
     infile = mplayer.identify(movie_filename)

tovid-0.33.tar.bz2/libtovid/backend/transcode.py -> tovid-0.34.tar.bz2/libtovid/backend/transcode.py Changed

@@ -2,12 +2,12 @@
 """
 
 # Sample output from tcprobe:
-# 
+#
 # [tcprobe] RIFF data, AVI video
 # [avilib] V: 24.000 fps, codec=DIVX, frames=15691, width=1024, height=576
 # [avilib] A: 48000 Hz, format=0x2000, bits=0, channels=5, bitrate=448 kbps,
 # [avilib]    10216 chunks, 36614144 bytes, CBR
-# [tcprobe] summary for Elephants_1024.avi, (*) = not default, 0 = not 
+# [tcprobe] summary for Elephants_1024.avi, (*) = not default, 0 = not
 # detected
 # import frame size: -g 1024x576 [720x576] (*)
 #        frame rate: -f 24.000 [25.000] frc=0 (*)
@@ -26,8 +26,8 @@
 from libtovid.media import MediaFile
 
 def identify(filename):
-    """Identify a video file using transcode (tcprobe), and return a MediaFile
-    with the video's specifications.
+    """Identify a video file using transcode (tcprobe), and return a
+    `~libtovid.media.MediaFile` with the video's specifications.
     """
     result = MediaFile(filename)
 
@@ -69,17 +69,17 @@
 
 
 def rip_frames(media, out_dir, frames='all', size=(0, 0)):
-    """Extract frame images from a MediaFile and return a list of frame image
-    files.
+    """Extract frame images from a `~libtovid.media.MediaFile` and return a
+    list of frame image files.
 
         media
-            MediaFile to extract images from
+            `~libtovid.media.MediaFile` to extract images from
         out_dir
             Directory where output images should be stored; images are saved
-            in a subdirectory of out_dir named after the input filename
+            in a subdirectory of ``out_dir`` named after the input filename
         frames
-            Which frames to rip: 'all' for all frames, 15 to rip frame 15;
-            [30, 90] to rip frames 30 through 90, etc.
+            Which frames to rip: ``'all'`` for all frames, ``15`` to rip frame
+            15; ``[30, 90]`` to rip frames 30 through 90, etc.
         size
             Resolution of frame images (default: original size), used
             for prescaling

tovid-0.33.tar.bz2/libtovid/cli.py -> tovid-0.34.tar.bz2/libtovid/cli.py Changed

@@ -1,9 +1,9 @@
 """This module provides an interface for running command-line applications.
 Two primary classes are provided:
 
-    Command
+    `Command`
         For constructing and executing command-line commands
-    Pipe
+    `Pipe`
         For piping commands together
 
 Commands are constructed by specifying a program to run, and each separate
@@ -27,25 +27,59 @@
     >>> pipe.run()                                # doctest: +SKIP
     Hello nurse
 
-Command output may be captured and retrieved later with get_output()::
+The above can be easily accomplished using Python standard library functions
+like ``os.Popen`` or ``commands.getoutput``. This module was designed to
+simplify the task of executing long-running commands or command-line pipes in
+the background, and getting their output later. This behavior is controlled by
+the arguments to the `~Command.run` method.
+
+Normally, `~Command.run` prints all output on standard output. If instead you
+need to capture the output, pass ``capture=True``, then retrieve it later with
+`~Command.get_output`::
 
     >>> echo.run(capture=True)                    # doctest: +SKIP
     >>> echo.get_output()
     'Hello world\\n'
 
+If the command you're running will take a long time to run, and you don't want
+your program to be blocked while it's running, pass ``background=True``. If the
+command may produce a lot of output during execution, you'll probably want to
+capture it instead of printing it::
+
+    >>> find = Command('find', '/')               # doctest: +SKIP
+    >>> find.run(capture=True, background=True)
+
+In this way, your application can keep doing other things while the long-running
+command is executing; you can check whether it's done like so::
+
+    >>> find.done()
+    False
+    >>> find.done()
+    False
+    >>> find.done()
+    True
+
+Then, as before, use `~Command.get_output` to get the output, if you need it. If
+you need to get the standard error output, use `~Command.get_errors`.
+
 """
 # Note: Some of the run() tests above will fail doctest.testmod(), since output
 # from Command subprocesses is not seen as real output by doctest. The current
 # workaround is to use the "doctest: +SKIP" directive (new in python 2.5).
 # For other directives see http://www.python.org/doc/lib/doctest-options.html
 
+# TODO: Make the 'capture/get_output' mechanisms able to handle large amounts
+# of output, perhaps by logging to a temporary file and/or returning an iterator
+# for lines of output, instead of a flat string.
+
 __all__ = [
     'Command',
     'Pipe',
 ]
 
 import subprocess
-from os import environ
+import signal
+import os
 
 # Small workaround for Python 3.x
 try:
@@ -53,6 +87,11 @@
 except NameError:
     unicode = str
 
+class ProgramNotFound (ValueError):
+    """Raised when the program given to a command is not available.
+    """
+    pass
+
 class Command:
     """A command-line statement, consisting of a program and its arguments,
     with support for various modes of execution.
@@ -86,28 +125,37 @@
         contents is necessary.
         """
         for arg in args:
-            self.args.append(str(arg))
+            self.args.append(unicode(arg))
 
 
-    def run(self, capture=False, background=False):
+    def run(self, capture=False, background=False, silent=False):
         """Run the command and capture or display output.
 
             capture
-                False to show command output/errors on stdout,
-                True to capture output/errors for retrieval
-                by get_output() and get_error()
+                ``False`` to show command output/errors on stdout,
+                ``True`` to capture output/errors for retrieval
+                by `get_output` and `get_errors`
             background
-                False to wait for command to finish running,
-                True to run process in the background
+                ``False`` to wait for command to finish running,
+                ``True`` to run process in the background
+            silent
+                ``False`` to print each command as it runs,
+                ``True`` to run silently
 
         By default, this function displays all command output, and waits
         for the program to finish running, which is usually what you'd want.
         Capture output if you don't want it printed immediately (and call
-        get_output() later to retrieve it).
+        `get_output` later to retrieve it).
 
         This function does not allow special stream redirection. For that,
-        use run_redir().
+        use `run_redir`.
         """
+        if not silent:
+            print("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~")
+            print("Running command:")
+            print(unicode(self))
+            print("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~")
+
         if capture:
             self.run_redir(None, subprocess.PIPE, stderr=subprocess.PIPE)
         else:
@@ -120,24 +168,20 @@
         """Execute the command using the given stream redirections.
 
             stdin
-                Filename or File object to read input from
+                Filename or `file` object to read input from
             stdout
-                Filename or File object to write output to
+                Filename or `file` object to write output to
             stderr
-                Filename or File object to write errors to
+                Filename or `file` object to write errors to
 
-        Use None for regular system stdin/stdout/stderr (default behavior).
-        That is, if stdout=None, the command's standard output is printed.
+        Use ``None`` for regular system stdin/stdout/stderr (default behavior).
+        That is, if ``stdout=None``, the command's standard output is printed.
 
-        This function is used internally by run(); if you need to do stream
-        redirection (ex. ``spumux < menu.mpg > menu_subs.mpg``), use this
-        function instead of run(), and call wait() afterwards if needed.
+        This function is used internally by `run`; if you need to do
+        stream redirection (ex. ``spumux < menu.mpg > menu_subs.mpg``), use
+        this function instead of `run`, and call `wait` afterwards
+        if needed.
         """
-        print("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~")
-        print("Running command:")
-        print(self)
-        print("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~")
-
         self.output = ''
         # Open files if string filenames were provided
         if isinstance(stdin, basestring):
@@ -147,16 +191,19 @@
         if isinstance(stderr, basestring):
             stderr = open(stderr, 'w')
         # Run the subprocess
-        self.proc = subprocess.Popen([self.program] + self.args,
-                          stdin=stdin, stdout=stdout, stderr=stderr)
+        try:
+            self.proc = subprocess.Popen([self.program] + self.args,
+                              stdin=stdin, stdout=stdout, stderr=stderr)
+        except OSError:
+            raise ProgramNotFound("Program '%s' not found." % self.program)
 
 
     def wait(self):
         """Wait for the command to finish running, and return the result
-        (``self.proc.returncode`` attribute).
+        (`self.proc.returncode`).
 
-        If a ``KeyboardInterrupt`` occurs (user pressed Ctrl-C), the
-        subprocess is killed (and ``KeyboardInterrupt`` re-raised).
+        If a :exc:`KeyboardInterrupt` occurs (user pressed Ctrl-C), the
+        subprocess is killed (and :exc:`KeyboardInterrupt` re-raised).
         """
         if not isinstance(self.proc, subprocess.Popen):
             print("**** Can't wait(): Command is not running")
@@ -172,14 +219,14 @@
     def kill(self):
         """Abort!
         """
-        #os.kill(self.proc.pid, signal.SIGTERM)
-        self.proc.kill()
+        os.kill(self.proc.pid, signal.SIGTERM)
+        #self.proc.kill()

tovid-0.33.tar.bz2/libtovid/deps.py -> tovid-0.34.tar.bz2/libtovid/deps.py Changed

@@ -4,7 +4,7 @@
     deps.require(deps.core)
 
 will look for all of tovid's core dependencies. If any cannot be found, the
-missing ones are printed and an exception is raised. Run deps.py from a prompt
+missing ones are printed and an exception is raised. Run ``deps.py`` from a prompt
 for further examples.
 
 In practice::
@@ -15,7 +15,7 @@
         print("Exiting...")
         sys.exit(1)
 
-deps.core is an internal dictionary of tovid's core dependencies, where the
+`deps.core` is an internal dictionary of tovid's core dependencies, where the
 keys are the names, and the values are brief descriptions with URLs.
 
 Provided dependency dictionaries:
@@ -40,13 +40,14 @@
 
     deps.require("more less cat")
 
-require also provides ways to print custom URLs and help when it cannot find
-dependencies. See help(deps.require) or keep reading.
+`require` also provides ways to print custom URLs and help when it cannot find
+dependencies. See ``help(deps.require)`` or keep reading.
 """
 
 __all__ = [
     'which',
     'require',
+    'MissingDep',
 ]
 
 import subprocess
@@ -129,7 +130,7 @@
             description="oops"):
 
     """Assert that one or more dependencies exist on the system. If any
-    are missing, raise a ``MissingDep`` exception.
+    are missing, raise a `MissingDep` exception.
 
         deps
             Names of dependencies to assert. May be a single name,
@@ -145,6 +146,7 @@
     (core, magick, etc.), its description is taken from there.
 
     Examples:
+
         require(all)
             Look for ALL dependencies that are defined internally.

tovid-0.33.tar.bz2/libtovid/encode.py -> tovid-0.34.tar.bz2/libtovid/encode.py Changed

@@ -2,14 +2,14 @@
 
 One high-level function is provided::
 
-    encode(infile, outfile, format, tvsys, method, ...)
+    encode(infile, outfile, format, tvsys, method, **kwargs)
 
-where "..." is optional keyword arguments (described below). For example::
+For example::
 
     encode('/video/foo.avi', '/video/bar.mpg', 'dvd', 'ntsc', 'ffmpeg')
 
-This will encode '/video/foo.avi' to NTSC DVD format using ffmpeg, saving
-the result as '/video/bar.mpg'. The ``format``, ``tvsys``, and ``method``
+This will encode ``/video/foo.avi`` to NTSC DVD format using ffmpeg, saving
+the result as ``/video/bar.mpg``. The ``format``, ``tvsys``, and ``method``
 arguments are optional; if you do::
 
     encode('/video/foo.avi', '/video/bar.mpg')
@@ -22,12 +22,18 @@
            quality=7, interlace='bottom', ...)
 
 The supported keywords may vary by backend, but some keywords are supported
-by all backends.
+by all backends. The available backends are:
+
+    - `~libtovid.backend.ffmpeg`
+    - `~libtovid.backend.mplayer`
+    - `~libtovid.backend.mpeg2enc`
+
 """
 
 __all__ = [
     'encode',
-    'get_encoder',
+    'eval_keywords',
+    'fit',
 ]
 
 from libtovid.backend import ffmpeg, mplayer, mpeg2enc
@@ -51,24 +57,44 @@
 
 def encode(infile, outfile, format='dvd', tvsys='ntsc', method='ffmpeg',
            **kwargs):
-    """Encode a multimedia file according to a target profile, saving the
-    encoded file to outfile.
+    """Encode a multimedia file ``infile`` according to a target profile,
+    saving the encoded file to ``outfile``.
 
         infile
             Input filename
         outfile
-            Desired output filename (.mpg implied)
+            Desired output filename (``.mpg`` implied)
         format
             One of 'vcd', 'svcd', 'dvd' (case-insensitive)
         tvsys
             One of 'ntsc', 'pal' (case-insensitive)
         method
-            Encoding backend: 'ffmpeg', 'mencoder', or 'mpeg2enc'
+            Encoding backend: `~libtovid.backend.ffmpeg`,
+            `~libtovid.backend.mplayer`, or `~libtovid.backend.mpeg2enc`
         kwargs
             Additional keyword arguments (name=value)
 
-    The supported keyword arguments vary by encoding method. See the encoding
-    functions for what is available in each.
+    For example::
+
+        encode('/video/foo.avi', '/video/bar.mpg', 'dvd', 'ntsc', 'ffmpeg')
+
+    This will encode ``/video/foo.avi`` to NTSC DVD format using ffmpeg, saving
+    the result as '/video/bar.mpg'. The ``format``, ``tvsys``, and ``method``
+    arguments are optional; if you do::
+
+        encode('/video/foo.avi', '/video/bar.mpg')
+
+    then encoding will be DVD NTSC, using ffmpeg.
+
+    Keyword arguments may be used to further refine encoding behavior, for example::
+
+        encode('foo.avi', 'foo.mpg', 'dvd', 'pal',
+               quality=7, interlace='bottom', ...)
+
+    The supported keywords may vary by backend, but some keywords are supported
+    by all backends.
+
+
     """
     source = mplayer.identify(infile)
     # Add .mpg to outfile if not already present
@@ -98,7 +124,13 @@
     encode_method(source, target, **kwargs)
 
 
-def get_encoder(backend):
+# --------------------------------------------------------------------------
+#
+# Helper functions
+#
+# --------------------------------------------------------------------------
+
+def _get_encoder(backend):
     """Get an encoding function."""
     if backend == 'ffmpeg':
         return ffmpeg.encode
@@ -108,12 +140,6 @@
         return mpeg2enc.encode
 
 
-# --------------------------------------------------------------------------
-#
-# Helper functions
-#
-# --------------------------------------------------------------------------
-
 def eval_keywords(source, target, **kwargs):
     """Interpret keywords that affect other keywords, and return the result.
     These are keywords that can be shared between multiple encoding backends.
@@ -136,17 +162,17 @@
     # Set quant and vbitrate to fit desired size
     if 'fit' in kwargs:
         kwargs['quant'], kwargs['vbitrate'] = \
-            _fit(source, target, kwargs['fit'])
+            fit(source, target, kwargs['fit'])
     return kwargs
 
 
-def _fit(source, target, fit_size):
+def fit(source, target, fit_size):
     """Return video (quantization, bitrate) to fit a video into a given size.
 
         source
-            MediaFile input (the video being encoded)
+            `~libtovid.media.MediaFile` input (the video being encoded)
         target
-            MediaFile output (desired target profile)
+            `~libtovid.media.MediaFile` output (desired target profile)
         fit_size
             Desired encoded file size, in MiB
 
@@ -177,6 +203,3 @@
         return (quant, vid_bitrate)
 
 
-
-
-

tovid-0.34.tar.bz2/libtovid/guis/helpers.py Added

@@ -0,0 +1,595 @@
+import Tkinter as tk
+import time
+import shlex
+import commands
+import re
+import os
+import fnmatch
+from libtovid.metagui import *
+from libtovid.metagui.control import _SubList
+from libtovid.util import filetypes
+from subprocess import Popen, PIPE, STDOUT
+from tempfile import mkdtemp
+
+__all__ = [ 'VideoGui', 'SetChapters', 'Chapters', 'strip_all', 'to_title',
+'find_masks', 'nodupes', 'video_filetypes', 'image_filetypes',
+'visual_filetypes', 'dvd_video_files', 'av_filetypes', 'sys_dir',
+'thumb_masks', 'home_dir', 'tovid_prefix', 'tovid_icon', 'os_path',
+'heading_text', '_files_and_titles', '_out' ]
+
+class VideoGui(tk.Frame):
+    """A basic GUI to play video files.  It runs mplayer in slave mode
+    so that commands can be sent to it via fifo.
+
+    Without subclassing it only contains a 'play/pause button
+    and an 'exit' button.
+    """
+    def __init__(self, master, args='', title='', callback=None, style='popup'):
+        """Initialize GUI
+
+           master
+               widget that will conain this GUI
+           args
+               additional arguments to mplayer command, inserted
+               at the end of the command just before the 'FILE' argument.
+           title
+               the wm title given to the master widget.
+           callback
+               a function run at program exit, before cleanup of temp files
+           style
+               may be one of 'popup' (default), 'standalone', or 'embedded'(TBA)
+        """
+        tk.Frame.__init__(self, master)
+
+        self.args = args
+        self.show_osd = False
+        if '-osdlevel 3' in args:
+            self.show_osd = True
+        self.master = master
+        if title:
+            try:
+                self.master.title(title)
+            except AttributeError:
+                print "Error: " + \
+                  "VideoGui master must be a root window for 'title' option"
+        self.callback = callback
+        self.style = style
+                
+        self.is_running = tk.BooleanVar()
+        self.is_running.set(False)
+        self.pauseplay = tk.StringVar()
+        self.pauseplay.set('play')
+        # temporary directory for fifo and other mplayer files
+        self.tempdir = mkdtemp(prefix='tovid-')
+        self.cmd_pipe = os.path.join(self.tempdir, 'slave.fifo')
+        self.editlist = os.path.join(self.tempdir, 'editlist')
+        os.mkfifo(self.cmd_pipe)
+        self.log = os.path.join(self.tempdir, 'mplayer.log')
+        self.draw()
+
+    def draw(self):
+        """Draw the GUI in self.master and get X11 identifier for container"""
+        self.root_frame = tk.Frame(self)
+        self.root_frame.pack(side='top', fill='both', expand=1, pady=20)
+        self.container = tk.Frame(self.root_frame, bg='black', container=1, colormap='new')
+        self.container.pack()
+        # X11 identifier for the container frame
+        self.xid = self.tk.call('winfo', 'id', self.container)
+        # bindings for exit
+        if self.style == 'standalone':
+            self._root().protocol("WM_DELETE_WINDOW", self.confirm_exit)
+            self._root().bind('<Control-q>', self.confirm_exit)
+        self.add_widgets()
+
+    def add_widgets(self):
+        """
+        Add buttons to the VideoGui.  Override this to customize buttons.
+        root_frame has 'grab_set()' applied to it so make sure widgets go
+        into this frame or they will not be functional!
+        This function is called in draw()
+        """
+        button_frame = tk.Frame(self.root_frame)
+        button_frame.pack(side='bottom', fill='x', expand=1)
+        control_frame = tk.Frame(button_frame, borderwidth=1, relief='groove')
+        control_frame.pack()
+        exit_button = tk.Button(control_frame, command=self.exit_mplayer, text='exit')
+        pause_button = tk.Button(control_frame, command=self.pause,
+                          width=12, textvariable=self.pauseplay)
+        exit_button.pack(side='left')
+        pause_button.pack(side='left')
+
+
+    def identify(self, video):
+        """
+        Get information about video from mplayer -identify.
+        Called by set_container()
+        """
+        
+        output = commands.getoutput('mplayer -vo null -ao null -frames 5 \
+          -channels 6 -identify %s' %video)
+        return output
+
+    def set_container(self, video):
+        """Get aspect ratio and set dimensions of video container.
+           Called by run().
+        """
+        if self.style == 'standalone':
+            v_width = 600
+        else:
+            v_width = 540
+        media_info = self.identify(video)
+        asr = re.findall('ID_VIDEO_ASPECT=.*', media_info)
+        # get last occurence as the first is 0.0 with mplayer
+        if asr:
+            asr = sorted(asr, reverse=True)[0].split('=')[1]
+        try:
+            asr = float(asr)
+        except ValueError:
+            asr = 0.0
+        # get largest value as mplayer prints it out before playing file
+        if asr and asr > 0.0:
+            v_height = int(v_width/asr)
+        else:
+            # default to 4:3 if identify fails
+            v_height = int(v_width/1.333)
+        self.container.configure(width=v_width, height=v_height)
+
+    def run(self, video):
+        """Play video in this GUI using mplayer."""
+        self.set_container(video)
+        command =  'mplayer -wid %s -nomouseinput -slave \
+          -input nodefault-bindings:conf=/dev/null:file=%s \
+          -edlout %s %s %s' \
+          %(self.xid, self.cmd_pipe, self.editlist, self.args, video)
+        self.command = shlex.split(command)
+
+    def poll(self):
+        """
+        Check mplayer log output for 'End of file' and restart the video.
+        This is necessary because otherwise Tkinter has no way of knowing
+        mplayer is still running.  In this way mplayer must be sent a 'quit'
+        explicity before exit. Use 'on_eof()' to run custom command when
+        'End of file' is found.
+        """
+        if not self.is_running.get():
+            return
+        tail = 'tail -n 1 %s' %self.log
+        log_output = commands.getoutput(tail)
+        # restart mplayer with same commands if it exits without being sent
+        # an explict 'quit'.
+        if '(End of file)' in log_output:
+            self.on_eof()
+            # check for is_running again as on_oef() might set it to false
+            if self.is_running.get():
+                cmd = Popen(self.command, stderr=open(os.devnull, 'w'), \
+                  stdout=open(self.log, "w"))
+                if self.show_osd:
+                    self.send('osd 3\n')
+                self.pause()
+        self.master.after(200, self.poll)
+
+    def on_eof(self):
+        """
+        Run when 'End of file' discovered in mplayer output by poll().
+        Override to run custom commands.
+        Note: change is_running() variable to false to prevent looping of video.
+        """
+        pass
+
+    def send(self, text):
+        """send command to mplayer's slave fifo"""
+        if self.is_running.get():
+            commands.getstatusoutput('echo -e "%s"  > %s' %(text, self.cmd_pipe))
+
+    def pause(self):
+        """send pause to mplayer via slave and set button var to opposite value"""
+        # mplayer's 'pause' pauses if playing and plays if paused
+        # pauseplay ==play in pause mode, and ==pause in play mode (button text)
+        if self.is_running.get():
+            if self.pauseplay.get() == 'pause':
+                self.pauseplay.set('play')
+            else:
+                self.pauseplay.set('pause')
+            self.send('pause\n')
+        else:
+            # start the video for the 1st time
+            cmd = Popen(self.command, stderr=open(os.devnull, 'w'), stdout=open(self.log, "w"))
+            self.is_running.set(True)
+            self.poll()
+            # show osd time and remaining time

tovid-0.33.tar.bz2/libtovid/guis/todisc.py -> tovid-0.34.tar.bz2/libtovid/guis/todisc.py Changed

@@ -3,72 +3,12 @@
 """A GUI for the todisc command-line program.
 """
 
-import os
+import Tkinter as tk
 
 # Get supporting classes from libtovid.metagui
 from libtovid.metagui import *
-from libtovid.util import filetypes
-import os
-import fnmatch
-from libtovid.cli import Command
-
-# Define a few supporting functions
-def to_title(filename):
-    basename = os.path.basename(filename)
-    firstdot = basename.find('.')
-    if firstdot >= 0:
-        return basename[0:firstdot]
-    else:
-        return basename
-
-def strip_all(filename):
-    return ''
-
-def find_masks(dir, pattern):
-    file_list=[]
-    ext = pattern.replace('*', '')
-    for path, dirs, files in os.walk(os.path.abspath(dir)):
-        for filename in fnmatch.filter(files, pattern):
-            file_list+=[ filename.replace(ext, '') ]
-    return file_list
-
-def nodupes(seq):
-    noDupes = []
-    [noDupes.append(i) for i in seq if not noDupes.count(i)]
-    return noDupes
-
-# List of file-type selections for Filename controls
-image_filetypes = [filetypes.image_files]
-image_filetypes.append(filetypes.all_files)
-#image_filetypes.extend(filetypes.match_types('image'))  # confusing
-# video file-types from filetypes needs some additions
-v_filetypes = 'm2v vob ts '
-v_filetypes += filetypes.get_extensions('video').replace('*.', '')
-v_filetypes += ' mp4 mpeg4 mp4v divx mkv ogv ogm ram rm rmvb wmv'
-vid_filetypes = filetypes.new_filetype('Video files', v_filetypes)
-video_filetypes = [vid_filetypes]
-video_filetypes += [filetypes.all_files]
-
-# some selectors can use video or audio
-av_filetypes = [ filetypes.all_files, filetypes.audio_files, vid_filetypes ]
-
-# some selectors can use image or video
-visual_filetypes = [ filetypes.all_files, filetypes.image_files, vid_filetypes ]
-
-# DVD video
-dvdext = 'vob mpg mpeg mpeg2'
-dvd_video_files = [ filetypes.new_filetype('DVD video files', dvdext) ]
-
-# Users can use their own thumb masks.  Add to thumb mask control drop-down
-masks = [ 'none', 'normal', 'oval', 'vignette', 'plectrum', 'arch', 'spiral', \
-'blob', 'star', 'flare' ]
-# $PREFIX/lib/tovid is already added to end of PATH
-os_path = os.environ['PATH'].rsplit(':')
-sys_dir = os_path[-1] + '/masks'
-home_dir = os.path.expanduser("~") + '/.tovid/masks'
-for dir in sys_dir, home_dir:
-    masks.extend(find_masks(dir, '*.png'))
-thumb_masks =  '|'.join(nodupes(masks))
+from libtovid.guis.helpers import *
+
 
 """Since todisc has a large number of options, it helps to store each
 one in a variable, named after the corresponding command-line option.
@@ -81,19 +21,14 @@
 ### Main todisc options
 ### --------------------------------------------------------------------
 
+# Note: _files_and_titles is defined in helpers.py
+
+_heading = Label(heading_text, 'center', tovid_icon, 48, 48)
+
 _menu_title = Text('Menu title', '-menu-title', 'My video collection',
     'Title text displayed on the main menu. Use \\n for a new line '
      'in a multi-line title.')
 
-_files = List('Video files', '-files', None,
-    'List of video files to include on the disc',
-    Filename('', filetypes=video_filetypes))
-
-_files_and_titles = ListToOne(_files, 'Video titles', '-titles', None,
-    'Titles to display in the main menu, one for each video file on the disc',
-    Text(),
-    filter=to_title)
-
 _group = ListToMany('-files', 'Grouped videos', '-group', None,
     'Video files to group together. Select the video in the list ' \
     'on the left, and add files to group with it by using the file ' \
@@ -106,10 +41,6 @@
 
 _pal = Flag('PAL', '-pal', False, 'PAL, European standard')
 
-_out = Filename('Output name', '-out', '',
-    'Name to use for the output directory where the disc will be created.',
-    'save', 'Choose an output name')
-
 
 ### --------------------------------------------------------------------
 ### Showcase options
@@ -330,8 +261,6 @@
     'This value is applied before the menu is scaled.',
     0, 460, 'pixels')
 
-
-
 ### --------------------------------------------------------------------
 ### Runtime behavior
 ### --------------------------------------------------------------------
@@ -693,7 +622,7 @@
     'Create a "Play All" button that jumps to the 1st title and plays '
     'all the videos in succession before returning to the main menu.')
 
-_chapters = ListToOne('-files', 'Chapters', '-chapters', None,
+_chapters = Chapters('-files', 'Chapters', '-chapters', None,
     'Number of chapters or HH:MM:SS string for each video. '
     'If only one value is given, use that for all videos. '
     'For grouped videos, use a "+" separator for joining '
@@ -704,7 +633,7 @@
     'When using HH:MM:SS format the 1st chapter MUST be 00:00:00.  '
     'If using -no-menu and passing just integer(s), then the value '
     'represents the chapter INTERVAL not the number of chapters',
-    Text(),
+    text='set with mplayer',
     side='top',
     filter=strip_all)
 
@@ -737,7 +666,8 @@
 ### --------------------------------------------------------------------
 
 # Burning options
-_burn = Flag('Burn project on completion', '-burn', False)
+_burn = Flag('Burn project', '-burn', False, 'Burn project on completion')
+_eject = Flag('Eject', '-eject', False, 'Eject DVD when burn complete')
 
 _speed = Number('Speed', '-speed', 8,
     'Speed for burning',
@@ -800,9 +730,7 @@
 """
 
 main =  VPanel('Basic',
-    Label('You can author (and burn) a DVD with a simple menu '
-          'using ONLY this "Basic" pane', 'center'),
-    _files_and_titles,
+    _heading,_files_and_titles,
     VPanel('',
         HPanel('',
             VPanel('Menu options',
@@ -812,14 +740,11 @@
                     _submenus, _ani_submenus, side='left')
             ),
             FlagGroup('TV System', 'exclusive', _ntsc, _pal),
-            VPanel('Chapters', Number('', '-chapters', 6,
-            'Number of chapters for each video.  '
-            'You can instead set chapters or time codes individually '
-            'for each video by using the "Chapters" tab on '
-            'the "Playback" tab.  Do NOT use both settings.',
-            1, 25, '', 'popup', 1), Label('per video')),
+            VPanel('Chapters', _chapters),
             VPanel('Burning',
+                HPanel('',
                 _burn,
+                _eject),
                 HPanel('',
                     _speed,
                     _device,
@@ -994,7 +919,8 @@
                 _thumb_shape,
                 _thumb_framesize,
                 _thumb_frame_color,
-                HPanel('', _thumb_columns, _align),
+                _thumb_columns,
+                _align,
                 ),
         ),
         VPanel("Showcase thumbnail",
@@ -1044,7 +970,6 @@
             _outlinewidth,
         ),
     ),
-    VPanel('Chapters', _chapters),
     VPanel('Grouped Videos', _group),
 )
 
@@ -1056,8 +981,8 @@
         tovid.AUDIO,
         tovid.BEHAVIOR,
     ),
-    SpacedText('Custom tovid options', '', '',

tovid-0.33.tar.bz2/libtovid/media.py -> tovid-0.34.tar.bz2/libtovid/media.py Changed

@@ -1,14 +1,8 @@
-"""This module provides a multimedia file class (MediaFile), for storing
-a profile of attributes including resolution, audio and video codecs and
-bitrates.
+"""This module provides a multimedia file class for storing a profile of
+attributes including resolution, audio and video codecs and bitrates.
 
-A function is also provided:
-
-    standard_media(format, tvsys)
-        Return a MediaFile profile matching the given format and TV system
-
-These can be used for getting a target MediaFile for encoding via
-one of the backends in libtovid.transcode.encode. For example::
+These can be used for getting a target `MediaFile` for encoding via
+one of the backends in :mod:`libtovid.backend`. For example::
 
     >>> dvd = standard_media('dvd', 'ntsc')
     >>> print(dvd)
@@ -33,7 +27,7 @@
 from libtovid.util import ratio_to_float
 
 # Analysis of MediaFile attributes
-# 
+#
 # acodec: ID, target
 # abitrate: ID, target
 # channels: ID
@@ -46,8 +40,8 @@
 # fps: ID, source, target
 # aspect: source
 # widescreen: target
-# 
-# 
+#
+#
 # Redundancies(?):
 # widescreen/aspect
 # scale/expand if aspect is known
@@ -103,7 +97,7 @@
 
 
 def standard_media(format, tvsys):
-    """Return a MediaFile compliant with a standard format and TV system.
+    """Return a `MediaFile` compliant with a standard format and TV system.
 
         format
             Standard format ('vcd', 'svcd', or 'dvd')
@@ -139,14 +133,14 @@
     aspect ratio, without distorting the picture.
 
         source
-            Input MediaFile
+            Input `MediaFile`
         target
-            Output MediaFile
+            Output `MediaFile`
         aspect
             Aspect ratio to assume for input file (e.g., '4:3', '16:9')
             or 'auto' to use autodetection based on source aspect
 
-    Return a new target MediaFile with correct scaling, using letterboxing
+    Return a new target `MediaFile` with correct scaling, using letterboxing
     if appropriate, and anamorphic widescreen if available (DVD only).
     """
     assert isinstance(source, MediaFile)

tovid-0.33.tar.bz2/libtovid/metagui/__init__.py -> tovid-0.34.tar.bz2/libtovid/metagui/__init__.py Changed

@@ -1,20 +1,37 @@
-"""A simplified GUI-writing module.
+"""This module provides a simpler way to create GUIs for command-line programs.
+
+Overview
+--------
+
+Command-line programs typically accept some number of *options*, many of which
+must be followed by some number of *arguments*. The arguments commonly represent
+filenames, numbers, text, fonts or colors, all of which should be displayed in
+a particular way in a GUI interface. This module was designed with many common
+option and argument types in mind.
+
+Each command-line option, and any arguments expected by it, are encapsulated in
+a `~control.Control`. Specialized controls exist for various kinds of options;
+for instance, one of the most common kinds is a `~control.Flag`, which simply
+enables or disables certain behavior. For instance, the ``ls`` program has an
+``-l`` flag for enabling a "long" output format. In metagui, this might be
+declared like::
+
+    Flag('Long listing', '-l')
+
 
-This module provides a simplified approach to creating GUIs for
-command-line programs. It's designed so _anyone_ can easily write their
-own GUI, without having any programming experience.
 
 It assumes your GUI is a direct frontend to one or more command-line programs,
 with each command-line option having an associated GUI control widget. Several
 kinds of widget are provided, for setting Filename, Color, Number or Font, or
 for picking a Choice or Flag.
 
-You probably know of a handful of command-line applications that would be
-much better with a GUI, even a cheesy-looking Tkinter one. This module makes
-it easy to create one.
+You probably know a handful of command-line applications that could benefit
+from a GUI, even a cheesy-looking Tkinter one. This module makes it easy to
+create one.
 
 
-DEFINE CONTROLS
+Define controls
+---------------
 
 Say, if you have a program that takes input and output filenames::
 
@@ -25,32 +42,32 @@
     Filename('Input filename', '-in')
     Filename('Output prefix', '-out')
 
-These have the general format:
+These have the general format::
 
     Control('Label', '-option', ...)
 
 where:
 
-    Control
-        is a Control subclass, such as Filename, Choice, or Number,
-        describing what type of value is being controlled;
-    '-option'
-        is a command-line option whose value is set by the Control; and
-    'Label'
-        is the text that should appear next to the GUI Control.
+    ``Control``
+        is a ``Control`` subclass appropriate to whatever is being controlled
+    ``'Label'``
+        is the text that should appear next to the GUI Control
+    ``'-option'``
+        is a command-line option whose value is set by the Control
 
 Other parameters include default value, help/tooltip text to show, allowable
 values, and hints about how to draw the GUI control widget; they are specific
-to the flavor of Control being used.    
+to the flavor of Control being used.
 
 For a full list of available Control subclasses and how to use them,
-see libtovid/metagui/control.py.
+see the `~libtovid.metagui.control` module.
 
 
-CREATING THE GUI
+Creating the GUI
+----------------
 
 Controls can be grouped together either vertically or horizontally (using a
-VPanel or HPanel, respectively)::
+`~libtovid.metagui.panel.VPanel` or `~libtovid.metagui.panel.HPanel`, respectively)::
 
     general = VPanel('General',
         Filename('Background audio file', '-bgaudio'),
@@ -59,17 +76,18 @@
         )
 
 This will create three GUI widgets in a panel labeled 'General': one for typing
-or browsing to a filename, one for enabling or disabling submenus, and another 
+or browsing to a filename, one for enabling or disabling submenus, and another
 for setting menu length to a number between 0 and 120. You can nest panels
 inside one another for grouping; sub-panels have their own label and list of
 Controls or sub-Panels.
 
-Once you have a panel, you can create an Application::
+Once you have a panel, you can create an `~libtovid.metagui.gui.Application`::
 
     app = Application('todisc', [general])
 
-This says your application will run the 'todisc' command-line program,
-passing options set by the 'General' panel. Now, create the GUI::
+This says your application will run the 'todisc' command-line program, passing
+options set by the 'General' panel. Now, create the
+`~libtovid.metagui.gui.GUI`::
 
     gui = GUI('MyGUI', [app])
     gui.run()
@@ -78,7 +96,8 @@
 program at the push of a button.
 
 
-CREATE A MULTI-PANEL GUI
+Create a multi-panel GUI
+------------------------
 
 If your program has a lot of options, one panel may not be enough to hold them
 all without looking cluttered, so you may break them down into multiple Panels,
@@ -102,6 +121,7 @@
 
 If multiple panels are given to Application, a tabbed interface is created,
 with one tab for each panel.
+
 """
 
 # Export everything from support, control, panel, and gui modules

tovid-0.33.tar.bz2/libtovid/metagui/control.py -> tovid-0.34.tar.bz2/libtovid/metagui/control.py Changed

@@ -1,83 +1,5 @@
-"""Control widget classes.
-
-This module defines a Control class and several derivatives. A Control is a
+"""This module defines a Control class and several derivatives. A Control is a
 special-purpose GUI widget for setting a value such as a number or filename.
-
-Control subclasses:
-
-    Choice
-        Multiple-choice selection, with radiobutton or dropdown style
-    Color
-        RGB color selection, with color picker
-    Filename
-        Filename selection, with filesystem browse button
-    Flag
-        Checkbox for enabling/disabling a flag-type option
-    FlagOpt
-        Flag option, taking an argument when enabled
-    Font
-        Font name chooser
-    Number
-        Numeric entry, with min/max and optional slide bar
-    Text
-        Plain text string
-    SpacedText
-        Plain text, interpreted as a space-separated list of strings
-    List
-        List of values, editable in another Control
-
-
-Option revamp ideas
-
-Need a way to handle positional arguments, where the position in the
-command-line does not necessarily correspond to the draw-order in the GUI.
-
-Currently, an empty '' option is used for positional arguments, which
-prevents them from having a global name. If instead, a convention were
-adopted for option strings, where:
-
-    List('Input files', '<in_files>', ...)
-
-would create a positional argument, where the order of positioning is
-defined somewhere else, like:
-
-    Application('grep', panel1, panel2, ...
-        expected = '[options] <in_files>')
-
-or ffmpeg:
-
-    _infile = Filename('Input file', '<infile>')
-    _outfile = Filename('Output file', '<outfile>')
-    _options = VPanel('Options', ...)
-
-    expected = '[options] <infile> [options] <outfile>'
-
-Would that work?
-
-Or tovid-batch, where -infiles is an option, but must come last:
-
-    expected = '[options] -infiles'
-
-How does '[options]' include everything _but_ -infiles?
-
-Focus on getting most of the tovid scripts metagui-ized, then go from there.
-
-Some options are like begin/end tokens:
-
-    makexml -group <file_list> -endgroup
-
-Some have complex expected followup options:
-
-    makexml -topmenu VIDEO \
-        -menu MENU1.mpg <file_list1> \
-        -menu MENU2.mpg <file_list2>
-
-How deep should metagui get into parsing all this?
-
-Shorthand for a FlagGroup of Flags might be handy:
-
-    format = FlagChoice('Format', '-vcd|-dvd|-svcd')
-
 """
 
 __all__ = [
@@ -158,7 +80,7 @@
 
     Control subclasses may have any number of sub-widgets such as labels,
     buttons or entry boxes; one of the sub-widgets should be linked to
-    self.variable like so:
+    self.variable like so::
 
         textbox = tk.Entry(self, textvariable=self.variable)
 
@@ -172,7 +94,7 @@
     @staticmethod
     def by_option(option):
         """Return the Control instance for a given option string,
-        or None if no Control has that option string.
+        or ``None`` if no Control has that option string.
         """
         if option != '' and option in Control.all:
             return Control.all[option]
@@ -191,6 +113,8 @@
                  **kwargs):
         """Create a Control for an option.
 
+        Arguments:
+
             vartype
                 Python type of stored variable
                 (str, bool, int, float, list, dict)
@@ -198,7 +122,7 @@
                 Label shown in the GUI for the Control
             option
                 Command-line option associated with this Control,
-                or '' to create a positional argument
+                or empty to create a positional argument
             default
                 Default value for the Control
             help
@@ -209,7 +133,7 @@
                 Position of label ('left' or 'top'). It's up to the
                 derived Control class to use this appropriately.
             kwargs
-                Keyword arguments of the form key1=arg1, key2=arg2
+                Keyword arguments of the form ``key1=arg1, key2=arg2``
 
         """
         Widget.__init__(self, label, **kwargs)
@@ -243,7 +167,7 @@
         """Draw the control widgets in the given master.
 
         Override this method in derived classes, and call the base
-        class draw() method:
+        class method::
 
             Control.draw(self, master)
 
@@ -297,7 +221,13 @@
         # self.variable isn't defined until draw() is called
         if not self.variable:
             raise NotDrawn("Can't get() from '%s'" % self.name)
-        return self.variable.get()
+        # In some strange cases (like a Number control with an empty Entry)
+        # the get() method can raise a ValueError. If so, just return the
+        # control's default value.
+        try:
+            return self.variable.get()
+        except ValueError:
+            return self.default
 
 
     def set(self, value):
@@ -336,7 +266,7 @@
 
     def get_args(self):
         """Return a list of arguments for passing this command-line option.
-        draw() must be called before this function.
+        `draw` must be called before this function.
         """
         args = []
         value = self.get()
@@ -371,6 +301,18 @@
         return args
 
 
+    def set_args(self, args):
+        """Set control options from the given list of command-line arguments,
+        and remove any successfully parsed options and arguments from ``args``.
+        """
+        # If this control's option is not in args, there's nothing to do
+        if self.option not in args:
+            return
+        # Get the index where the option appears
+        index = args.index(self.option)
+        # TODO
+
+
     def add_callback(self, callback):
         """Add a callback to this Control, which will be called anytime the
         Control's value is modified. The callback will be called with a single
@@ -431,19 +373,18 @@
             option
                 Command-line option to set
             default
-                Default choice, or '' to use first choice in list
+                Default choice, or empty to use first choice in list
             help
                 Help text to show in a tooltip
             choices
-                Available choices, in string form: 'one|two|three'
-                or list form: ['one', 'two', 'three'], or as a
-                list-of-lists: [['a', "Use A"], ['b', "Use B"], ..].
-                A dictionary is also allowed, as long as you don't
-                care about preserving choice order.
+                Available choices, in string form: ``one|two|three``, list
+                form ``['one', 'two', 'three']``, or as a list-of-lists
+                ``[['a', "Use A"], ['b', "Use B"], ..]``.  A dictionary is also
+                allowed, as long as you don't care about preserving order.

tovid-0.33.tar.bz2/libtovid/metagui/gui.py -> tovid-0.34.tar.bz2/libtovid/metagui/gui.py Changed

@@ -20,6 +20,8 @@
     from tkFileDialog import \
         (asksaveasfilename, askopenfilename)
     from tkMessageBox import showinfo, showerror
+    import Tix
+
 # Python 3.x
 except ImportError:
     import tkinter as tk
@@ -27,12 +29,13 @@
     from tkinter.filedialog import \
         (asksaveasfilename, askopenfilename)
     from tkinter.messagebox import showinfo, showerror
+    import tkinter.tix as Tix
 
 from libtovid import cli
 from libtovid.metagui.widget import Widget
 from libtovid.metagui.panel import Panel, Tabs
 from libtovid.metagui.support import \
-    (ConfigWindow, Style, ensure_type, askyesno)
+    (ConfigWindow, Style, ensure_type, askyesno, get_photo_image, show_icons)
 from libtovid.metagui.control import Control, NoSuchControl
 
 
@@ -60,25 +63,25 @@
         # Log output text area
         self.text = ScrolledText(self, width=1, height=1,
             highlightbackground='gray', highlightcolor='gray', relief='groove',
-            font=('Courier', 12, 'normal'))
+            font=('Nimbus Sans L', 12, 'normal'))
         self.text.pack(fill='both', expand=True)
         # Bottom frame to hold the next four widgets
-        frame = tk.Frame(self)
+        self.frame = tk.Frame(self)
         # Text area for stdin input to the program
-        label = tk.Label(frame, text="Input:")
+        label = tk.Label(self.frame, text="Input:")
         label.pack(side='left')
-        self.stdin_text = tk.Entry(frame)
+        self.stdin_text = tk.Entry(self.frame)
         self.stdin_text.pack(side='left', fill='x', expand=True)
         self.stdin_text.bind('<Return>', self.send_stdin)
         # Button to stop the process
-        self.kill_button = tk.Button(frame, text="Kill", command=self.kill)
+        self.kill_button = tk.Button(self.frame, text="Kill", command=self.kill)
         self.kill_button.pack(side='left')
         # Button to save log output
-        self.save_button = tk.Button(frame, text="Save log",
+        self.save_button = tk.Button(self.frame, text="Save log",
                                      command=self.save_log)
         self.save_button.pack(side='left')
         # Pack the bottom frame
-        frame.pack(anchor='nw', fill='x')
+        self.frame.pack(anchor='nw', fill='x')
         # Disable stdin box and kill button until execution starts
         self.stdin_text.config(state='disabled')
         self.kill_button.config(state='disabled')
@@ -97,17 +100,16 @@
         self.stdin_text.delete(0, 'end')
 
 
-    def execute(self, command, callback=lambda x:x):
-        """Execute the given command, and call the given callback when done.
+    def execute(self, command, callback=None):
+        """Execute the given `~libtovid.cli.Command`, and call the given callback when done.
         """
         if not isinstance(command, cli.Command):
             raise TypeError("execute() requires a Command instance.")
-        else:
-            self.command = command
-        if not hasattr(callback, '__call__'):
-            raise TypeError("execute() callback must be a function")
-        else:
-            self.callback = callback
+        if not callable(callback):
+            raise TypeError("execute() callback must be callable")
+
+        self.command = command
+        self.callback = callback
 
         # Temporary file to hold stdout/stderr from command
         name = self.command.program
@@ -145,12 +147,15 @@
         """Poll for process completion, and update the output window.
         """
         # Read from output file and print to log window
-        data = self.outfile.read()
-        if data:
-            # Split on newlines (but not on \r)
-            lines = data.split('\n')
-            for line in lines:
-                self.write(line)
+        try:
+            data = self.outfile.read()
+            if data:
+                # Split on newlines (but not on \r)
+                lines = data.split('\n')
+                for line in lines:
+                    self.write(line)
+        except ValueError:
+            pass
 
         # Stop if command is done, or poll again
         if self.command.done():
@@ -172,7 +177,7 @@
 
     def write(self, line):
         """Write a line of text to the end of the log.
-        If the line contains '\r', overwrite the current line.
+        If the line contains ``\\r``, overwrite the current line.
         """
         if '\r' in line:
             curline = self.text.index('end-1c linestart')
@@ -279,7 +284,7 @@
             save_button.pack(anchor='w', side='left', fill='x', expand=True)
             save_button.config(command=self.save_exit, text='Save to wizard')
             run_button.pack_forget()
-#            exit_button.pack_forget()
+            #exit_button.pack_forget()
 
 
     def get_args(self):
@@ -291,6 +296,15 @@
         return args
 
 
+    def set_args(self, args):
+        """Load application settings from a list of command-line arguments.
+        The list of args is modified in-place; if all args are successfully
+        parsed and loaded, the list will be empty when this method returns.
+        """
+        for panel in self.panels:
+            panel.set_args(args)
+
+
     def execute(self):
         """Run the program with all the supplied options.
         """
@@ -335,12 +349,14 @@
         else:
             showinfo(title="Script saved", message="Saved '%s'" % filename)
 
+
     def save_exit(self):
-        filename = os.getcwd() + '/todisc_commands.bash'
+        filename = os.getcwd() + os.path.sep + '%s_commands.bash' % self.program
         self.save_script(filename)
         # exit code borrowed from apache so wizard knows it has a file to read
         exit(200)
 
+
     def prompt_load_script(self):
         """Prompt for a script filename, then load current Control settings
         from that file.
@@ -404,6 +420,7 @@
         print("Done reading '%s'" % filename)
 
 
+    # TODO: Relocate all this stuff into Control and its subclasses
     def load_args(self, args):
         """Load settings from a list of command-line arguments.
         """
@@ -443,8 +460,10 @@
                 control.set(control.vartype(value))
 
 
-
-class GUI (tk.Tk):
+# This uses Tix.Tk as a base class, to allow Tix widgets within
+# (since for some reason a Tix.ComboBox doesn't like to be inside
+# a Tkinter.Tk root window)
+class GUI (Tix.Tk):
     """GUI with one or more Applications
     """
     def __init__(self, title, width, height, application, **kwargs):
@@ -461,9 +480,12 @@
 
         Keywords arguments accepted:
 
-            inifile:      Name of an .ini-formatted file with GUI configuration
+            inifile
+                Name of an .ini-formatted file with GUI configuration
+            icon
+                Full path to an image to use as the titlebar icon
         """
-        tk.Tk.__init__(self)
+        Tix.Tk.__init__(self)
 
         # Ensure that one or more Application instances were provided
         ensure_type("GUI needs Application", Application, application)
@@ -475,8 +497,9 @@
         self.width = width
         self.height = height
 
-        # Get style configuration from INI file
+        # Get keyword arguments
         self.inifile = kwargs.get('inifile', DEFAULT_CONFIG)
+        self.icon_file = kwargs.get('icon', None)
 
         self.style = Style()

tovid-0.33.tar.bz2/libtovid/metagui/panel.py -> tovid-0.34.tar.bz2/libtovid/metagui/panel.py Changed

@@ -19,24 +19,51 @@
 except ImportError:
     import tkinter as tk
 
+from libtovid import cli
 from libtovid.odict import Odict
 from libtovid.metagui.widget import Widget
 from libtovid.metagui.control import Control, Flag
 from libtovid.metagui.support import \
-    (ComboBox, ensure_type, divide_list)
+    (ComboBox, ensure_type, divide_list, get_photo_image)
 from libtovid.metagui.variable import ListVar
+from base64 import b64encode
 
 
 class Label (Widget):
     """A widget with a text label.
     """
-    def __init__(self, text='', justify='left'):
+    def __init__(self,
+                 text='',
+                 justify='left',
+                 image_file='',
+                 image_width=0,
+                 image_height=0):
         """Create a Label with the given text.
 
             text
                 String to appear in the Label
             justify
                 Text justification: 'left', 'center', or 'right'
+            image_file
+                Full path to image file. May be in any format that
+                'convert' supports.
+            image_width
+                Width in pixels to resize the image to
+            image_height
+                Height in pixels to resize the image to
+
+        Width and height may be used to scale the image in different ways:
+
+            width == 0, height == 0
+                Preserve the original image's size
+            width > 0, height == 0
+                Resize to the given width; height automatically
+                adjusts to maintain aspect ratio
+            width == 0, height > 0
+                Resize to the given height; width automatically
+                adjusts to maintain aspect ratio
+            width > 0, height > 0
+                Resize to exactly the given dimensions
         """
         Widget.__init__(self, text)
         self.text = text
@@ -44,19 +71,35 @@
             raise ValueError("Label justify argument must be 'left', 'center', "
                              "or 'right' (got '%s' instead)." % justify)
         self.justify = justify
-        # In addition to justify, anchor to nw, n, or ne
-        _anchors = {'left': 'nw', 'center': 'n', 'right': 'ne'}
-        self.anchor = _anchors[self.justify]
+        # Image attributes
+        self.image_file = image_file
+        self.image_width = image_width
+        self.image_height = image_height
         # Will be set by draw()
         self.label = None
+        self.image = None
 
 
     def draw(self, master, **kwargs):
         """Draw the Label in the given master.
         """
         Widget.draw(self, master, **kwargs)
-        self.label = tk.Label(self, text=self.text, justify=self.justify)
-        self.label.pack(anchor=self.anchor)
+        # If an image filename was provided, get a PhotoImage
+        if self.image_file:
+            photo_image = get_photo_image(self.image_file,
+                self.image_width, self.image_height, self.cget('background'))
+            # Keep a reference to the PhotoImage to prevent garbage collection
+            self.photo = photo_image
+            image_frame = tk.Frame(self, padx=4, pady=4)
+            self.image = tk.Label(image_frame, image=photo_image)
+            self.image.pack()
+            image_frame.pack(side='left', expand=False)
+
+        # Create and pack the label
+        self.label = tk.Label(self, text=self.text, justify=self.justify, padx=8)
+        # Set appropriate anchoring based on justification
+        _anchors = {'left': 'w', 'center': 'center', 'right': 'e'}
+        self.label.pack(expand=True, anchor=_anchors[self.justify])
 
 
 class Panel (Widget):
@@ -93,7 +136,7 @@
         # Get a labeled or unlabeled frame (labeled by default)
         if self.name and kwargs.get('labeled', True):
             self.frame = tk.LabelFrame(self, text=self.name,
-                                       padx=8, pady=8)
+                                       padx=4, pady=4)
         else:
             self.frame = tk.Frame(self)
         # Pack the frame
@@ -120,14 +163,20 @@
     def get_args(self):
         """Return a list of all command-line options from contained widgets.
         """
-        if not self.widgets:
-            return []
         args = []
         for widget in self.widgets:
             args += widget.get_args()
         return args
 
 
+    def set_args(self, args):
+        """Set panel options from the given list of command-line arguments,
+        and remove any successfully parsed options and arguments from ``args``.
+        """
+        for widget in self.widgets:
+            widget.set_args(args)
+
+
     def enable(self, enabled=True):
         """Enable all widgets in the Panel.
         """
@@ -138,7 +187,7 @@
 class HPanel (Panel):
     """A group of widgets or sub-panels, packed horizontally (left-to-right).
 
-    For example:
+    For example::
 
         HPanel("General",
             Filename(...),
@@ -162,7 +211,7 @@
 class VPanel (Panel):
     """A group of widgets or sub-panels, packed vertically (top-to-bottom).
 
-    For example:
+    For example::
 
         VPanel("General",
             Filename(...),
@@ -192,9 +241,9 @@
     corresponding Control is displayed, along with a "remove" button to
     discard the control.
     """
-    def __init__(self, name='', *widgets, **kwargs):
-        Panel.__init__(self, name, *widgets, **kwargs)
-        ensure_type("Dropdown contents must be Controls", Control, *widgets)
+    def __init__(self, name='', *controls, **kwargs):
+        Panel.__init__(self, name, *controls, **kwargs)
+        ensure_type("Dropdown contents must be Controls", Control, *controls)
         # Controls, indexed by label
         self.controls = Odict()
         for control in self.widgets:

tovid-0.33.tar.bz2/libtovid/metagui/support.py -> tovid-0.34.tar.bz2/libtovid/metagui/support.py Changed

@@ -1,10 +1,12 @@
-"""Supporting classes for metagui"""
+"""Supporting classes for metagui
+"""
 
 __all__ = [
     # Functions
     'exit_with_traceback',
     'ensure_type',
     'divide_list',
+    'get_photo_image',
     # Others
     'ScrollList',
     'DragList',
@@ -21,6 +23,7 @@
 import traceback
 import math
 import base64
+import re
 
 # Python < 3.x
 try:
@@ -28,12 +31,17 @@
     from tkSimpleDialog import Dialog
     import tkMessageBox
     from ConfigParser import ConfigParser
+    import Tix
+    import tkFont
+
 # Python 3.x
 except ImportError:
     import tkinter as tk
     from tkinter.simpledialog import Dialog
     import tkinter.messagebox as tkMessageBox
     from configparser import ConfigParser
+    import tkinter.tix as Tix
+    import tkinter.font as tkFont
 
 from libtovid import cli
 from libtovid.util import imagemagick_fonts
@@ -58,7 +66,7 @@
 
 def ensure_type(message, required_type, *objects):
     """Ensure that the given objects are of the required type.
-    If not, print a message and exit_with_traceback.
+    If not, print a message and call `exit_with_traceback`.
     """
     for obj in objects:
         if not isinstance(obj, required_type):
@@ -81,11 +89,11 @@
 
 
 def askyesno(title=None, message=None, **options):
-    """Show a popup with Yes / No options. Return True if Yes was clicked,
-    False if No was clicked.
+    """Show a popup with Yes / No options. Return ``True`` if Yes was clicked,
+    ``False`` if No was clicked.
 
     This function is to work around a bug in Tkinter 8.5 / Python 2.6, where
-    the askyesno function always returns False after a file dialog has been
+    the askyesno function always returns ``False`` after a file dialog has been
     displayed.
     """
     result = tkMessageBox._show(title, message,
@@ -97,6 +105,87 @@
         return False
 
 
+def get_photo_image(filename, width=0, height=0, background='', dither=False):
+    """Get a ``tk.PhotoImage`` from a given image file.
+
+        filename
+            Full path to the image file, in any format that 'convert'
+            understands
+        width
+            Desired image width in pixels
+        height
+            Desired image height in pixels
+        background
+            An '#RRGGBB' string for the desired background color.
+            Only effective for images with transparency.
+        dither
+            True to dither the image. May increase graininess.
+            Smallish images usually look better without dithering.
+
+    Width and height may be used to scale the image in different ways:
+
+        width == 0, height == 0
+            Preserve the original image's size
+        width > 0, height == 0
+            Resize to the given width; height automatically
+            adjusts to maintain aspect ratio
+        width == 0, height > 0
+            Resize to the given height; width automatically
+            adjusts to maintain aspect ratio
+        width > 0, height > 0
+            Resize to exactly the given dimensions
+    """
+    # Convert the image file to gif using 'convert'
+    cmd = cli.Command('convert')
+
+    # Pre-processing
+    # Dither if requested, otherwise disable
+    if dither:
+        cmd.add('-dither')
+    else:
+        cmd.add('+dither')
+    # Set the background color, if provided
+    if background:
+        cmd.add('-background', background)
+
+    cmd.add(filename)
+
+    # Post-processing
+    # Scale appropriately
+    if width > 0 and height == 0:
+        cmd.add('-resize', '%dx' % width)
+    elif width == 0 and height > 0:
+        cmd.add('-resize', 'x%d' % height)
+    elif width > 0 and height > 0:
+        cmd.add('-resize', '%dx%d!' % (width, height))
+
+    # If background color was set, flatten the image
+    if background:
+        cmd.add('-flatten')
+
+    # Convert to gif data
+    cmd.add('gif:-')
+
+    # Run the command, capturing the gif data from standard output
+    cmd.run(capture=True, silent=True)
+    gif_data = cmd.get_output()
+    # Create and return the PhotoImage from the gif data
+    return tk.PhotoImage(data=base64.b64encode(gif_data))
+
+
+def show_icons(window, image):
+    '''Show window manager icons for window, if supported.
+    The icon argument is full path to the image to be used.
+    '''
+    icon = get_photo_image(image, 32, 32)
+    try:
+        window.tk.call('wm', 'iconphoto', window._w, icon)
+    except tk.TclError:
+        print("Could not set window manager icons.  Maybe your "
+              "Tkinter (Tcl) is too old? Continuing anyway.")
+
+
+
 ### --------------------------------------------------------------------
 ### Classes
 ### --------------------------------------------------------------------
@@ -104,12 +193,12 @@
 class ScrollList (tk.Frame):
     """A Listbox with a scrollbar.
 
-    Similar to a tk.Listbox, a ScrollList shows a list of items. tk.Variables
-    may be associated with both the list of items, and the one that is currently
-    selected.
+    Similar to a ``tk.Listbox``, a ScrollList shows a list of items.
+    ``tk.Variable`` objects may be associated with both the list of items, and
+    the one that is currently selected.
     """
     def __init__(self, master=None, items=None,
-                 selected=None):
+                 selected=None, **kwargs):
         """Create a ScrollList widget.
 
             master
@@ -118,6 +207,13 @@
                 ListVar or Python list of items to show in listbox
             selected
                 Tk StringVar to store currently selected choice in
+
+        Keyword arguments:
+
+            width
+                Width of the listbox, in characters
+            height
+                Height of the listbox, in characters
         """
         tk.Frame.__init__(self, master)
 
@@ -132,7 +228,8 @@
         self.scrollbar = tk.Scrollbar(self, orient='vertical',
                                       command=self.scroll)
         self.listbox = tk.Listbox(self, listvariable=self.items,
-                                  width=30, height=7,
+                                  width=kwargs.get('width', 45),
+                                  height=kwargs.get('height', 7),
                                   yscrollcommand=self.scrollbar.set,
                                   exportselection=0)
         self.listbox.pack(side='left', fill='both', expand=True)
@@ -185,9 +282,9 @@
 
 
     def delete(self, first, last=None):
-        """Delete values in a given index range (first, last), not including
-        last itself. If last is None, delete only the item at first index.
-        Calls ``remove`` callbacks for each removed item.

tovid-0.33.tar.bz2/libtovid/metagui/variable.py -> tovid-0.34.tar.bz2/libtovid/metagui/variable.py Changed

@@ -1,7 +1,7 @@
 """Contains Tkinter Variable subclasses for List and Dict variables.
 
 This module exists to supplement the built-in Tkinter Variable types,
-which do not provide ``list`` and ``dict`` equivalents.
+which do not provide `list` and `dict` equivalents.
 """
 
 __all__ = [
@@ -137,7 +137,8 @@
 
 
     def get(self):
-        """Return the entire dictionary of keys/values as an Odict.
+        """Return the entire dictionary of keys/values as an
+        `~libtovid.odict.Odict`.
         """
         # Convert from tuple
         tup = tk.Variable.get(self)
@@ -149,8 +150,8 @@
 
 
     def set(self, new_dict):
-        """Set the entire dictionary of keys/values. If new_dict is empty, or
-        is not a ``dict`` or ``Odict``, an empty ``dict`` is used.
+        """Set the entire dictionary of keys/values. If ``new_dict`` is empty, or
+        is not a `dict` or `~libtovid.odict.Odict`, an empty `dict` is used.
         """
         if not isinstance(new_dict, dict) and not isinstance(new_dict, Odict):
             new_dict = {}

tovid-0.33.tar.bz2/libtovid/metagui/widget.py -> tovid-0.34.tar.bz2/libtovid/metagui/widget.py Changed

tovid-0.33.tar.bz2/libtovid/odict.py -> tovid-0.34.tar.bz2/libtovid/odict.py Changed

@@ -1,12 +1,14 @@
 # odict.py
 
-"""Ordered dictionary class, from a Python Cookbook recipe:
-
-    http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/107747
+"""Ordered dictionary class, from a recipe_ in the Python Cookbook.
 
+.. _recipe: http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/107747
 """
 
-__all__ = ['Odict']
+__all__ = [
+    'Odict',
+    'convert_list',
+]
 
 # Python < 3.x
 try:
@@ -16,7 +18,8 @@
     from collections import UserDict
 
 class Odict (UserDict):
-    """Ordered dictionary class, compatible with the builtin dict.
+    """Ordered dictionary class, compatible with the builtin `dict`.
+    The order in which items are added to the Odict is preserved.
     """
     def __init__(self, keys=None, values=None):
         """Create an Odict from the given keys and values.
@@ -29,13 +32,13 @@
         UserDict.__init__(self, dict(zip(keys, values)))
 
     def __delitem__(self, key):
-        """Delete the value from Odict[key].
+        """Delete the value from Odict[``key``].
         """
         UserDict.__delitem__(self, key)
         self._keys.remove(key)
 
     def __setitem__(self, key, item):
-        """Set Odict[key] = item.
+        """Set Odict[``key``] = ``item``.
         """
         UserDict.__setitem__(self, key, item)
         if key not in self._keys:
@@ -55,7 +58,7 @@
         return dict_copy
 
     def items(self):
-        """Return a list of (key, value) pairs, in order.
+        """Return a list of ``(key, value)`` pairs, in order.
         """
         return zip(self._keys, self.values())
 
@@ -70,7 +73,7 @@
         return [self.get(key) for key in self._keys]
 
     def popitem(self):
-        """Pop the last (key, value) pair from the Odict, and return it.
+        """Pop the last ``(key, value)`` pair from the Odict, and return it.
         """
         try:
             key = self._keys[-1]
@@ -96,7 +99,7 @@
         return result
 
     def update(self, other_dict, **kwargs):
-        """Update the Odict with values from another dict.
+        """Update the Odict with values from another `dict`.
         """
         UserDict.update(self, other_dict, **kwargs)
         for key in other_dict.keys():
@@ -113,19 +116,19 @@
 
 
 def convert_list(choices):
-    """Convert a list of choices to an Odict (ordered dictionary).
-    choices may be in one of several formats:
+    """Convert a list of choices to an `Odict` (ordered dictionary).
+    ``choices`` may be in one of several formats:
 
         string
-            'one|two|three'
+            ``'one|two|three'``
         list
-            ['one', 'two', 'three']
+            ``['one', 'two', 'three']``
         dict
-            {'a': "Choice A", 'b': "Choice B"}
+            ``{'a': "Choice A", 'b': "Choice B"}``
         list-of-lists
-            [['a', "Choice A"], ['b', "Choice B"], ..]
+            ``[['a', "Choice A"], ['b', "Choice B"], ..]``
 
-    Note: the dict form does not preserve order. Use list-of-lists
+    Note: the `dict` form does not preserve order. Use list-of-lists
     to maintain the specified order.
     """
     if type(choices) not in [str, list, dict]:
@@ -150,3 +153,4 @@
     else:
         raise TypeError("choices lists must either be"\
             "['a', 'b', 'c'] or [['a', 'A'], ['b', 'B']] style.")
+

tovid-0.33.tar.bz2/libtovid/render/animation.py -> tovid-0.34.tar.bz2/libtovid/render/animation.py Changed

@@ -1,15 +1,17 @@
 """This module provides classes and functions for working with animation.
 Two classes are provided:
 
-    Keyframe: A frame with a specific data value
-    Tween:    A data sequence interpolated from Keyframes
+    `Keyframe`
+        A frame with a specific data value
+    `Tween`
+        A data sequence interpolated from Keyframes
 
 The data being interpolated may represent color, opacity, location, or anything
 else that can be described numerically. Keyframe data may be scalar (single
-integers or decimal values) or vector (tuples such as (x, y) coordinates or
-(r, g, b) color values).
+integers or decimal values) or vector (tuples such as ``(x, y)`` coordinates or
+``(r, g, b)`` color values).
 
-For example, let's define three keyframes:
+For example, let's define three keyframes::
 
     >>> keys = [Keyframe(1, 0),
     ...         Keyframe(6, 50),
@@ -17,20 +19,20 @@
 
 The value increases from 0 to 50 over frames 1-6, then back down to 10
 over frames 6-12. The values at intermediate frames (2-5 and 7-11) can be
-interpolated or "tweened" automatically, using the Tween class:
+interpolated or "tweened" automatically, using the Tween class::
 
     >>> tween = Tween(keys)
     >>> tween.data
     [0, 10, 20, 30, 40, 50, 43, 36, 30, 23, 16, 10]
 
-Another example using tweening of (x, y) coordinates:
+Another example using tweening of ``(x, y)`` coordinates::
 
     >>> keys = [Keyframe(1, (20, 20)),
     ...         Keyframe(6, (80, 20)),
     ...         Keyframe(12, (100, 100))]
 
 Here, a point on a two-dimensional plane starts at (20, 20), moving first
-to the right, to (80, 20), then diagonally to (100, 100).
+to the right, to (80, 20), then diagonally to (100, 100)::
 
     >>> tween = Tween(keys)
     >>> for (x, y) in tween.data:
@@ -53,10 +55,10 @@
 
 __all__ = [
     'Keyframe',
+    'Tween',
     'lerp',
     'cos_interp',
     'interpolate',
-    'tween',
 ]
 
 import copy
@@ -65,7 +67,7 @@
 
 class Keyframe:
     """Associates a specific frame in an animation with a numeric value.
-    A Keyframe is a (frame, data) pair defining a "control point" on a graph::
+    A Keyframe is a ``(frame, data)`` pair defining a "control point" on a graph::
 
             100 |
                 |       Keyframe(10, 50)
@@ -78,14 +80,14 @@
     The data can represent anything you like. For instance, opacity::
 
             100 |* Keyframe(1, 100)
-                |       
+                |
      opacity(%) |
                 |
               0 |____________________* Keyframe(30, 0)
                 1     10     20     30
                         frame
 
-    See the Tween class below for what you can do with these Keyframes,
+    See the `Tween` class below for what you can do with these Keyframes,
     once you have them.
     """
     def __init__(self, frame, data):
@@ -102,25 +104,26 @@
 ### --------------------------------------------------------------------------
 
 def lerp(x, (x0, y0), (x1, y1)):
-    """Do linear interpolation between points (x0, y0), (x1, y1), and return
-    the 'y' of the given 'x'.
+    """Do linear interpolation between points ``(x0, y0)``, ``(x1, y1)``, and
+    return the ``y`` for the given ``x``.
 
     This form of interpolation simply connects two points with a straight
-    line. Blunt, but effective."""
+    line. Blunt, but effective.
+    """
     return y0 + (x - x0) * (y1 - y0) / (x1 - x0)
 
 
 def cos_interp(x, (x0, y0), (x1, y1)):
-    """Do cosine-based interpolation between (x0, y0), (x1, y1) and return
-    the 'y' of the given 'x'.
+    """Do cosine-based interpolation between ``(x0, y0)``, ``(x1, y1)`` and
+    return the ``y`` for the given ``x``.
 
     Essentially, a crude alternative to polynomial spline interpolation; this
     method transitions between two values by matching a segment of the cosine
     curve [0, pi] (for decreasing value) or [pi, 2*pi] (for increasing value)
     to the interval between the given points.
 
-    It gives smoother results at inflection points than linear interpolation, 
-    but will result in "ripple" effects if keyframes are too dense or many.   
+    It gives smoother results at inflection points than linear interpolation,
+    but will result in "ripple" effects if keyframes are too dense or many.
     """
     # Map the interpolation area (domain of x) to [0, pi]
     x_norm = math.pi * (x - x0) / (x1 - x0)
@@ -133,10 +136,9 @@
     return y_min + y_diff * (math.cos(x_norm) + 1) / 2.0
 
 
-def interpolate(frame, left, right, method):
-    """Interpolate data between left and right Keyframes at the given frame,
-    using the given interpolation method ('linear' or 'cosine'). Return the
-    value at the given frame.
+def interpolate(frame, left, right, method='linear'):
+    """Return the interpolated value at ``frame``, between two `Keyframe`
+    endpoints, using the given interpolation method ('linear' or 'cosine').
 
     The left and right Keyframes mark the endpoints of the curve to be
     interpolated. For example, if a value changes from 50 to 80 over the
@@ -159,6 +161,7 @@
         50
         >>> interpolate(40, left, right, 'linear')
         80
+
     """
     assert isinstance(left, Keyframe) and isinstance(right, Keyframe)
     # At or beyond endpoints, return endpoint value
@@ -191,6 +194,7 @@
             dim += 1
         return tuple(result)
 
+
 class Tween:
     """An "in-between" sequence, calculated by interpolating the data in a
     list of keyframes according to a given interpolation method.
@@ -215,29 +219,29 @@
         6
         >>> tween[8]
         19
+
     """
     def __init__(self, keyframes, method='linear'):
         """Create an in-between sequence from a list of keyframes. The
         interpolation method can be 'linear' or 'cosine'.
 
-        See effect.py for implementation examples.
+        See `libtovid.render.effect` for implementation examples.
         """
         for keyframe in keyframes:
             assert isinstance(keyframe, Keyframe)
         self.keyframes = keyframes
         self.start = self.keyframes[0].frame
         self.end = self.keyframes[-1].frame
-        self.data = []
         self.method = method
         # Do the tweening
-        self._tween()
+        self.data = self._calculate()
 
 
-    def _tween(self):
+    def _calculate(self):
         """Perform in-betweening calculation on the current keyframes and
-        fill self.data with tweened values, indexed by frame number.
+        return a list of tweened values, indexed by frame number.
         """
-        self.data = []
+        data = []
         # TODO: Sort keyframes in increasing order by frame number (to ensure
         # keyframes[0] is the first frame, and keyframes[-1] is the last frame)
         # Make a copy of keyframes
@@ -247,8 +251,7 @@
 
         # If keyframe interval is empty, use constant data from first keyframe
         if first == last:
-            self.data = keys[0].data
-            return
+            return keys[0].data
 
         # Pop off keyframes as each interval is calculated
         left = keys.pop(0)
@@ -257,13 +260,16 @@
         # Interpolate until the last frame is reached
         while frame <= last:
             value = interpolate(frame, left, right, self.method)
-            self.data.append(value)

tovid-0.33.tar.bz2/libtovid/render/drawing.py -> tovid-0.34.tar.bz2/libtovid/render/drawing.py Changed

@@ -124,21 +124,22 @@
     def __str__(self):
         return "%s%s" % (self.name, self.args)
 
+
 # Drawing class notes
-# 
-# The Drawing class has a number of methods (circle, rectangle, fill, stroke 
-# and many others) that need to operate on a Cairo surface. But we'd like to 
-# delay execution of actually drawing on that surface--otherwise, we can't 
+#
+# The Drawing class has a number of methods (circle, rectangle, fill, stroke
+# and many others) that need to operate on a Cairo surface. But we'd like to
+# delay execution of actually drawing on that surface--otherwise, we can't
 # easily render a given Drawing to a custom resolution.
-# 
-# Closures save the day here--that is, functions without "free variables". 
-# Anytime you "paint" on the Drawing, what's actually happening is a new 
-# function is getting created, whose sole purpose in life is to carry out that 
-# specific paint operation. These tiny, single-purpose functions are then 
-# added to a list of steps (self.steps) that will actually be executed at 
+#
+# Closures save the day here--that is, functions without "free variables".
+# Anytime you "paint" on the Drawing, what's actually happening is a new
+# function is getting created, whose sole purpose in life is to carry out that
+# specific paint operation. These tiny, single-purpose functions are then
+# added to a list of steps (self.steps) that will actually be executed at
 # rendering-time (i.e., when you do display() or save_png).
-# 
-# This not only lets us render a Drawing to different resolutions, but allows 
+#
+# This not only lets us render a Drawing to different resolutions, but allows
 # the possibility of rendering to different Cairo surfaces.
 
 class Drawing:
@@ -173,11 +174,13 @@
         if self.autodraw and step.name in ['fill', 'stroke']:
             display(self, 640, 480, True)
 
+
     def doStep(self, func, *args):
         """Add the given Step, and execute it."""
         self.addStep(func, *args)
         func(self.cr)
 
+
     def history(self):
         """Return a formatted string of all steps in this Drawing."""
         result = ''

tovid-0.33.tar.bz2/libtovid/render/effect.py -> tovid-0.34.tar.bz2/libtovid/render/effect.py Changed

@@ -22,7 +22,7 @@
     'Movement',
     'Translate',
     'Fade',
-    'FadeInOut'
+    'FadeInOut',
     'Colorfade',
     'Spectrum',
     'Scale',
@@ -88,19 +88,19 @@
 
 
 # New Effect template
-# 
+#
 # Copy and paste this code to create your own Effect
-# 
+#
 # The first line defines your effect's name. (Effect) means it inherits from
 # the base Effect class, and shares some properties with it.
 
 class MyEffect (Effect):
     """Modify this documentation string to describe what your effect does.
     """
-    # The __init__ function is called whenever a MyEffect is created. Make 
-    # sure your __init__ takes start and end arguments; additional arguments 
-    # (such as start_val and end_val below) allow someone using your effect 
-    # class to customize its behavior in some way. See the other effects below 
+    # The __init__ function is called whenever a MyEffect is created. Make
+    # sure your __init__ takes start and end arguments; additional arguments
+    # (such as start_val and end_val below) allow someone using your effect
+    # class to customize its behavior in some way. See the other effects below
     # for examples.
     def __init__(self, start, end, start_val, end_val):
         """Create a MyEffect lasting from start to end frame.
@@ -438,7 +438,7 @@
         frame 30).
 
         The 'method' argument defines an interpolation method to use between
-        keyframes, and may be either 'linear' or 'cosine'. 
+        keyframes, and may be either 'linear' or 'cosine'.
         """
         # Call base constructor with start and end frames
         Effect.__init__(self, keyframes[0].frame, keyframes[-1].frame)

tovid-0.33.tar.bz2/libtovid/render/layer.py -> tovid-0.34.tar.bz2/libtovid/render/layer.py Changed

tovid-0.33.tar.bz2/libtovid/util/__init__.py -> tovid-0.34.tar.bz2/libtovid/util/__init__.py Changed

@@ -1,8 +1,4 @@
 __all__ = [
-    # Submodules
-    'output',
-    'filetypes',
-    'playtime',
     # Functions
     'escape',
     'float_to_ratio',
@@ -33,9 +29,9 @@
 special_chars = '\\ #*:;&?!<>[]()"\''
 
 def safe_filename(filename, work_dir):
-    """Ensure the given filename is free of quirky or problematic characters.
-    If so, simply return the filename; if not, create a safe symlink in
-    work_dir to the original file, and return the symlink name.
+    """Ensure the given ``filename`` is free of quirky or problematic characters.
+    If so, simply return ``filename``; if not, create a safe symlink in
+    ``work_dir`` to the original file, and return the symlink name.
     """
     safename = filename
     for char in special_chars:
@@ -67,13 +63,26 @@
 
 def indent_level(line):
     """Return the number of leading whitespace characters in the line.
+    Tab, newline, and carriage-return characters each count as a single space.
+
+    For example::
+
+        >>> indent_level('      foo')
+        6
+        >>> indent_level('foo')
+        0
+        >>> indent_level('\\r\\n\\t foo')
+        4
+
     """
     return len(line) - len(line.lstrip())
 
 
 def trim(text):
     """Strip leading indentation from a block of text.
-    Borrowed from http://www.python.org/peps/pep-0257.html 
+    Borrowed from `PEP 257`_.
+    
+    .. _PEP 257: http://www.python.org/peps/pep-0257.html
     """
     if not text:
         return ''
@@ -103,12 +112,15 @@
 
 def ratio_to_float(ratio):
     """Convert a string expressing a numeric ratio, with X and Y parts
-    separated by a colon ':', into a decimal number.
+    separated by a colon ':', into a floating-point decimal number.
 
     For example::
 
         >>> ratio_to_float('4:3')
-        1.33333
+        1.3333333333333333
+
+        >>> ratio_to_float('16:9')
+        1.7777777777777777
 
     """
     values = ratio.split(':', 1)
@@ -122,17 +134,27 @@
 
 def float_to_ratio(number):
     """Convert a decimal number into an integer ratio string 'X:Y'.
-    Keeps three digits of precision.
+    Keeps three digits of precision. No attempt is made to find a
+    greatest common divisor.
+
+    For example::
+
+        >>> float_to_ratio(1.3333333333333333)
+        '1333:1000'
+
+        >>> float_to_ratio(16.0 / 9)
+        '1777:1000'
+
     """
-    numerator = float(number) * 1000
-    return "%g:1000" % numerator
+    numerator = int(number * 1000)
+    return "%d:1000" % numerator
 
 
 def tokenize(line, include_chars=''):
     """Separate a text line into tokens, returning them in a list. By default,
-    tokens are space-separated, and each token consists of [a-z], [A-Z], [0-9],
-    or any of '.:-%()/'. Additional valid token characters may be specified by
-    passing them in the include_chars string.
+    tokens are space-separated, and each token consists of ``[a-z]``,
+    ``[A-Z]``, ``[0-9]``, or any of ``.:-%()/``. Additional valid token
+    characters may be specified by passing them in the include_chars string.
     """
     lexer = shlex.shlex(line, posix = True)
     # Rules for splitting tokens
@@ -175,7 +197,7 @@
 
 def get_code_lines(filename):
     """Return a list of all lines of code in the given file.
-    Whitespace and #-style comments are ignored.
+    Whitespace and lines beginning with ``#`` are ignored.
     """
     infile = open(filename, 'r')
     codelines = []
@@ -188,9 +210,9 @@
 
 def get_file_type(filename):
     """Return 'image', 'audio', or 'video', if the given filename appears to be
-    any of those types; otherwise, return None. Determined by file's mimetype,
+    any of those types; otherwise, return ``None``. Determined by file's mimetype,
     which is based on filename extension, so possibly inaccurate. Returns
-    None for any directory or extensionless filename.
+    ``None`` for any directory or extensionless filename.
     """
     mimetype, encoding = mimetypes.guess_type(filename)
     # Get the base type (the part before '/')
@@ -233,7 +255,7 @@
 
 def imagemagick_version():
     """Return the version of ImageMagick that's currently installed,
-    as a list of integers (ex. [6, 3, 5, 10] for version 6.3.5.10).
+    as a list of integers (ex. ``[6, 3, 5, 10]`` for version 6.3.5.10).
     """
     command = 'convert -list configure | grep ^LIB_VERSION_NUMBER'
     lines = os.popen(command).readlines()

tovid-0.33.tar.bz2/libtovid/util/filetypes.py -> tovid-0.34.tar.bz2/libtovid/util/filetypes.py Changed

@@ -15,8 +15,8 @@
 
 
 def etc_mimetypes():
-    """Get mimetypes from /etc/mime.types and return a dict of {ext: typename}
-    in the same format as returned by mimetypes.types_map.
+    """Get mimetypes from ``/etc/mime.types`` and return a dict of ``{ext: typename}``
+    in the same format as returned by `mimetypes.types_map`.
     """
     if not os.path.exists('/etc/mime.types'):
         return {}
@@ -31,7 +31,7 @@
 
 
 def match_types(containing):
-    """Return a list of (type, extensions) tuples for matching mimetypes.
+    """Return a list of ``(type, extensions)`` tuples for matching mimetypes.
 
         containing
             String or list of strings to match
@@ -47,7 +47,7 @@
     to match any mimetype containing 'image' or 'mpeg'.
 
     The returned tuples are suitable for use as the 'filetypes' argument of
-    Tkinter file dialogs (askopenfilename etc.).
+    Tkinter file dialogs like `askopenfilename`.
     """
     if type(containing) == str:
         containing = [containing]
@@ -71,7 +71,7 @@
 
 def get_extensions(containing):
     """Return a space-separated string of all extensions for matching types.
-    Like match_types, but only return the extensions.
+    Like `match_types`, but only return the extensions.
     """
     type_dict = dict(match_types(containing))
     ext_list = type_dict.values()

tovid-0.33.tar.bz2/libtovid/util/output.py -> tovid-0.34.tar.bz2/libtovid/util/output.py Changed

@@ -1,14 +1,14 @@
 """This module does colored console output by calling color-named functions.
-To use it, simply:
+To use it, simply::
 
-    >>> print(green("Looking good"))
-    >>> print(red("Uh-oh..."))
+    print(green("Looking good"))
+    print(red("Uh-oh..."))
 
-It was stolen from an early version of a Gentoo module called output.py,
+It was stolen from an early version of a Gentoo module called ``output.py``,
 copyright 1998-2003 Daniel Robbins, Gentoo Technologies, Inc., distributed
-under the GNU GPL v2:
+under the GNU GPL v2::
 
-# $Header: /home/cvsroot/gentoo-src/portage/pym/output.py,v 1.16 \
+    # $Header: /home/cvsroot/gentoo-src/portage/pym/output.py,v 1.16 \
     2003/05/29 08:34:55 carpaski Exp $
 
 Modified for inclusion in libtovid.
@@ -29,7 +29,8 @@
     'yellow',
     'brown',
     'red',
-    'darkred']
+    'darkred',
+]
 
 codes = {
     'reset':     '\x1b[0m',
@@ -45,18 +46,24 @@
     'yellow':    '\x1b[33;01m',
     'brown':     '\x1b[33;06m',
     'red':       '\x1b[31;01m',
-    'darkred':   '\x1b[31;06m'}
+    'darkred':   '\x1b[31;06m',
+}
 
 _do_color = True
 
 def color(do_color):
-    """Turn colored output on (True) or off (False).
+    """Turn colored output on or off at a global level.
+    
+        do_color
+            ``True`` to enable colored output, ``False`` to disable
+
     """
     global _do_color
     _do_color = do_color
 
 def ctext(color, text):
-    """Return a string containing text in the given color."""
+    """Return a string containing text in the given color.
+    """
     if _do_color:
         return codes[color] + text + codes['reset']
     else:

tovid-0.33.tar.bz2/libtovid/util/playtime.py -> tovid-0.34.tar.bz2/libtovid/util/playtime.py Changed

@@ -1,7 +1,7 @@
 # -*- coding: utf8 -*-
 
 # Copyright 2007 Joe Friedrichsen <pengi.films@gmail.com>
-# 
+#
 # This file is part of tovid.
 
 """Relate a video's bitrate, size, and play time
@@ -13,7 +13,7 @@
     - Encoded (average) bitrate
 
 These are related by their units: ``bitrate = size / length``. This module
-provides ways to calculate these values. 
+provides ways to calculate these values.
 
 You can predict/calculate any one of these characteristics given the
 other two. By default, a new AVstream object assumes you want to find
@@ -33,7 +33,7 @@
 
 Usually when putting video on a disc, the final output size is well
 defined and non-changing. By default, AVstream fixes this characteristic so
-that you can see how the bitrate changes for different amounts of time on 
+that you can see how the bitrate changes for different amounts of time on
 that disc::
 
     >>> avs.set_play_length(180)
@@ -76,6 +76,7 @@
         - AVstream.bitrate.GiBph -- Gibibytes per hour
 
     There are four attributes:
+
         play_length
             the length of the video in minutes
         final_size

tovid-0.33.tar.bz2/libtovid/xml.py -> tovid-0.34.tar.bz2/libtovid/xml.py Changed

@@ -1,8 +1,8 @@
 """This module is for defining XML elements and attributes, and for creating
 element hierarchies.
 
-To create a new element, use the Element class constructor, providing at least
-the element name::
+To create a new element, use the `Element` constructor, providing at
+least the element name::
 
     >>> video = Element('video')
 
@@ -12,13 +12,13 @@
     <video></video>
 
 Since this is an empty element with no attributes yet, it's pretty boring.
-You can add or change attributes using the set method::
+You can add or change attributes using the `~Element.set` method::
 
     >>> video.set(file="Brian.mpg")
     >>> print(video)
     <video file="Brian.mpg"></video>
 
-To add children to an element, use the add method::
+To add children to an element, use the `~Element.add` method::
 
     >>> length = video.add('length', '15')
     >>> print(video)
@@ -26,7 +26,8 @@
       <length>15</length>
     </video>
 
-See author.py and spumux.py for additional examples.
+See `libtovid.author` and `libtovid.backend.spumux` for additional
+examples.
 """
 
 __all__ = ['Element']
@@ -34,10 +35,10 @@
 class Element (object):
     """A named XML element having optional content, attributes, and children.
 
-    Attribute values may be set in the constructor, or by calling set() with a
+    Attribute values may be set in the constructor, or by calling `set` with a
     dictionary and/or attribute=value keywords.
 
-    Use add() or add_child() to create a hierarchy of Elements.
+    Use `add` or `add_child` to create a hierarchy of Elements.
     """
     def __init__(self, name, content='', **attributes):
         """Create a new Element with the given attributes.
@@ -135,5 +136,3 @@
         return '</' + self.name + '>'
 
 
-
-

tovid-0.33.tar.bz2/setup.py -> tovid-0.34.tar.bz2/setup.py Changed

@@ -14,28 +14,35 @@
 At this time, there is no 'uninstall' mechanism...
 """
 
-import os
 
 def svn_version():
     """Return the current SVN revision number, as reported by 'svn info',
     as a string like 'svn-r1234'. If svn is not installed, or if something goes
     wrong, return 'svn-unknown'
     """
-    rev_line = os.popen('svn info 2>/dev/null | grep ^Revision').read()
-    # If rev_line is empty, either svn is missing or the command failed
+    from commands import getoutput
+    rev_line = getoutput('svn info 2>/dev/null | grep ^Revision')
+    # If rev_line is found, get the revision number
     if rev_line:
         return 'svn-r' + rev_line.split(':')[1].strip()
+    # If rev_line is empty, try using bzr instead
     else:
-        return 'svn-unknown'
+        rev_line = getoutput('bzr log -l 1 2>/dev/null | grep "^svn revno"')
+        # "svn revno: NNNN (on /trunk)"
+        if rev_line:
+            return 'svn-r' + rev_line.split(':')[1].strip().split(' ')[0]
+    # If all else fails...
+    return 'svn-unknown'
 
 # Current version number of tovid, as a string.
 # Examples:
 # Current SVN version number
 #_tovid_version = svn_version()
 # Official release number
-_tovid_version = '0.33'
+_tovid_version = '0.34'
 
 
+import os
 import sys
 import shutil
 from distutils.core import setup, Command
@@ -127,7 +134,8 @@
     user_options = []
 
     def initialize_options(self):
-        pass
+        self.source = os.path.join('docs', 'src', 'en', 'tovid.t2t')
+        self.target = os.path.join('docs', 'man', 'tovid.1')
 
     def finalize_options(self):
         pass
@@ -135,13 +143,14 @@
     def run(self):
         """Build the tovid manual page.
         """
-        source = 'docs/src/en/tovid.t2t'
-        target = 'docs/man/tovid.1'
         # Build only if target does not exist, or if source is newer than target
         mod = os.path.getmtime
-        if not os.path.exists(target) or (mod(source) > mod(target)):
-            command = 'txt2tags -t man -i "%s" -o "%s"' % (source, target)
+        if not os.path.exists(self.target) or (mod(self.source) > mod(self.target)):
+            print("Rebuilding tovid manual page")
+            command = 'txt2tags -t man -i "%s" -o "%s"' % (self.source, self.target)
             os.system(command)
+        else:
+            print("Manual page already built, not building again")
 
 
 class BuildTovidInit (Command):
@@ -149,27 +158,31 @@
     user_options = []
 
     def initialize_options(self):
-        pass
+        self.source = os.path.join('src', 'tovid-init.in')
+        self.target = os.path.join('src', 'tovid-init')
+        # Touch the source file to ensure that it gets rebuilt
+        os.utime(self.source, None)
 
     def finalize_options(self):
         pass
 
-
     def run(self):
         """Build src/tovid-init from tovid-init.in.
         """
-        source = 'src/tovid-init.in'
-        target = 'src/tovid-init'
         # We basically just need to replace @VERSION@ in tovid-init.in with
         # the current version of tovid.
         lines = [line.replace('@VERSION@', _tovid_version)
-                 for line in open(source, 'r')]
+                 for line in open(self.source, 'r')]
         # Write all lines to the target file
-        outfile = open(target, 'w')
+        outfile = open(self.target, 'w')
         outfile.writelines(lines)
         outfile.close()
 
 
+# Build tovid-init with regular 'build' command
+build.sub_commands.append(('build_tovid_init', None))
+#build.sub_commands.append(('build_docs', None))
+
 # The actual setup
 setup(
     name = 'tovid',
@@ -225,9 +238,11 @@
             'src/todiscgui',
             'src/tovid-stats',
             'src/titleset-wizard',
+            'src/set_chapters',
 
-            # Icon used by titleset wizard
-            'icons/tovid.gif',
+            # Icons used in the GUIs
+            'icons/hicolor/128x128/apps/tovid.png',
+            'icons/hicolor/128x128/apps/titleset-wizard.png',
 
             # Config file
             'src/tovid.ini',
@@ -237,22 +252,37 @@
          ['docs/man/tovid.1']),
         # Desktop shortcut
         ('share/applications',
-         ['tovidgui.desktop']),
+         ['tovidgui.desktop',
+         'titleset-wizard.desktop']),
         # Icons
         ('share/icons/hicolor/scalable/apps',
-         ['icons/hicolor/scalable/apps/tovid.svg',
-          'icons/hicolor/scalable/apps/tovid_bw.svg',
-          'icons/hicolor/scalable/apps/disc.svg',
-          'icons/hicolor/scalable/apps/cd.svg',
+         [
+             'icons/hicolor/scalable/apps/tovid.svg',
+             'icons/hicolor/scalable/apps/titleset-wizard.svg',
+             'icons/hicolor/scalable/apps/tovid_bw.svg',
+             'icons/hicolor/scalable/apps/disc.svg',
+             'icons/hicolor/scalable/apps/cd.svg',
          ]),
         ('share/icons/hicolor/128x128/apps',
-         ['icons/hicolor/128x128/apps/tovid.png']),
+         [
+             'icons/hicolor/128x128/apps/tovid.png',
+             'icons/hicolor/128x128/apps/titleset-wizard.png',
+         ]),
         ('share/icons/hicolor/64x64/apps',
-         ['icons/hicolor/64x64/apps/tovid.png']),
+         [
+             'icons/hicolor/64x64/apps/tovid.png',
+             'icons/hicolor/64x64/apps/titleset-wizard.png',
+         ]),
         ('share/icons/hicolor/48x48/apps',
-         ['icons/hicolor/48x48/apps/tovid.png']),
+         [
+             'icons/hicolor/48x48/apps/tovid.png',
+             'icons/hicolor/48x48/apps/titleset-wizard.png',
+         ]),
         ('share/icons/hicolor/32x32/apps',
-         ['icons/hicolor/32x32/apps/tovid.png']),
+         [
+             'icons/hicolor/32x32/apps/tovid.png',
+             'icons/hicolor/32x32/apps/titleset-wizard.png',
+         ]),
     ]
 )

tovid-0.33.tar.bz2/src/idvid -> tovid-0.34.tar.bz2/src/idvid Changed

@@ -126,10 +126,10 @@
             echo $SEPARATOR
             echo "Identifying video with mplayer..."
             echo $SEPARATOR
-            mplayer -vo null -ao null -frames 30 -channels 6 -identify \
+            mplayer -nomsgcolor -vo null -ao null -frames 30 -channels 6 -identify \
                 -noconsolecontrols "$INFILE" 2>&1 | tee -a "$SCRATCH_FILE"
         else
-            mplayer -vo null -ao null -frames 30 -channels 6 -identify \
+            mplayer -nomsgcolor -vo null -ao null -frames 30 -channels 6 -identify \
                 -noconsolecontrols "$INFILE" > "$SCRATCH_FILE" 2>&1
         fi
     fi
@@ -209,6 +209,8 @@
     # (If you've got a problem with eval, give me an alternative that
     # works as well and is as readable :-) ... but no less safe :(
     # DONE :)
+    # get array of mplayer audio ids, used if no hextracks from ffmpeg
+    while read; do MPL_AIDS+=(${REPLY##*=}); done < <(grep ID_AUDIO_ID "$SCRATCH_FILE")
 
     ID_VIDEO_FRAMES=$(grep 'length:' "$SCRATCH_FILE" | \
         awk -F ' ' '{print $2}')
@@ -241,13 +243,13 @@
     ID_VIDEO_TRACK="${ID_VIDEO_TRACKS[0]}"
     # Find out what audio channels are available
     if test -n "$ID_AUDIO_ID"; then
-        AUDIO_INFO=$(grep "Audio:" "$SCRATCH_FILE")
+        AUDIO_INFO=$(grep -w "Audio:" "$SCRATCH_FILE")
         # ID_AUDIO_ID needs "TRACKS" var to remain in columns
         TRACKS=$(sed -r 's/.*Stream #([0-9]\.[0-9]+).*/\1/' <<< "$AUDIO_INFO")
         A_TRACKS=(${TRACKS//$'\n'/ })
         # Get hexadecimal track IDs, if present
         if grep -q "\[0x[0-9a-fA-F]*]" <<< $AUDIO_INFO; then
-            HEX_TRACKS=$(sed -r 's/Stream .*\[0x([0-9a-fA-F]*)]:.*$/\1/' <<< "$AUDIO_INFO")
+            HEX_TRACKS=$(awk -F [][] '{gsub("0x", ""); print $2}' <<< "$AUDIO_INFO")
             HEX_TRACKS=(${HEX_TRACKS//$'\n'/ })
             USE_HEX_TRACKS=:
         else
@@ -258,25 +260,26 @@
             CUR_CHAN=$(grep "Stream #${A_TRACKS[i]}" <<< "$AUDIO_INFO")
             A_SAMPRATES=("${A_SAMPRATES[@]}" "$(echo $CUR_CHAN | \
                 sed -r 's/.* ([0-9]+) Hz.*/\1/')")
+            ! test_is_number ${A_SAMPRATES[i]} && A_SAMPRATES[i]=?
             A_BITRATES=("${A_BITRATES[@]}" "$(echo $CUR_CHAN | \
                 sed -r 's/.* ([0-9]+) kb\/s.*/\1/')")
             # make sure the above is a number, else set  A_BITRATE to 0
-            if ! test_is_number ${A_BITRATES[i]}; then
-                A_BITRATES[i]=0
-            fi
+            ! test_is_number ${A_BITRATES[i]} && A_BITRATES[i]=0
             A_CODECS=("${A_CODECS[@]}" "$(echo $CUR_CHAN | \
                 sed -r 's/.*Audio: ([^,]+),.*/\1/')")
-                if $USE_HEX_TRACKS; then
+            if $USE_HEX_TRACKS; then
                 MP_TRACKNUM=$((16#${HEX_TRACKS[i]}))
             else
-                MP_TRACKNUM=$i
+                # use aids from mplayer output instead of hex tracks
+                MP_TRACKNUM=${MPL_AIDS[i]}
             fi
+            ID_AUDIO_IDS="$ID_AUDIO_IDS ${MP_TRACKNUM//$'\n'/ }"
 
             # last ditch efforts to get audio bitrate if we still don't have it
             if test ${A_BITRATES[i]} -eq 0; then
-                MP_ABITRATE=$(mplayer -vo null -ao null -frames 30 -channels 6 -identify \
-                -aid $MP_TRACKNUM -noconsolecontrols "$INFILE" 2>&1 |
-                grep ID_AUDIO_BITRATE|awk -F=  'END{print $2}')
+                MP_ABITRATE=$(mplayer -nomsgcolor -vo null -ao null -frames 30 \
+                -channels 6 -identify -aid $MP_TRACKNUM -noconsolecontrols \
+                "$INFILE" 2>&1 | grep ID_AUDIO_BITRATE|awk -F=  'END{print $2}')
                 if test_is_number $MP_ABITRATE; then
                     MP_ABITRATE=${MP_ABITRATE%.*}
                     A_BITRATES[i]=${MP_ABITRATE/000*}
@@ -288,12 +291,15 @@
             fi
             A_HEX_TRACKS=("${A_HEX_TRACKS[@]}" "$MP_TRACKNUM")
         done
+        # use comma separator and remove possible leading comma
+        ID_AUDIO_IDS=${ID_AUDIO_IDS// /,}
+        ID_AUDIO_IDS=${ID_AUDIO_IDS#,}
         # read output of grep into AUDIO_NCH array to get Audio: lines
         if [[ -n $ID_AUDIO_ID ]]; then
-            O=$IFS IFS=$'\n' AUDIO_NCH=($(grep Audio: "$SCRATCH_FILE")) IFS=$O
+            O=$IFS IFS=$'\n' AUDIO_NCH=($(grep -w Audio: "$SCRATCH_FILE")) IFS=$O
             for chn in ${!AUDIO_NCH[@]}; do
                 # TODO flesh this out with other possibilities: 7.1 etc
-                if grep -q 5:1 <<<  ${AUDIO_NCH[chn]}; then
+                if egrep -q '5:1|5.1' <<<  ${AUDIO_NCH[chn]}; then
                     ID_AUDIO_NCH[chn]=6
                elif grep -q channels <<< ${AUDIO_NCH[chn]}; then
                     ID_AUDIO_NCH[chn]=$(sed -r 's/.* ([0-9]+) channels.*/\1/' \
@@ -370,32 +376,49 @@
         if $FAST; then # skip this long process
             USE_MENCODER=false  # USE_NAV_LOG already set to false
         else
-            # check if tcdemux installed, and if extension is mpg (use mencoder for vob)
-            if [[ ${INFILE##*.} =~ [MmPpGg] ]] && hash tcdemux 2>/dev/null &&  [[ ${ID_VIDEO_FPS%%.*} -ne 0 ]]; then
+            # check if tcdemux present, and if mpg extension (vob uses mencoder)
+            if grep -qi mpg <<< "${INFILE##*.}" && hash tcdemux 2>/dev/null && \
+              [[ ${ID_VIDEO_FPS%%.*} -ne 0 ]]; then
                 NAVSEEK_CMD=(nice tcdemux  -f $ID_VIDEO_FPS -W -i "$INFILE")
-                "${NAVSEEK_CMD[@]}"  >  "$NAV_LOG" 2>/dev/null
-                if [[ -s  "$NAV_LOG" ]]; then # if non empty lets use it
-                    USE_MENCODER=false
-                    USE_NAVLOG=:
-                else
-                    # remove empty log and we will use mencoder in next code block
-                    [[ -e "$NAV_LOG" ]] && rm -f "$NAV_LOG"
-                    USE_MENCODER=:
-                fi
-            else # not $FAST and using tcdemux not possible, so usee mencoder
+            # or check if aviindex installed, and if extension is avi
+            elif grep -qi avi <<< "${INFILE##*.}" && hash aviindex 2>/dev/null && \
+              [[ ${ID_VIDEO_FPS%%.*} -ne 0 ]]; then
+                NAVSEEK_CMD=(nice aviindex -x -i "$INFILE" -o "$NAV_LOG")
+            else # not $FAST and indexing not possible, so use mencoder
+                USE_MENCODER=:
+            fi
+        fi
+        if [[ "${NAVSEEK_CMD[@]}" ]]; then
+            "${NAVSEEK_CMD[@]}"  >  "$NAV_LOG" 2>/dev/null
+            if [[ -s  "$NAV_LOG" ]]; then # if non empty lets use it
+                USE_MENCODER=false
+                USE_NAVLOG=:
+            else
+                # remove empty log and we will use mencoder in next code block
+                [[ -e "$NAV_LOG" ]] && rm -f "$NAV_LOG"
                 USE_MENCODER=:
             fi
         fi
     fi
+    # set variables from NAV_LOG results
     if $USE_NAVLOG; then
-        ID_VIDEO_FRAMES=$(cat "$NAV_LOG" | awk 'END{print NR}')
-        V_DUR=$(bc <<< "$ID_VIDEO_FRAMES / $ID_VIDEO_FPS")
-        V_DURATION=${V_DUR%%.*} # final value is integer ( seconds )
+        if grep -qi mpg <<< "${INFILE##*.}"; then
+            ID_VIDEO_FRAMES=$(cat "$NAV_LOG" | awk 'END{print NR}')
+            V_DUR=$(bc <<< "$ID_VIDEO_FRAMES / $ID_VIDEO_FPS")
+            V_DURATION=${V_DUR%%.*} # final value is integer ( seconds )
+        else
+            V_DURATION=$(awk '($2==1) { field = $NF }; END{ print field/1000 }' "$NAV_LOG")
+            ID_VIDEO_FRAMES=$(bc <<< "$V_DURATION * $ID_VIDEO_FPS")
+            ID_VIDEO_FRAMES=${ID_VIDEO_FRAMES%%.*}
+            # final value is in seconds
+            V_DURATION=${V_DURATION%%.*} # integer
+        fi
+        # if no usable value, use mencoder
+        { ! test_is_number $V_DURATION || ((V_DURATION == 0)) ; } && USE_MENCODER=:
     fi
-
-    if $USE_MENCODER; then # any of: no/empty log file, ! $FAST, no tcdemux, or not an mpg
-        # Determine duration by playing the video into /dev/null
-        # Time consuming, but presumably more accurate.
+    # find duration by playing the video with mencoder into /dev/null
+    # any of: no/empty log file, ! $FAST, no tcdemux/aviindex, or not an mpg/avi
+    if $USE_MENCODER; then
         MENCODER_STATS=$(LC_ALL=C mencoder -ovc copy -nosound -noskiplimit \
         "$INFILE" -o /dev/null 2>/dev/null)
         V_DURATION=$(awk 'END{print $(NF-3)}' <<< "$MENCODER_STATS")
@@ -482,6 +505,7 @@
         echo "ID_AUDIO_NCH=$ID_AUDIO_NCH"
         echo "ID_AUDIO_TRACKS=$ID_AUDIO_TRACKS"
         echo "ID_VIDEO_TRACK=$ID_VIDEO_TRACK"
+        echo "ID_AUDIO_IDS=$ID_AUDIO_IDS"
         echo "ID_AUDIO_RATE=$ID_AUDIO_RATE"
         echo "V_ASPECT_WIDTH=$V_ASPECT_WIDTH"
         echo "ID_VIDEO_FRAMES=$ID_VIDEO_FRAMES"
@@ -745,6 +769,10 @@
                         test "$V_TV" = "PAL" && MATCH=:
                     fi
                     ;;
+                * )
+                    usage_error "'$MATCH_FORMAT' \
+                        is not a recognized argument to '-isformat'"
+                    ;;
             esac
         fi

tovid-0.33.tar.bz2/src/makedvd -> tovid-0.34.tar.bz2/src/makedvd Changed

@@ -54,6 +54,7 @@
 
   -author              Create DVD filesystem from FILE.xml
   -burn                Burn DVD filesystem from DVD_DIR
+  -eject               Eject the DVD tray after burning
   -device DEVFS_NAME   DVD recorder device name (Default: /dev/dvdrw)
   -speed NUM           Burn speed (Default: automatic)
   -label DISC_LABEL    Disc label (Default: base name of FILE)
@@ -105,6 +106,9 @@
 BURN_SPEED=""
 OUT_DIR="makedvd_out"
 DISC_LABEL=""
+# Undocumented growisofs feature to prevent ejecting after burning
+# (Default behavior of growisofs is to reload the tray after burning)
+PREVENT_EJECT="-use-the-force-luke=notray"
 
 # Grab DVD media information
 # Returns nothing, but sets the 'global' variables
@@ -181,8 +185,8 @@
     usage_error "Please provide a filename (.xml, or dvd filesystem folder)"
 fi
 # check for valid DVD burner.  This may fail but at least we tried
-OIFS=$IFS \
-IFS=$'\n' device=($(find -L /dev -type b -name 'dvdrw*' 2>/dev/null )) IFS=$OIFS
+OIFS=$IFS IFS=$'\n' device=\
+($(find -L /dev  -maxdepth 1 -type b -name 'dvdrw*' 2>/dev/null )) IFS=$OIFS
 DVDRW_DEVICE=${device:-$DVDRW_DEVICE}
 
 while test $# -gt 1; do
@@ -191,6 +195,9 @@
         "-noask" ) NOASK=: ;;
         "-author" ) DO_AUTHOR=: ;;
         "-burn" )   DO_BURN=: ;;
+        "-eject" )
+            PREVENT_EJECT=""
+            ;;
         "-device" )
             # Get device name
             shift
@@ -321,6 +328,24 @@
        echo "Current DVD image is ${DISC_SUM}MB."
     fi
 
+    # dvdauthor program needs VIDEO_FORMAT set or it will give warnings
+    if grep -q 'format="ntsc"' "$DVDAUTHOR_XML"; then
+        export VIDEO_FORMAT=ntsc
+    elif grep -q 'format="pal"' "$DVDAUTHOR_XML"; then
+        export VIDEO_FORMAT=pal
+    elif [[ $VIDEO_FORMAT ]]; then # allow user set env value otherwise
+        :
+    else
+        export VIDEO_FORMAT=ntsc
+        echo -e '\n***'
+        echo "No default video format defined!!!"
+        echo "Was this xml created by a recent version of tovid/makexml?"
+        echo "Using default video format of 'ntsc'."
+        echo "Run 'export VIDEO_FORMAT=\"pal\"' if this is wrong for your disc."
+        echo -e '\n***'
+        sleep 10
+    fi
+
     # Create disc structure
     DVDAUTHOR_CMD="dvdauthor -x \"$DVDAUTHOR_XML\""
     echo $SEPARATOR
@@ -444,7 +469,7 @@
     fi
 
     # Burn it already!
-    BURN_CMD="growisofs -use-the-force-luke=dao -dvd-compat $BURN_SPEED -Z $DVDRW_DEVICE -dvd-video -V \"$VOLID\" \"$OUT_DIR\""
+    BURN_CMD="growisofs -use-the-force-luke=dao $PREVENT_EJECT -dvd-compat $BURN_SPEED -Z $DVDRW_DEVICE -dvd-video -V \"$VOLID\" \"$OUT_DIR\""
     echo $SEPARATOR
     echo "Burning with growisofs $GROWISOFS_VER using the following command:"
     echo "$BURN_CMD"

tovid-0.33.tar.bz2/src/makemenu -> tovid-0.34.tar.bz2/src/makemenu Changed

@@ -7,7 +7,7 @@
 echo -e "Please run makemenu as:\ntovid menu OPTIONS"
 exit 1 ; }
 
-# version $Id: makemenu 3060 2010-05-18 06:07:22Z wapcaplet88 $
+# version $Id: makemenu 3336 2011-06-30 21:49:22Z grepper $
 # makemenu
 # Part of the tovid suite
 # =======================
@@ -152,6 +152,12 @@
 else
     IM_LISTARG='type'
 fi
+# imagemagick's font listing structure depends on version
+if test_version $IM_VERSION 6.4.0.0; then
+    im_field=2
+else
+    im_field=1
+fi
 PPM_OPTS="-S $CHROMA_MODE -A 10:11 -F 30000:1001"
 # Direct stuff to /dev/null
 REDIR="/dev/null"
@@ -458,14 +464,14 @@
     # Check to see if the given font name is available in ImageMagick
     # (only return the first exact match)
     USE_TITLE_FONT=$( convert -list $IM_LISTARG | \
-    grep -m 1 "$TITLE_FONT" | awk '{print $1}' )
+    grep -m 1 "$TITLE_FONT" | awk -v f=$im_field '{print $f}' )
 
    # If not available, try to use something similar
     if test -z $USE_TITLE_FONT ; then
         echo $SEPARATOR
         echo "Font: \"$TITLE_FONT\" does not appear to be either a font file or registered with ImageMagick."
         USE_TITLE_FONT=$( convert -list $IM_LISTARG | \
-        grep -i -m 1 "${TITLE_FONT:0:20}" | awk '{print $1}' )
+        grep -i -m 1 "${TITLE_FONT:0:20}" | awk -v f=$im_field '{print $f}' )
 
         # If a similarly-named one does't exist, default to Helvetica
         if test -z "$USE_TITLE_FONT"; then
@@ -490,14 +496,14 @@
         # Check to see if the given button font is available in ImageMagick
         # (only return the first exact match)
         USE_BUTTON_FONT=$( convert -list $IM_LISTARG | \
-        grep -m 1 "$BUTTON_FONT" | awk '{print $1}' )
+        grep -m 1 "$BUTTON_FONT" | awk -v f=$im_field '{print $f}' )
 
         # If not available, try to use something similar
         if test -z $USE_BUTTON_FONT ; then
             echo $SEPARATOR
             echo "Button: \"$BUTTON_FONT\" does not appear to be either a font file or registered with ImageMagick."
             USE_BUTTON_FONT=$( convert -list $IM_LISTARG | \
-            grep -i -m 1 "${BUTTON_FONT:0:20}" | awk '{print $1}' )
+            grep -i -m 1 "${BUTTON_FONT:0:20}" | awk -v f=$im_field '{print $f}' )
 
             # If a similarly-named one does't exist, default to Helvetica
             if test -z "$USE_BUTTON_FONT"; then
@@ -532,7 +538,7 @@
 #
 
 # Measure the font's vertical height
-TILE_HEIGHT=$(convert -size 720x200 xc:none -fill white -pointsize $TITLE_SIZE -font $TITLE_FONT -antialias $FONT_DECO -annotate +20+80 "Al" -trim +repage info: | awk '{print $3}' | awk -F 'x' '{print $2}')
+TILE_HEIGHT=$(convert -format %h -size 720x200 xc:none -fill white -pointsize $TITLE_SIZE -font $TITLE_FONT -antialias $FONT_DECO -annotate +20+80 "Al" -trim +repage info:)
 
 let "TILE_HEIGHT=TILE_HEIGHT+TITLE_BOTTOM_SPACE"
 
@@ -547,7 +553,7 @@
         ENTRY="${j}. ${TITLES[i]}"
 
         # Get the width of text and pad it
-        TILE_WIDTH=$(convert -size 720x200 xc:none -fill $TEXT_COLOR -pointsize $TITLE_SIZE -font $TITLE_FONT -antialias $FONT_DECO -annotate +20+80 "$ENTRY" -trim +repage info: | awk '{print $3}' | awk -F 'x' '{print $1}')
+        TILE_WIDTH=$(convert -format %w -size 720x200 xc:none -fill $TEXT_COLOR -pointsize $TITLE_SIZE -font $TITLE_FONT -antialias $FONT_DECO -annotate +20+80 "$ENTRY" -trim +repage info:)
         let "TILE_WIDTH=TILE_WIDTH+TITLE_LEFT_SPACE"
 
         # Draw the text, and put it on a blank tile
@@ -561,7 +567,7 @@
         ENTRY="${TITLES[i]}"
 
         # Get the width of the text and pad it
-        TILE_WIDTH=$(convert -size 720x200 xc:none -fill $TEXT_COLOR -pointsize $TITLE_SIZE -font $TITLE_FONT -antialias $FONT_DECO -annotate +20+80 "$ENTRY" -trim +repage info: | awk '{print $3}' | awk -F 'x' '{print $1}')
+        TILE_WIDTH=$(convert -format %w -size 720x200 xc:none -fill $TEXT_COLOR -pointsize $TITLE_SIZE -font $TITLE_FONT -antialias $FONT_DECO -annotate +20+80 "$ENTRY" -trim +repage info:)
         let "TILE_WIDTH=TILE_WIDTH+TITLE_LEFT_SPACE"
 
         # Draw the text, and put it on a blank tile
@@ -583,9 +589,8 @@
     echo "Making the DVD buttons...   "
 
     # Get the dimensions of the button
-    TILE_WIDTH=$(convert -size 720x200 xc:none -fill white -stroke $BTN_STROKE -strokewidth 1 -pointsize $TITLE_SIZE -font $BUTTON_FONT +antialias -weight bold -annotate +20+80 "$BUTTON_CHAR" -trim +repage info: | awk '{print $3}' | awk -F 'x' '{print $1}')
-    BUTTON_HEIGHT=$(convert -size 720x200 xc:none -fill white -stroke $BTN_STROKE -strokewidth 1 -pointsize $TITLE_SIZE -font $BUTTON_FONT +antialias -weight bold -annotate +20+80 "$BUTTON_CHAR" -trim +repage info: | awk '{print $3}' | awk -F 'x' '{print $2}')
-
+    TILE_WIDTH=$(convert -format %w -size 720x200 xc:none -fill white -stroke $BTN_STROKE -strokewidth 1 -pointsize $TITLE_SIZE -font $BUTTON_FONT +antialias -weight bold -annotate +20+80 "$BUTTON_CHAR" -trim +repage info:)
+    BUTTON_HEIGHT=$(convert -format %w -size 720x200 xc:none -fill white -stroke $BTN_STROKE -strokewidth 1 -pointsize $TITLE_SIZE -font $BUTTON_FONT +antialias -weight bold -annotate +20+80 "$BUTTON_CHAR" -trim +repage info:)
     # Find how much to pad the top of the button and make the pad
     let "BUTTON_PADDING=(TILE_HEIGHT-BUTTON_HEIGHT-TITLE_BOTTOM_SPACE)/2"
     convert -size ${TILE_WIDTH}x${BUTTON_PADDING} xc:none "$BUTTON_PAD"
@@ -785,7 +790,7 @@
 fi
 
 # Calculate video length from length of audio
-VID_LENGTH=$(mplayer -quiet -identify -frames 0 -vo null -ao null \
+VID_LENGTH=$(mplayer -quiet -nomsgcolor -identify -frames 0 -vo null -ao null \
     "$AUDIO_STREAM" 2>&1 | grep '^ID_LENGTH' | awk -F '=' '{print $2}' | \
     sed -e "s/\.[0-9]*//g")
 VID_LENGTH=$(expr "$VID_LENGTH" \* $FPS \/ 100)

tovid-0.33.tar.bz2/src/makempg -> tovid-0.34.tar.bz2/src/makempg Changed

@@ -202,6 +202,7 @@
 ID_VIDEO_HEIGHT="0"
 ID_VIDEO_FPS="0.000"
 V_DURATION="0"
+ID_AUDIO_BITRATE="0"
 # mplayer executable to use
 MPLAYER="mplayer"
 # No custom mplayer opts
@@ -287,12 +288,7 @@
 # ******************************************************************************
 # Execute the given command-line string, with appropriate stream redirection
 # Args: $@ == text string containing complete command-line
-# To filter/prettify the subprocess output before writing it to the log file,
-# set the LOG_FILTER variable before calling this function, to e.g.
-#    LOG_FILTER="sed {s/\r/\n/g}"    # Replace LF with CR/LF
 # ******************************************************************************
-CRLF="sed {s/\r/\n/g}"  # Turn carriage-returns into newlines
-FOLD="fold -bs"
 function cmd_exec()
 {
     if $FAKE; then
@@ -301,8 +297,7 @@
         yecho
         return
     else
-        LOG_FILTER="$CRLF"
-        eval "$@" 2>&1 | $LOG_FILTER >> "$LOG_FILE" &
+        eval "$@" 2>&1 | strings >> "$LOG_FILE" &
         PIDS="$PIDS $!"
     fi
 }
@@ -652,7 +647,7 @@
             yecho
             yecho "Do you want to keep the temporary files that were created ?"
             yecho "Please type \"yes\", or else they will be deleted"
-            yecho "(add '-noask' to your ~/.tovid/makempg.config to avoid"
+            yecho "(add '-noask' to the [mpg] section of ~/.tovid/tovid.ini to avoid"
             yecho "being asked this question in the future)"
             read input
             echo
@@ -806,8 +801,8 @@
         yecho "Your encoded video should be in the file(s) $OUT_FILENAME."
         echo
         echo "You can author a disc with this video on it by running:"
-        echo "    makexml $OUT_FILENAME -out MyDisc"
-        echo "    makedvd MyDisc.xml"
+        echo "    tovid xml $OUT_FILENAME -out MyDisc"
+        echo "    tovid dvd MyDisc.xml"
         echo "You can also use todisc or makemenu to create menus for your disc."
         echo "See the tovid manual page ('man tovid') for more information."
         echo
@@ -1230,6 +1225,11 @@
     LENGTH=$V_DURATION
     MPEG_OVERHEAD=$(bc_math "$FIT_SIZE / 100")
     AUD_VID_SIZE=$(bc_math "$FIT_SIZE - $MPEG_OVERHEAD")
+    # When the audio is already compliant and the bitrate is known we
+    # can calculate a more accurate size.
+    if $AUDIO_OK && test "$ID_AUDIO_BITRATE" != "0"; then
+        AUD_BITRATE=$(echo "scale = 0; $ID_AUDIO_BITRATE / 1000" | bc)
+    fi
     AUDIO_SIZE=$(bc_math "$AUD_BITRATE * $LENGTH / (8 *1024)")
     VIDEO_SIZE=$(bc_math "$AUD_VID_SIZE - $AUDIO_SIZE")
     VID_BITRATE=$(bc_math "$VIDEO_SIZE*8*1024 / $LENGTH")
@@ -1578,7 +1578,6 @@
     fi
 fi
 
-
 # Do fast encoding if requested. Sacrifice quality for encoding speed.
 # NOT IMPLEMENTED IN COMMAND-LINE YET!
 if $FAST_ENCODING; then
@@ -1609,20 +1608,41 @@
     ASPECT_RATIO=$AUTO_ASPECT_RATIO
 fi
 
+# ffmpeg's -vf aspect is more dependable than -aspect, if ffmpeg is new enough
+FF_FILTERS=$(ffmpeg -filters 2>&1)
+# newer ffmpeg's use setdar= and setsar=
+if grep -qw ^setdar <<< "$FF_FILTERS"; then
+    FF_ASPECT="setdar="
+# somewhat older rev's used aspect=
+elif grep -qw ^aspect <<< "$FF_FILTERS"; then
+    FF_ASPECT="aspect="
+else
+    FF_ASPECT='-aspect '
+fi
+# newer ffmpegs using filters use "-vf"
+FF_HELP=$(ffmpeg -h 2>&1)
+if grep -qw -- -vf <<< "$FF_HELP"; then
+    VF="-vf"
+# somewhat older is "-vfilters"
+elif grep -qw -- -vfilters <<< "$FF_HELP"; then
+    VF="-vfilters"
+else
+    VF=""
+fi
 
 # Anamorphic widescreen (16:9 output)
 # Used if the format supports it, and it will minimize the number of pixels
 # wasted on letterbox bars (or if the user requested -widetv output).
 if $ANAMORPH && { ((V_ASPECT_WIDTH >= 153)) || $WIDE_TV ; }; then
     TGT_ASPECT_WIDTH=177
-    FF_ASPECT="-aspect 16:9"
+    FF_ASPECT="${FF_ASPECT}16:9"
     ASPECT_FMT="--aspect 3"
 # For all others, use "non-anamorphic" (4:3 output)
 # Aspects from 133:100 to 153:100 have minimum pixel wastage
 # when letterboxed in 4:3
 else
     TGT_ASPECT_WIDTH=133
-    FF_ASPECT="-aspect 4:3"
+    FF_ASPECT="${FF_ASPECT}4:3"
     ASPECT_FMT="--aspect 2"
 fi
 
@@ -1849,12 +1869,30 @@
     [[ $TARGET = "DVD-VCD" ]] && FF_ADD_ARGS="$FF_ADD_ARGS -g 12" # experiment FIXME
 
     # Padding, for any letterboxing to be done
-    FF_VPAD=""
-    FF_HPAD=""
-    FF_VPIX=$(expr $ $TGT_HEIGHT \- $INNER_HEIGHT $ \/ 2)
-    FF_HPIX=$(expr $ $TGT_WIDTH \- $INNER_WIDTH $ \/ 2)
-    test "$FF_VPIX" -ne 0 && FF_VPAD="-padtop $FF_VPIX -padbottom $FF_VPIX"
-    test "$FF_HPIX" -ne 0 && FF_HPAD="-padleft $FF_HPIX -padright $FF_HPIX"
+    FF_PAD=''
+    FF_VPIX=0
+    FF_HPIX=0
+    FF_VPIX=$(( (TGT_HEIGHT - INNER_HEIGHT) / 2 ))
+    FF_HPIX=$(( (TGT_WIDTH - INNER_WIDTH) / 2 ))
+    (( FF_VPIX )) || (( FF_HPIX )) && PAD=1
+    # changed options: -pad{side} to -vf(ilters) pad= .
+    if ((PAD)); then
+        if [[ $VF ]]; then
+            FF_PAD="pad=${TGT_WIDTH}:${TGT_HEIGHT}:${FF_HPIX}:${FF_VPIX}"
+        else
+            ((FF_HPIX)) && FF_HPAD="-padleft $FF_HPIX -padright $FF_HPIX"
+            ((FF_VPIX)) && FF_VPAD="-padtop $FF_VPIX -padbottom $FF_VPIX"
+            FF_PAD="$FF_HPAD $FF_VPAD"
+        fi 
+    fi
+
+    # use single variable for current, or legacy ffmpeg: VF_FILTERS and OLD_OPTS
+    if [[ $VF ]]; then # libavfilter is being used, FF_ASPECT always passed
+        VF_FILTERS="${FF_PAD},${FF_ASPECT}"
+        VF_FILTERS="$VF ${VF_FILTERS#,}" # add -vf*, axe possible leading comma
+    else # legacy ffmpeg
+        OLD_OPTS="$FF_PAD $FF_ASPECT"
+    fi
 
     # Target TV system
     test "$TVSYS" = "PAL" && FF_TARGET="-target pal"
@@ -1882,13 +1920,12 @@
     FF_BITRATE="-b ${VID_BITRATE}k -ab ${AUD_BITRATE}k ${AUDIO_CHAN[chan1-1]} "
     FF_ENC_CMD="$PRIORITY ffmpeg -i \"$IN_FILE\" $FF_THREAD $CLIP_SEEK $FF_LENGTH $ASYNC $ASYNC1 \
         $FF_TARGET $FF_QUANT $FF_BITRATE $FF_ADD_ARGS $FF_FPS $FF_ILACE \
-        $FF_SIZE $FF_VPAD $FF_HPAD $FF_ASPECT $FF_CHANNEL_MAP"
+        $FF_SIZE $VF_FILTERS $OLD_OPTS $FF_CHANNEL_MAP"
     $OVERWRITE && FF_ENC_CMD="$FF_ENC_CMD -y "
     FF_ENC_CMD="$FF_ENC_CMD \"$OUT_FILENAME\" ${NEW_AUDIO[@]}"
     yecho "Encoding video and audio with the following command:"
     yecho "$FF_ENC_CMD"
 
-    LOG_FILTER="$CRLF"
     cmd_exec "$FF_ENC_CMD"
 
     if $FAKE; then
@@ -1930,7 +1967,6 @@
     #AUDIO_CMD="$PRIORITY mplayer $MPLAYER_OPTS \"$IN_FILE\" -dumpaudio -dumpfile \"$AUDIO_STREAM\""
     run_audio_cmd()
     {
-        LOG_FILTER="$CRLF"
         "${AUDIO_CMD[@]}" >> "$LOG_FILE" 2>&1 &
         #$PRIORITY ffmpeg $CLIP_SEEK $FF_LENGTH -i "$IN_FILE" -vn -acodec copy \
         #$AUDIO_MAP "${AUDIO_STREAM[@]}" >> "$LOG_FILE" 2>&1
@@ -2043,7 +2079,6 @@
 
 
     # Copy the video stream
-    LOG_FILTER="$CRLF"
     cmd_exec "$VID_COPY_CMD"
 
 
@@ -2060,7 +2095,7 @@
     fi
     VID_PLAY_CMD="$PRIORITY $MPLAYER $NOCONSOLE_CONTROLS -benchmark -nosound -noframedrop $SUBTITLES -vo yuv4mpeg:file=\"$YUV_STREAM\"${YUV4MPEG_ILACE} $VID_FILTER $MPLAYER_OPTS \"$IN_FILE\" $CLIP_SEEK $MP_FRAMES"
     if $USE_FFMPEG ; then
-        VID_ENC_CMD="ffmpeg -i \"$IN_FILE\" $FF_THREAD $CLIP_SEEK $FF_LENGTH -an $FF_TARGET $FF_CODEC $FF_QUANT $FF_BITRATE $FF_ADD_ARGS $FF_ILACE $FF_SIZE $FF_VPAD $FF_HPAD $FF_ASPECT -y \"$VIDEO_STREAM\""
+        VID_ENC_CMD="ffmpeg -i \"$IN_FILE\" $FF_THREAD $CLIP_SEEK $FF_LENGTH -an $FF_TARGET $FF_CODEC $FF_QUANT $FF_BITRATE $FF_ADD_ARGS $FF_ILACE $FF_SIZE $VF_FILTERS $OLD_OPTS -y \"$VIDEO_STREAM\""
     else
         VID_ENC_CMD="cat \"$YUV_STREAM\" | $YUVDENOISE $ADJUST_FPS $PRIORITY mpeg2enc --sequence-length $DISC_SIZE --nonvideo-bitrate $NONVIDEO_BITRATE $MTHREAD $ASPECT_FMT $MPEG2_FMT $VID_FPS $VERBOSE $VID_NORM $MPEG2_QUALITY -o \"$VIDEO_STREAM\""
     fi
@@ -2078,7 +2113,6 @@
         file_output_progress "$YUV_STREAM" "Ripping raw uncompressed video stream"
     fi
 
-    LOG_FILTER="$CRLF"
     cmd_exec "$VID_ENC_CMD"
 
     # For parallel encoding, nothing further yet

tovid-0.33.tar.bz2/src/makexml -> tovid-0.34.tar.bz2/src/makexml Changed

@@ -122,6 +122,7 @@
 STANDARD=133
 WIDESCREEN=177
 NOPANSCAN=''
+TV_FORMAT=ntsc
 PAUSE=0
 
 # ==========================================================
@@ -169,6 +170,13 @@
 
 }
 
+function getFormat ()
+{
+    # Set TV format - default is ntsc
+    VID_INFO=$(tovid id -fast -terse "$1")
+    grep -q PAL_DVD <<< "$VID_INFO" && TV_FORMAT=pal
+}
+
 # ==========================================================
 # Add a top-level VMGM menu to the DVD
 # Args: $1 = video file to use for top menu
@@ -182,7 +190,6 @@
   if test $XML_FORMAT = "dvd"; then
     # Set NOPANSCAN
     noPanScan "$1"
-
     # Generate XML for the top menu, with a placeholder for
     # the titleset menu buttons (to be replaced later by sed)
     TOP_MENU_XML=`cat << EOF
@@ -236,12 +243,14 @@
 
     # Set NOPANSCAN
     noPanScan "$1"
+    # Set TV_FORMAT
+    getFormat "$1"
 
     # Generate XML for the menu header, with a placeholder for
     # the video segment buttons (to be replaced later by sed)
     MENU_XML=`cat << EOF
   <menus>
-    <video $NOPANSCAN />
+    <video $NOPANSCAN format="$TV_FORMAT"/>
     <pgc entry="root">
       <vob file="$1" />
 __MENU_BUTTONS__
@@ -521,7 +530,7 @@
 <titleset>
 $MENU_XML
   <titles>
-    <video $NOPANSCAN />
+    <video $NOPANSCAN format="$TV_FORMAT" />
 $TS_TITLES
   </titles>
 </titleset>
@@ -539,7 +548,7 @@
     </pgc>
   </menus>
   <titles>
-    <video $NOPANSCAN />
+    <video $NOPANSCAN format="$TV_FORMAT"/>
 $TS_TITLES
   </titles>
 </titleset>

tovid-0.34.tar.bz2/src/set_chapters Added

tovid-0.33.tar.bz2/src/titleset-wizard -> tovid-0.34.tar.bz2/src/titleset-wizard Changed

@@ -1,752 +1,1233 @@
 #!/usr/bin/env python
 
+import os.path
+import shlex
+import commands
+import tkFont
+import re
 from Tkinter import *
-from tkFileDialog import askopenfilename
+from tkMessageBox import *
+from tkSimpleDialog import askstring
+from tkFileDialog import asksaveasfilename
 from subprocess import Popen, PIPE
-import os.path
 from libtovid.metagui import Style
-from libtovid.cli import _enc_arg
-from tkMessageBox import *
+from libtovid.metagui.support import PrettyLabel, show_icons, get_photo_image
+from libtovid.cli import _enc_arg, Command
+from libtovid.util import trim
 from time import sleep
 from tempfile import mktemp
-from sys import argv
-import shlex
-import signal
-
-todisc_cmds = []
-all_options = []
-error_msg = 'This is not a saved GUI script\n' + \
-  'Please select the file that you saved'
-labels = ['General', 'VMGM menu', 'Titlesets']
-curdir = os.path.abspath('')
-newname = mktemp(suffix='.bash', prefix='todisc_commands.', dir=curdir)
-pid_file = mktemp(suffix='.pid', prefix='todiscgui.', dir='/tmp')
-os.environ['METAGUI_WIZARD'] = '1'
-
-# get metagui font configuration
-def get_font(name='', size='', _style=''):
-    font = [name, size, _style]
-    for i in range(len(style.font)):
-        if not font[i]:
-            font[i] = style.font[i]
-    return font
-
-def move(amt):
-    global current
-    ind = pages.index(current) + amt
-    if not 0 <= ind < len(pages):
-        return
-    current.pack_forget()
-    current = pages[ind]
-    # when move is called, change the page number displayed
-    pg1_label4.configure(text='Page %s' %int(ind+1))
-    current.pack(side=TOP, fill=BOTH, expand=1)
-
-def next():
-    # Page 1
-    # if 1st page (general) then
-    # move forward and unless cancelled, append anything added in current
-    # page to [todisc_cmds], removing todisc_cmds[current] first
-    global todisc_cmds
-    mv_amt = +1
-    if pages.index(current) == 0:
-        pass
-    elif pages.index(current) == 1:
-    # Page 2
-        # if todisc_commands.bash exists in current dir, prompt for rename
-        if os.path.exists(script_file):
-            rename_msg = 'The option file we will use:\n' + \
-            'todisc_commands.bash\n' + \
-            'exists in the current directory.\n' + \
-            'It will be renamed to:\n' + \
-            '%s' + \
-            '\nProceed ?'
-            rename_msg = rename_msg % (os.path.basename(newname))
-            if askokcancel(message=rename_msg):
-                os.rename(script_file, newname)
+from sys import argv, exit
+from base64 import b64encode
+from copy import deepcopy
+
+class Wizard(Frame):
+    """A frame to hold the wizard pages.  It will also hold the commands
+       that will  be processed and written out as a script.  Its base frame
+       holds a frame common to all pages that displays an icon, title, and
+       status panel.  It also has a bottom frame that contains the [Next] and
+       [Exit] buttons.  It will hold a list of all of the wizard pages.
+
+       master: the Tk() instance called by __main__
+       icon: Path to an image file (gif) to display on the left frame
+       text: The text for the wizard title above and/or below the icon
+             Use \n to break title into above\nbelow.
+       
+    """
+    def __init__(self, master, text, icon):
+        Frame.__init__(self, master)
+        self.pages = []
+        self.index = IntVar()
+        self.text = text
+        self.icon = icon
+        self.master = master
+        self.root = self._root()
+        self.commands = []
+        # for cancelling run_gui if exit is called
+        self.is_running = BooleanVar()
+        self.is_running.set(True)
+        # for waiting on [Next>>>] being pushed to continue titleset loop
+        self.waitVar = BooleanVar()
+        self.waitVar.set(False)
+        # pid for xterm, to allow clean exit
+        # need this to make sure we don't have zombie processes
+        self.xterm_is_running = BooleanVar()
+        self.check = ''
+        self.xterm_is_running.set(False)
+        # bindings for exit
+        self.root.protocol("WM_DELETE_WINDOW", self.confirm_exit)
+        self.root.bind('<Control-q>', self.confirm_exit)
+        self.root.title('Tovid titleset wizard')
+
+        # button frame
+        self.button_frame = Frame(master)
+        self.button_frame.pack(side='bottom', fill='x', expand=1,  anchor='se')
+        self.exit_button = Button(self.button_frame, text='Exit',
+                                       command=self.confirm_exit)
+        self.exit_button.pack(side='left', anchor='sw')
+        self.next_button = Button(self.button_frame, text='Next >>',
+                                                  command=self.next)
+        self.next_button.pack(side='right', anchor='se')
+        self.prev_button = Button(self.button_frame, text='<< Back',
+                                                    command=self.previous)
+        # frame for icon and status display
+        self.frame1 = Frame(master)
+        self.frame1.pack(side='left', anchor='nw', padx=10, pady=80)
+        inifile = os.path.expanduser('~/.metagui/config')
+        style = Style()
+        style.load(inifile)
+        self.font = style.font
+        self.draw()
+
+    def draw(self):
+        # get fonts
+        font = self.font
+        self.lrg_font = self.get_font(font, size=font[1]+4, _style='bold')
+        self.medium_font = self.get_font(font, size=font[1]+2)
+        self.heading_font = self.get_font(font, size=font[1]+8, _style='bold')
+        fixed =  '-misc-fixed-medium-r-normal--13-100-100-100-c-70-iso8859-1'
+        self.fixed_font = tkFont.Font(font=fixed)
+        self.background = self.root.cget('background')
+        if self.text:
+            txt = self.text.split('\n')
+            app_label1 = Label(self.frame1, text=txt[0], font=self.heading_font)
+            app_label1.pack(side='top', fill='both', expand=1, anchor='nw')
+        # icons and image
+        if os.path.isfile(self.icon):
+            img = get_photo_image(self.icon, 0, 0, self.background)
+            self.img = img
+            # Display the image in a label on all pages
+            img_label = Label(self.frame1, image=self.img)
+            img_label.pack(side='top', fill='both', expand=1,
+                                        anchor='nw', pady=20)
+            # If Tcl supports it, generate an icon for the window manager
+            show_icons(self.master, img_file)
+        # No image file? Print a message and continue
+        else:
+            print('%s does not exist' % img_file)
+        # if 2 lines of text for image, split top and bottom
+        if self.text and len(txt) > 1:
+            app_label2 = Label(self.frame1, text=txt[1], font=self.lrg_font)
+            app_label2.pack(side='top', fill='both', expand=1, anchor='nw')
+
+    def next(self):
+        """Move to the next wizard page"""
+        index = self.index.get()
+        try:
+            self.pages[index].hide_page()
+            self.pages[index+1].frame.pack(side='right')
+            self.pages[index+1].show_page()
+        except IndexError:
+            pass
+
+    def previous(self):
+        index = self.index.get()
+        self.pages[index].previous()
+
+    def set_pages(self, page):
+        """Accept incoming list of wizard page instances"""
+        self.pages.append(page)
+
+    def get_font(self, font_descriptor, name='', size='', _style=''):
+        """Get metagui font configuration
+        """
+        font = [name, size, _style]
+        for i in range(len(font_descriptor)):
+            if not font[i]:
+                font[i] = font_descriptor[i]
+        return tuple(font)
+
+    def show_status(self, status):
+        """Show status label on all pages, with timeout

tovid-0.33.tar.bz2/src/todisc -> tovid-0.34.tar.bz2/src/todisc Changed

@@ -61,6 +61,8 @@
 EOF`
 # check that needed todisc deps are installed
 assert_dep "$todisc_deps"
+assert_dep strings "'strings' is part of binutils.  In most distros the package
+is called  by the same name. http://www.gnu.org/software/binutils/ ."
 SCRIPT_START_TIME=`date +%s`
 
 # check if symlink in /tmp exists and use time stamped link if so
@@ -69,6 +71,7 @@
 LOG_FILE=$(readlink -f todisc.log)
 OUT_PREFIX=""
 TV_STANDARD=ntsc
+PIXEL_AR="10:11"
 MENU_LEN=( 20 )
 USER_MENU_LEN=false
 USER_SUBMENU_LEN=false
@@ -110,8 +113,8 @@
 THUMB_BLUR=1
 SC_BLUR=1
 SUB_MENU_FEATHER=false
-IMG_FMT="jpg"
-SM_IMG_FMT="jpg"  # submenu image format
+IMG_FMT="png"
+SM_IMG_FMT="png"  # submenu image format
 KEEP_FILES=false
 THUMB_SHAPE=""
 SEEK_VAL=2
@@ -205,6 +208,7 @@
 MENU_AUDIOLEN=""
 USER_AUDIOLENGTH=false
 BURN=false
+EJECT=''
 BURN_DEVICE="/dev/dvdrw"
 QUICK_MENU=false
 BG_CLR='#101010'
@@ -240,11 +244,18 @@
 DEBUG=false
 pngpipe="-quality 01 png:-"
 ani_pics=0
+use_vhooks=false
+use_overlay_filter=false
 JUSTIFY="center"
 CONTRAST_CLR='gray'
 NOMENU=false
 SC_AR=133
 THUMB_COLUMNS=""
+FAST_SEEK=false # ffmpeg: default:decode during seek (more accurate but slower)
+USER_THUMBS=false # is user providing images for the menu link thumbs ?
+FRAME_SAFE=false # (-static) if true take the best of 9 frames. default: 1 frame
+PIPE_FORMAT="-pix_fmt yuv420p -f yuv4mpegpipe"
+IMG_DEPTH="-depth 8" # when converting to png: ppmtoy4m needs 8 bit
 TOVID_PREFIX=$(tovid -prefix)
 
 ##############################################################################
@@ -310,7 +321,7 @@
     yecho "Part of the title may not be visible on your tv screen"
     yecho "Perhaps use a smaller -titles-fontsize, or shorten \"${TITLES[i]}\""
     $SHOWCASE && [[ -z $SHOWCASE_FILE ]] && \
-    yecho "You may also use '-showcase-titles-align-east' since you are not
+    yecho "You may also use '-showcase-titles-align east' since you are not
     using a -showcase FILE."
     echo "****************************"
     $WARN && sleep 5
@@ -341,10 +352,15 @@
     L=$(mencoder -nosound -mc 0 -oac pcm -ovc copy $check_frames \
     -o /dev/null "$1" 2> /dev/null)
     awk 'END{print $(NF-3)}' <<< "$L"
+    # awk '{for (i=0; i<NF; i++) { if ($i=="secs") {print $(i-1); break} } }' \
+    # <<< "$L"
 }
 audio_length()
 {
-    mplayer -noconsolecontrols -vo null -ao pcm:fast:file=/dev/null "$1" \
+    # optional 2nd arg is maximum length checked in file (seconds)
+    end=""
+    [[ -n $2 ]] && end="-endpos $2"
+    mplayer -nomsgcolor -noconsolecontrols -vo null -ao pcm:fast:file=/dev/null $end "$1" \
     2>&1 | tr '\r' '\n' | grep ^A: | tail -1 | sed s/^.*A:// | awk '{print $1}'
 }
 cleanup()
@@ -418,15 +434,14 @@
 # ******************************************************************************
 runtime_error()
 {
-    # Uncomment if needed later
-    #killsubprocs
     echo
     echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
     yecho "todisc encountered an error:"
     yecho "    $@"
     echo
-    echo "Check the contents of $LOG_FILE to see what went wrong."
-    echo "See the tovid website ($TOVID_HOME_PAGE) for what to do next."
+    echo "The error should be shown above, also check the contents of 
+    $LOG_FILE to see what went wrong." |format_output
+    echo "See the tovid website ($TOVID_HOME_PAGE) for possible further info."
     echo "Sorry for the inconvenience!"
     echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
     cleanup
@@ -478,7 +493,8 @@
         echo "without seeing more previews, then type: 'exit', else you will "
         echo "continue on with other previews even if you don't type 'yes'."
         echo
-        confirm_msg="read above paragraph and then $confirm_msg"
+        confirm_msg="Type yes to continue, press <ENTER> to abort but see "
+        confirm_msg="$confirm_msg other previews, or type 'exit' to quit."
     fi
     echo "If you are happy with the preview, $confirm_msg"
     read input
@@ -510,6 +526,8 @@
         echo "try a larger font, or setting -title-stroke and -titles-stroke"
         echo "to a contrasting color.  Or set the strokes to the same color"
         echo "as your titles.  For black frames look at the -seek option."
+        echo "For corrupt or gray frames try using the -frame-safe option, or "
+        echo "use your own images for thumbnail buttons with -user-thumbs."
         echo "For other fine-tuning options, see 'man tovid'."
         echo
         [ ! -z "$input" -a "$input" = "exit" ] && killall_instances
@@ -550,35 +568,9 @@
 awk 'END{print NR}' "$LOG_FILE"
 }
 
-# hack to check if transcode is stalling and set it a HUP if so
-# usage: check_stall PID
-check_stall()
-{
-    PIDOF_TRANSCODE=$1
-    newlines=$(stat_logfile)
-    while ps -p $PIDOF_TRANSCODE >/dev/null; do
-        # Check for transcode output every 10 seconds
-        sleep 10
-        age=$newage
-        newage=$(stat_logfile)
-        # If no new output, sleep 20s and check again
-        [[ $newage = $age ]] && sleep 20 && newage=$(stat_logfile)
-        # If still no new lines, send a HUP signal to transcode
-        if [[ $newage == $age ]] \
-        && kill -0 $PIDOF_TRANSCODE > /dev/null 2>&1; then
-            echo
-            echo "*** transcode appears to be stalled ***"
-            echo "*** Sending transcode a HUP and hoping for the best ***"
-            sleep 5
-            $(kill -0 $PIDOF_TRANSCODE > /dev/null 2>&1) && \
-            kill -HUP $PIDOF_TRANSCODE
-            echo
-        fi
-    done
-}
 check_filetype()
 {
-    fstats=$(file -L "$1")
+    fstats=$(file -L "$1" | awk '{ $1 = ""; print }')
     if [[ $fstats =~ "image" || $fstats =~ "bitmap" ]]; then
         TYPE="image"
         CONVRT=:
@@ -813,11 +805,11 @@
     VIDEO_IN_SEEK="$2"
     video_type=$3
     yecho
-    yecho "$VIDEO_IN is not compliant - re-encoding
+    yecho "$VIDEO_IN is not compliant - re-encoding \
       $(bc <<< "$VIDEO_IN_SEEK + ${MENU_LEN[MENU_NUM-1]}" 2>/dev/null)
         second slice to DVD compliant file"
-    yecho "For long seeks this will take some time and produce a large file."
-    yecho "But if the file is not encoded this way there may be sync problems."
+    yecho "This is not strictly necessary and will reduce quality, but it may"
+    yecho "help with sync problems if using the same file for audio and video."
     yecho "Do you want to continue encoding this file?, type 'yes' to do so"
     if ! $NOASK; then
         read response
@@ -991,8 +983,8 @@
     IN_IMAGE="$1"
     OUT_MPEG="$2"
     # remove symlinks, as otherwise we overwrite symlink target
-    IMAGE_ENC_CMD=(ffmpeg -f image2 -loop_input -vframes $vlength \
-    -i "$IN_IMAGE" -s $VIDSIZE -f s16le -i /dev/zero -t $alength \
+    IMAGE_ENC_CMD=(ffmpeg -f image2 $LOOP -vframes $vlength \
+    -i "$IN_IMAGE" -s $VIDSIZE -f s16le -ar 48000 -i /dev/zero -t $alength \
     -ar $SAMPLERATE -ac 2 -ab 224k -target ${TV_STANDARD}-${TARGET} \
     -aspect $ASPECT_RATIO -y "$OUT_MPEG")
     echo "Running ${IMAGE_ENC_CMD[@]}" | format_output >> "$LOG_FILE"
@@ -1015,7 +1007,6 @@
         yecho
         yecho "Working on switched menu 1"
         yecho
-#    exit
 }
 carousel_menu_mode()
 # call todisc recursively to make animated slideshow menu
@@ -1225,7 +1216,7 @@
 <dvdauthor dest="$OUT_DIR" jumppad="0">
   <vmgm>
     <menus>
-      <video aspect="4:3"/>
+      <video format="$TV_STANDARD" aspect="4:3"/>
       <pgc entry="title">
         <pre>
 $(echo -e "$VMGM_PRE")
@@ -1282,7 +1273,7 @@

tovid-0.33.tar.bz2/src/tovid -> tovid-0.34.tar.bz2/src/tovid Changed

@@ -22,6 +22,13 @@
     gui         Start the tovid GUI                         todiscgui
     mpg         Encode videos to MPEG format                tovid
     titlesets   Start the titleset wizard                   (new)
+    chapters    Set video chapter points with mplayer       (new)
+
+The following general options are also available:
+    --prefix | -prefix      Return the tovid install prefix
+    --version | -version    Return the tovid version
+    --info | -info          Return prefix, version and python module search path
+    These options are to be used on their own, as in:  tovid --prefix
 
 Run 'tovid <command>' with no further arguments to get help on a command,
 and what arguments it expects.
@@ -30,6 +37,7 @@
 import sys
 import os
 import subprocess
+import signal
 import time
 import shlex
 import shutil
@@ -47,61 +55,144 @@
     'gui': 'todiscgui',
     'mpg': 'makempg',
     'batch': 'tovid-batch',
-    'titlesets': 'make_titlesets',
+    'titlesets': 'titleset-wizard',
+    'chapters': 'set_chapters',
 }
 
 
-def get_script_dir(tovid_path):
-    """Get the full path to the directory where tovid's executable scripts are.
-    """
-    # Determine the prefix where tovid is installed
-    tovid_path = os.path.abspath(tovid_path)
-    bin_dir = os.path.dirname(tovid_path)
-    prefix = os.path.dirname(bin_dir)
-    # Prepend the script directory /$PREFIX/lib/tovid/ to $PATH,
-    # so executables in there can be run without an absolute pathname
-    script_dir = os.path.join(prefix, 'lib', 'tovid')
-    return script_dir
-
-
-def install_tovid_ini(script_dir):
-    """If tovid.ini doesn't exist in user's home directory,
-    copy the one from script_dir.
-    """
-    # If for some reason the default tovid.ini doesn't exist, return
-    default_tovid_ini = os.path.join(script_dir, 'tovid.ini')
-    if not os.path.exists(default_tovid_ini):
-        return
-
-    # Create ~/.tovid if it doesn't exist already
-    user_tovid_dir = os.path.expanduser('~/.tovid')
-    if not os.path.exists(user_tovid_dir):
-        print("Creating '%s'" % user_tovid_dir)
-        os.mkdir(user_tovid_dir)
-
-    # Copy default tovid.ini to ~/.tovid if it doesn't exist already
-    user_tovid_ini = os.path.join(user_tovid_dir, 'tovid.ini')
-    if not os.path.exists(user_tovid_ini):
-        print("Creating '%s'" % user_tovid_ini)
-        shutil.copy(default_tovid_ini, user_tovid_ini)
-
-
-def get_config_options(command):
-    """Return any options found in ~/.tovid/tovid.ini for the given command.
-    """
-    # Parse the user's tovid.ini file
-    filename = os.path.expanduser('~/.tovid/tovid.ini')
-    config = ConfigParser()
-    config.read(filename)
-    # If no [command] section exists, or if there's no 'options' setting,
-    # return an empty list.
-    if command not in config.sections():
-        return []
-    elif 'options' not in config.options(command):
-        return []
-    # Otherwise, get the 'options' setting from the [command] section,
-    # and split into a list of individual options using shell syntax
-    else:
+class Frontend:
+    def __init__(self, args):
+        # Set attributes
+        self.path = os.path.abspath(args.pop(0))
+        self.prefix = self.get_prefix(self.path)
+        self.script_dir = os.path.join(self.prefix, 'lib', 'tovid')
+        self.version = self.get_version()
+        # Handle any special options
+        self.parse_options(args)
+        # Setup and run the command
+        self.install_tovid_ini()
+        self.run_command(args)
+
+
+    def get_prefix(self, script_path):
+        """Get the path prefix where tovid is installed (/usr or /usr/local).
+        """
+        # Determine the prefix where tovid is installed
+        bin_dir = os.path.dirname(script_path)
+        return os.path.dirname(bin_dir)
+
+
+    def get_version(self):
+        """Return the tovid version string.
+        """
+        tovid_init = self.script_dir + '/tovid-init'
+        cmd = shlex.split("bash -c '. %s && printf $TOVID_VERSION'" % tovid_init)
+        return subprocess.Popen(cmd, stdout=subprocess.PIPE).communicate()[0]
+
+
+    def parse_options(self, args):
+        """Parse and handle any command-line options at the beginning of args.
+        The args list is modified in place.
+        """
+        while args and args[0].startswith('-'):
+            arg = args.pop(0)
+
+            if arg in ['-prefix', '--prefix']:
+                print self.prefix
+                sys.exit(0)
+
+            elif arg in ['-version', '--version']:
+                print self.version
+                sys.exit(0)
+
+            elif arg in ['-info', '--info']:
+                print("tovid version: %s" % self.version)
+                print("tovid prefix: %s" % self.prefix)
+                print("tovid script directory: %s" % self.script_dir)
+                print("python library path:")
+                print('  ' + '\n  '.join(sys.path))
+                sys.exit(0)
+
+
+    def run_command(self, args):
+        """Run the command in the first element of args, passing any additional
+        arguments found after that.
+        """
+        if not args:
+            return
+
+        os.environ['PATH'] = self.script_dir + os.pathsep + os.environ['PATH']
+
+        command = args.pop(0)
+        if command not in _scripts:
+            print(usage)
+            print("Unknown command: '%s'" % command)
+            sys.exit(1)
+
+        # Get the script name for the given command
+        script = _scripts[command]
+
+        # Ensure that the script exists in self.script_dir
+        # (Should never happen if installer is configured correctly)
+        script_path = os.path.join(self.script_dir, script)
+        if not os.path.exists(script_path):
+            print("ERROR: Missing script: '%s'" % script)
+            sys.exit(1)
+
+        # Get any options found in tovid.ini
+        ini_args = self.get_config_options(command)
+
+        # Summon the script and catch keyboard interruptions
+        try:
+            proc = subprocess.Popen([script] + ini_args + args)
+            proc.wait()
+        except KeyboardInterrupt:
+            print("\n!!! tovid was manually interrupted. Exiting.")
+            os.kill(proc.pid, signal.SIGTERM)
+            # Sleep a second to let the script clean up
+            time.sleep(1)
+            sys.exit(1)
+        else:
+            sys.exit(proc.returncode)
+
+
+    def install_tovid_ini(self):
+        """If tovid.ini doesn't exist in user's home directory,
+        copy the one from self.script_dir.
+        """
+        # If for some reason the default tovid.ini doesn't exist, return
+        default_tovid_ini = os.path.join(self.script_dir, 'tovid.ini')
+        if not os.path.exists(default_tovid_ini):
+            return
+
+        # Create ~/.tovid if it doesn't exist already
+        user_tovid_dir = os.path.expanduser('~/.tovid')
+        if not os.path.exists(user_tovid_dir):
+            print("Creating '%s'" % user_tovid_dir)
+            os.mkdir(user_tovid_dir)
+
+        # Copy default tovid.ini to ~/.tovid if it doesn't exist already
+        user_tovid_ini = os.path.join(user_tovid_dir, 'tovid.ini')
+        if not os.path.exists(user_tovid_ini):
+            print("Creating '%s'" % user_tovid_ini)
+            shutil.copy(default_tovid_ini, user_tovid_ini)
+

tovid-0.33.tar.bz2/src/tovid-batch -> tovid-0.34.tar.bz2/src/tovid-batch Changed

tovid-0.33.tar.bz2/src/tovid-init -> tovid-0.34.tar.bz2/src/tovid-init Changed

tovid-0.33.tar.bz2/src/tovid-init.in -> tovid-0.34.tar.bz2/src/tovid-init.in Changed

tovid-0.34.tar.bz2/titleset-wizard.desktop Added

tovid-0.33.tar.bz2/tovidgui.desktop -> tovid-0.34.tar.bz2/tovidgui.desktop Changed